浏览代码

Merge pull request #20 from UnityTechnologies/gameplay

Colliders added to all levels
/AdsTesting
GitHub 4 年前
当前提交
d305d439
共有 6 个文件被更改,包括 2691 次插入179 次删除
  1. 419
      Assets/Scenes/Level_00.unity
  2. 836
      Assets/Scenes/Level_01.unity
  3. 763
      Assets/Scenes/Level_02.unity
  4. 845
      Assets/Scenes/Level_03.unity
  5. 5
      Assets/Scripts/PlayerController.cs
  6. 2
      ProjectSettings/TagManager.asset

419
Assets/Scenes/Level_00.unity


m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_TransformParent: {fileID: 449659909}
value: 8
value: 2
value: 0.6831995
value: 0.68319964
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 1e754c2a35b93ee4cbae0274eb2bda7e,
type: 3}

- target: {fileID: -8679921383154817045, guid: 1e754c2a35b93ee4cbae0274eb2bda7e,
type: 3}
propertyPath: m_LocalScale.z
value: 0.6831995
value: 0.6831996
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 1e754c2a35b93ee4cbae0274eb2bda7e,
type: 3}

type: 3}
m_PrefabInstance: {fileID: 17038873}
m_PrefabAsset: {fileID: 0}
--- !u!1 &32945592
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 32945593}
m_Layer: 0
m_Name: Level Colliders
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &32945593
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 32945592}
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:
- {fileID: 2026308079}
- {fileID: 283391188}
- {fileID: 1834630180}
- {fileID: 705684208}
- {fileID: 713157646}
- {fileID: 1637961481}
m_Father: {fileID: 0}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &122326357
PrefabInstance:
m_ObjectHideFlags: 0

- target: {fileID: 7702242264122354704, guid: 11482ef509975be43bcaf454f9771aed,
type: 3}
propertyPath: m_RootOrder
value: 17
value: 14
objectReference: {fileID: 0}
- target: {fileID: 7702242264122354704, guid: 11482ef509975be43bcaf454f9771aed,
type: 3}

m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 155182938}
m_Mesh: {fileID: 5613289306586048733, guid: 1e754c2a35b93ee4cbae0274eb2bda7e, type: 3}
--- !u!1 &283391187
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 283391188}
- component: {fileID: 283391189}
m_Layer: 0
m_Name: Cube
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &283391188
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 283391187}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 4.49, y: 1.88, z: 3.56}
m_LocalScale: {x: 1, y: 1, z: 19.058226}
m_Children: []
m_Father: {fileID: 32945593}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &283391189
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 283391187}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &368277105
GameObject:
m_ObjectHideFlags: 0

m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 368277105}
m_Mesh: {fileID: -5852286375780045605, guid: 380d56822eca0fb428c002e54147496a, type: 3}
--- !u!1 &449659908
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 449659909}
m_Layer: 0
m_Name: Level
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &449659909
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 449659908}
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:
- {fileID: 690134878}
- {fileID: 2142882866}
- {fileID: 17038874}
- {fileID: 2030365541}
- {fileID: 1780217142}
m_Father: {fileID: 0}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &462480490
GameObject:
m_ObjectHideFlags: 0

m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 13
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
--- !u!1001 &690134877
PrefabInstance:

m_TransformParent: {fileID: 0}
m_TransformParent: {fileID: 449659909}
m_Modifications:
- target: {fileID: -8750303125298607681, guid: 380d56822eca0fb428c002e54147496a,
type: 3}

- target: {fileID: -8679921383154817045, guid: 380d56822eca0fb428c002e54147496a,
type: 3}
propertyPath: m_RootOrder
value: 6
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 380d56822eca0fb428c002e54147496a,
type: 3}

type: 3}
m_PrefabInstance: {fileID: 690134877}
m_PrefabAsset: {fileID: 0}
--- !u!1 &705684207
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 705684208}
- component: {fileID: 705684209}
m_Layer: 0
m_Name: Cube (2)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &705684208
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 705684207}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0.44, y: 1.88, z: -6.04}
m_LocalScale: {x: 9.37927, y: 1, z: 1.262629}
m_Children: []
m_Father: {fileID: 32945593}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &705684209
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 705684207}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &713157645
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 713157646}
- component: {fileID: 713157647}
m_Layer: 0
m_Name: Cube (3)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &713157646
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 713157645}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -4.17, y: 1.88, z: 9.73}
m_LocalScale: {x: 2.9615045, y: 1, z: 1.262629}
m_Children: []
m_Father: {fileID: 32945593}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &713157647
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 713157645}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &728360534
GameObject:
m_ObjectHideFlags: 0

m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 15
m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 50.941, y: 0, z: 0}
--- !u!114 &949507760
MonoBehaviour:

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

m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 11
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1069147958
GameObject:

m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1357391161}
m_Mesh: {fileID: -5852286375780045605, guid: 380d56822eca0fb428c002e54147496a, type: 3}
--- !u!1 &1496090740 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2550463727306718371, guid: 380d56822eca0fb428c002e54147496a,
type: 3}
m_PrefabInstance: {fileID: 690134877}
m_PrefabAsset: {fileID: 0}
--- !u!65 &1496090744
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1496090740}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 0.10034926, y: 0.17949441, z: 0.0024161125}
m_Center: {x: 0.00082935765, y: -0.01894978, z: -0.0012080562}
--- !u!1 &1537944763
GameObject:
m_ObjectHideFlags: 0

m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1635965741}
m_Mesh: {fileID: -5852286375780045605, guid: 380d56822eca0fb428c002e54147496a, type: 3}
--- !u!1 &1637961480
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1637961481}
- component: {fileID: 1637961482}
m_Layer: 0
m_Name: Cube (4)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1637961481
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1637961480}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 3.44, y: 1.88, z: 9.73}
m_LocalScale: {x: 2.9615045, y: 1, z: 1.262629}
m_Children: []
m_Father: {fileID: 32945593}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &1637961482
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1637961480}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &1693437455
GameObject:
m_ObjectHideFlags: 0

m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 14
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 63.234, y: -42.121002, z: 78.191}
--- !u!1 &1736040039
GameObject:

m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_TransformParent: {fileID: 449659909}
value: 10
value: 4
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 1e754c2a35b93ee4cbae0274eb2bda7e,
type: 3}

- target: {fileID: -8679921383154817045, guid: 1e754c2a35b93ee4cbae0274eb2bda7e,
type: 3}
propertyPath: m_LocalScale.z
value: 0.77699
value: 0.77698994
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 1e754c2a35b93ee4cbae0274eb2bda7e,
type: 3}

objectReference: {fileID: 2100000, guid: 9872efcd17f27534586b3d80a4493aad, type: 2}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 1e754c2a35b93ee4cbae0274eb2bda7e, type: 3}
--- !u!4 &1780217142 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 1e754c2a35b93ee4cbae0274eb2bda7e,
type: 3}
m_PrefabInstance: {fileID: 1780217141}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1788293750
GameObject:
m_ObjectHideFlags: 0

objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 446c5ea79ee32824b87d51fbb345ca9b, type: 3}
--- !u!1 &1834630179
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1834630180}
- component: {fileID: 1834630181}
m_Layer: 0
m_Name: Cube (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1834630180
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1834630179}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -5.3, y: 1.88, z: 3.56}
m_LocalScale: {x: 1, y: 1, z: 19.058226}
m_Children: []
m_Father: {fileID: 32945593}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &1834630181
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1834630179}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &1844497632
GameObject:
m_ObjectHideFlags: 0

m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 12
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1897315081
MonoBehaviour:

blendDistance: 0
weight: 1
priority: 0
--- !u!1 &2026308078
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2026308079}
- component: {fileID: 2026308080}
m_Layer: 8
m_Name: Floor
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2026308079
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2026308078}
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: 32945593}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &2026308080
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2026308078}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 9.478542, y: 0.33207607, z: 17.009892}
m_Center: {x: -0.17081547, y: 1.3431134, z: 1.614636}
m_TransformParent: {fileID: 0}
m_TransformParent: {fileID: 449659909}
value: 9
value: 3
value: 0.90185225
value: 0.9018522
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 1e754c2a35b93ee4cbae0274eb2bda7e,
type: 3}

- target: {fileID: -8679921383154817045, guid: 1e754c2a35b93ee4cbae0274eb2bda7e,
type: 3}
propertyPath: m_LocalScale.z
value: 0.90185225
value: 0.9018523
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 1e754c2a35b93ee4cbae0274eb2bda7e,
type: 3}

propertyPath: m_MainCamera
value:
objectReference: {fileID: 949507758}
- target: {fileID: 8083381679980500539, guid: 67db914bd437a69468c6d966454659b0,
type: 3}
propertyPath: m_InputCollisionLayer.m_Bits
value: 256
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 67db914bd437a69468c6d966454659b0, type: 3}
--- !u!1001 &2142882865

m_Modification:
m_TransformParent: {fileID: 0}
m_TransformParent: {fileID: 449659909}
value: 7
value: 1
value: 0.77699
value: 0.77698994
value: 1.01708
value: 1.0170798
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 1e754c2a35b93ee4cbae0274eb2bda7e,
type: 3}

objectReference: {fileID: 2100000, guid: 9872efcd17f27534586b3d80a4493aad, type: 2}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 1e754c2a35b93ee4cbae0274eb2bda7e, type: 3}
--- !u!4 &2142882866 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 1e754c2a35b93ee4cbae0274eb2bda7e,
type: 3}
m_PrefabInstance: {fileID: 2142882865}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &7906670936621367384
PrefabInstance:
m_ObjectHideFlags: 0

836
Assets/Scenes/Level_01.unity
文件差异内容过多而无法显示
查看文件

763
Assets/Scenes/Level_02.unity
文件差异内容过多而无法显示
查看文件

845
Assets/Scenes/Level_03.unity
文件差异内容过多而无法显示
查看文件

5
Assets/Scripts/PlayerController.cs


[SerializeField]
private Animator m_AnimatorController;
[SerializeField]
private LayerMask m_InputCollisionLayer;
private bool m_HasKey = false;
private Rigidbody m_Rigidbody;

void MoveToPosition(Vector2 screenPosition)
{
if (Physics.Raycast(m_MainCamera.ScreenPointToRay(screenPosition), out m_HitInfo))
if (Physics.Raycast(m_MainCamera.ScreenPointToRay(screenPosition), out m_HitInfo, Mathf.Infinity, m_InputCollisionLayer))
{
// don't move if touching close to character
if (Vector3.Distance(m_Rigidbody.position, m_HitInfo.point) > k_MinMovementDistance)

2
ProjectSettings/TagManager.asset


- UI
-
-
-
- Floor
-
-
-

正在加载...
取消
保存