Pull request #22: Soulaha
Merge in CEGJ/creative-jam-20 from Soulaha to main * commit 'ce8a5ea092dfabb9016f47347ac4880cd3543987': Remove pause menu was already done Rework hitscaning on cannon fire Add MainMenu and pause menu Transitions between menus work Added mainmenu
This commit is contained in:
Soulaha
commit
5b457ef5ae
@ -750,6 +750,10 @@ MonoBehaviour:
|
||||
m_Calls: []
|
||||
m_ActionId: 61ddf11f-3478-4887-ab86-0ead8dde336f
|
||||
m_ActionName: UI/TrackedDeviceOrientation
|
||||
- m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_ActionId: 1e10adeb-97dd-4b7c-9f30-b3fce70f993a
|
||||
m_ActionName: Player/Pause[/Keyboard/escape,/Keyboard/p]
|
||||
m_NeverAutoSwitchControlSchemes: 0
|
||||
m_DefaultControlScheme:
|
||||
m_DefaultActionMap: Player
|
||||
@ -769,7 +773,7 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
cannon: {fileID: 1530449394259395294}
|
||||
projectile: {fileID: 5630905120393344806, guid: 70e77cdd333989d4193d3d85029d8cbe, type: 3}
|
||||
lookDepth: 400
|
||||
lookDepth: 150
|
||||
cannonForce: 500
|
||||
fireRate: 0.5
|
||||
fireTimer: 0
|
||||
|
||||
5477
Assets/Scenes/MainMenu.unity
Normal file
5477
Assets/Scenes/MainMenu.unity
Normal file
File diff suppressed because it is too large
Load Diff
7
Assets/Scenes/MainMenu.unity.meta
Normal file
7
Assets/Scenes/MainMenu.unity.meta
Normal file
@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: e00e1e3705465134eb4853ed0bef2506
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -123,6 +123,327 @@ NavMeshSettings:
|
||||
debug:
|
||||
m_Flags: 0
|
||||
m_NavMeshData: {fileID: 0}
|
||||
--- !u!1001 &158125
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 9
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 8
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 61.7
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 150
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.9519358
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0.06536628
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0.25627452
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0.15449566
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 11.75
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: -28.537
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 15.439
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835567, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: enemy2 (4)
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7403712487563690438, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: flyingSpeed
|
||||
value: 10
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7403712487563690438, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: landingPoint
|
||||
value:
|
||||
objectReference: {fileID: 6969840674995165992}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
--- !u!1001 &640759056
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 10
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -73.3
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 17.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 150
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.9519358
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0.06536628
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0.25627452
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0.15449566
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 11.75
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: -28.537
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 15.439
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835567, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: enemy2 (5)
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7403712487563690438, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: flyingSpeed
|
||||
value: 10
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7403712487563690438, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: landingPoint
|
||||
value:
|
||||
objectReference: {fileID: 6969840674995165992}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
--- !u!1001 &913159823
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 8
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 8
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 6.8999996
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 150
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.9519358
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0.06536628
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0.25627452
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0.15449566
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 11.75
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: -28.537
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 15.439
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835567, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: enemy2 (3)
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7403712487563690438, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: flyingSpeed
|
||||
value: 10
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7403712487563690438, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: landingPoint
|
||||
value:
|
||||
objectReference: {fileID: 6969840674995165992}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
--- !u!1001 &979165674
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 1039445016908976971, guid: b9d1df034f0e64d49bb6cee268acbb3a, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1039445016908976971, guid: b9d1df034f0e64d49bb6cee268acbb3a, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -62.25621
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1039445016908976971, guid: b9d1df034f0e64d49bb6cee268acbb3a, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -0.0000019073486
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1039445016908976971, guid: b9d1df034f0e64d49bb6cee268acbb3a, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 150
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1039445016908976971, guid: b9d1df034f0e64d49bb6cee268acbb3a, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1039445016908976971, guid: b9d1df034f0e64d49bb6cee268acbb3a, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1039445016908976971, guid: b9d1df034f0e64d49bb6cee268acbb3a, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1039445016908976971, guid: b9d1df034f0e64d49bb6cee268acbb3a, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1039445016908976971, guid: b9d1df034f0e64d49bb6cee268acbb3a, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1039445016908976971, guid: b9d1df034f0e64d49bb6cee268acbb3a, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1039445016908976971, guid: b9d1df034f0e64d49bb6cee268acbb3a, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4677231174284622268, guid: b9d1df034f0e64d49bb6cee268acbb3a, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Meteorite
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7767178052037687813, guid: b9d1df034f0e64d49bb6cee268acbb3a, type: 3}
|
||||
propertyPath: landingPoint
|
||||
value:
|
||||
objectReference: {fileID: 6969840674995165992}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: b9d1df034f0e64d49bb6cee268acbb3a, type: 3}
|
||||
--- !u!1001 &1170137485
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 35.1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 34.4
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 150
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.9519358
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0.06536628
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0.25627452
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0.15449566
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 11.75
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: -28.537
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 15.439
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835567, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: enemy2 (1)
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7403712487563690438, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: flyingSpeed
|
||||
value: 10
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7403712487563690438, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: landingPoint
|
||||
value:
|
||||
objectReference: {fileID: 6969840674995165992}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
--- !u!114 &1407792871 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 3117915759359451286, guid: 486166ffed264a842ab4bc0affec38c4, type: 3}
|
||||
@ -134,6 +455,259 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 44fc4a66977bce94dbaccf9ae1d06e2b, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &1407792874 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 6969840675499469968, guid: 486166ffed264a842ab4bc0affec38c4, type: 3}
|
||||
m_PrefabInstance: {fileID: 6969840674995165991}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1001 &1475098292
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 12
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -81.1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 53.3
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 150
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.9519358
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0.06536628
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0.25627452
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0.15449566
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 11.75
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: -28.537
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 15.439
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835567, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: enemy2 (7)
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7403712487563690438, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: flyingSpeed
|
||||
value: 10
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7403712487563690438, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: landingPoint
|
||||
value:
|
||||
objectReference: {fileID: 6969840674995165992}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
--- !u!1 &1571118493
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1571118495}
|
||||
- component: {fileID: 1571118494}
|
||||
m_Layer: 0
|
||||
m_Name: GameManager
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!114 &1571118494
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1571118493}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: cbbe9406db76ed447bdc7c36883ee139, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_controls: {fileID: 1407792874}
|
||||
_state: 0
|
||||
ui: {fileID: 1822990541}
|
||||
--- !u!4 &1571118495
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1571118493}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 351.26254, y: 364.53677, z: -7.2002945}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 6
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1001 &1702395318
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 13
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -81.1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 53.3
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 150
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.9519358
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0.06536628
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0.25627452
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0.15449566
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 11.75
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: -28.537
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 15.439
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835567, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: enemy2 (8)
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7403712487563690438, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: flyingSpeed
|
||||
value: 10
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7403712487563690438, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: landingPoint
|
||||
value:
|
||||
objectReference: {fileID: 6969840674995165992}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
--- !u!1001 &1787351161
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 7
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 35.1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 6.8999996
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 150
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.9519358
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0.06536628
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0.25627452
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0.15449566
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 11.75
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: -28.537
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 15.439
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835567, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: enemy2 (2)
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7403712487563690438, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: flyingSpeed
|
||||
value: 10
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7403712487563690438, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: landingPoint
|
||||
value:
|
||||
objectReference: {fileID: 6969840674995165992}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
--- !u!1001 &1822990540
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -141,18 +715,150 @@ PrefabInstance:
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 297948476404860644, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 297948476404860644, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 297948476404860644, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 19.4609
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 297948476404860644, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -5.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 430403745636601587, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
|
||||
propertyPath: player
|
||||
value:
|
||||
objectReference: {fileID: 1407792871}
|
||||
- target: {fileID: 2082787375140496085, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2082787375140496085, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2082787375140496085, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 318.01968
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2082787375140496085, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -50
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3203615922723506192, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
|
||||
propertyPath: player
|
||||
value:
|
||||
objectReference: {fileID: 1407792871}
|
||||
- target: {fileID: 3290620518113273233, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3290620518113273233, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3290620518113273233, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 19.4609
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3290620518113273233, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -5.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3868787890645716629, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3868787890645716629, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3868787890645716629, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 33.4218
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3868787890645716629, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -5.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4088869081495123135, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
|
||||
propertyPath: player
|
||||
value:
|
||||
objectReference: {fileID: 1407792871}
|
||||
- target: {fileID: 4637900801277279150, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4637900801277279150, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4637900801277279150, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 33.4218
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4637900801277279150, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -5.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4864102413907297127, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4864102413907297127, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4864102413907297127, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 184.00984
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4864102413907297127, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -50
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5156634212059812228, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
|
||||
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
|
||||
value:
|
||||
objectReference: {fileID: 1571118494}
|
||||
- target: {fileID: 6310781014458571912, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6310781014458571912, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6310781014458571912, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 5.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6310781014458571912, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -5.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6508712462537823371, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6508712462537823371, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6508712462537823371, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 50
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6508712462537823371, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -50
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7226858076299792826, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0
|
||||
@ -163,7 +869,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7226858076299792826, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 2
|
||||
value: 3
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7226858076299792826, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
@ -245,8 +951,197 @@ PrefabInstance:
|
||||
propertyPath: player
|
||||
value:
|
||||
objectReference: {fileID: 1407792871}
|
||||
- target: {fileID: 8145377689690508936, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8145377689690508936, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8145377689690508936, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 5.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8145377689690508936, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -5.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8397818908293747857, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8397818908293747857, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8397818908293747857, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 18.883
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8397818908293747857, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -5.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8762152485571598497, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8762152485571598497, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8762152485571598497, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 5.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8762152485571598497, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -5.5
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
|
||||
--- !u!114 &1822990541 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 4088869081495123135, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3}
|
||||
m_PrefabInstance: {fileID: 1822990540}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 79b7d4d08379c4a4b9c0c4a91499fb6d, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1001 &1853250034
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 11
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -39.6
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 53.3
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 150
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.9519358
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0.06536628
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0.25627452
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0.15449566
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 11.75
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: -28.537
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 15.439
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835567, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: enemy2 (6)
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7403712487563690438, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: flyingSpeed
|
||||
value: 10
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7403712487563690438, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: landingPoint
|
||||
value:
|
||||
objectReference: {fileID: 6969840674995165992}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
--- !u!1001 &1880112937
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -7.139782
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 34.4
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 150
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.9519358
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0.06536628
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0.25627452
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0.15449566
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 11.75
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: -28.537
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835566, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 15.439
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1002961339065835567, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: enemy2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7403712487563690438, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: flyingSpeed
|
||||
value: 10
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7403712487563690438, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
propertyPath: landingPoint
|
||||
value:
|
||||
objectReference: {fileID: 6969840674995165992}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3}
|
||||
--- !u!1 &1966667440
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -363,7 +1258,7 @@ Transform:
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 1
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1001 &6969840674995165991
|
||||
PrefabInstance:
|
||||
@ -372,6 +1267,10 @@ PrefabInstance:
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 6969840675499469968, guid: 486166ffed264a842ab4bc0affec38c4, type: 3}
|
||||
propertyPath: m_ActionEvents.Array.data[13].m_PersistentCalls.m_Calls.Array.data[0].m_Target
|
||||
value:
|
||||
objectReference: {fileID: 1571118494}
|
||||
- target: {fileID: 6969840675499469969, guid: 486166ffed264a842ab4bc0affec38c4, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 0
|
||||
@ -422,3 +1321,8 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 486166ffed264a842ab4bc0affec38c4, type: 3}
|
||||
--- !u!4 &6969840674995165992 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 6969840675499469969, guid: 486166ffed264a842ab4bc0affec38c4, type: 3}
|
||||
m_PrefabInstance: {fileID: 6969840674995165991}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
||||
@ -37,18 +37,6 @@ public class CannonScript : MonoBehaviour
|
||||
if(fireTimer >= fireRate){
|
||||
Fire();
|
||||
fireTimer = 0;
|
||||
|
||||
RaycastHit hit;
|
||||
|
||||
if (Physics.Raycast(transform.position, lookDir, out hit, Mathf.Infinity))
|
||||
{
|
||||
GameObject hitObject = hit.collider.gameObject;
|
||||
|
||||
if (hitObject.CompareTag("Enemy"))
|
||||
{
|
||||
hitObject.GetComponent<Enemy>().IsShot(hit.distance, damage);
|
||||
}
|
||||
}
|
||||
}
|
||||
}else if(fireTimer < fireRate){
|
||||
fireTimer += Time.deltaTime;
|
||||
@ -59,6 +47,18 @@ public class CannonScript : MonoBehaviour
|
||||
GameObject proj = Instantiate(projectile, cannon.transform.position, cannon.transform.rotation);
|
||||
proj.GetComponent<Projectile>().SetDamage(damage);
|
||||
proj.GetComponent<Rigidbody>().AddForce(cannonForce * lookDir, ForceMode.Impulse);
|
||||
RaycastHit hit;
|
||||
if (Physics.Raycast(transform.position, lookDir, out hit, Mathf.Infinity))
|
||||
{
|
||||
Debug.DrawRay(transform.position, lookDir * hit.distance, Color.yellow, 0.5f);
|
||||
|
||||
GameObject hitObject = hit.collider.gameObject;
|
||||
|
||||
if (hitObject.CompareTag("Enemy"))
|
||||
{
|
||||
hitObject.GetComponent<Enemy>().IsShot(hit.distance, damage);
|
||||
}
|
||||
}
|
||||
if(bullets > 1){
|
||||
//Pick random offset from lookDir
|
||||
for (int i = 0; i < bullets-1; i++)
|
||||
@ -66,14 +66,39 @@ public class CannonScript : MonoBehaviour
|
||||
proj = Instantiate(projectile, cannon.transform.position, cannon.transform.rotation);
|
||||
proj.GetComponent<Projectile>().SetDamage(damage);
|
||||
proj.GetComponent<Rigidbody>().AddForce(cannonForce * (lookDir+offsets[i]), ForceMode.Impulse);
|
||||
if (Physics.Raycast(transform.position, (lookDir+offsets[i]), out hit, Mathf.Infinity))
|
||||
{
|
||||
Debug.DrawRay(transform.position, (lookDir+offsets[i]) * hit.distance, Color.yellow, 0.5f);
|
||||
|
||||
GameObject hitObject = hit.collider.gameObject;
|
||||
|
||||
if (hitObject.CompareTag("Enemy"))
|
||||
{
|
||||
hitObject.GetComponent<Enemy>().IsShot(hit.distance, damage);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private Vector3 GetMouseWorldPosition(){
|
||||
Vector3 screenPos = Mouse.current.position.ReadValue();
|
||||
screenPos.z = lookDepth;
|
||||
Vector3 worldPoint = Camera.main.ScreenToWorldPoint(screenPos);
|
||||
Ray ray = Camera.main.ScreenPointToRay(screenPos);
|
||||
RaycastHit hit;
|
||||
Vector3 worldPoint = Vector3.zero;
|
||||
if (Physics.Raycast(ray, out hit)) {
|
||||
if(hit.transform.gameObject.CompareTag("Enemy")){
|
||||
worldPoint = hit.point;
|
||||
}else{
|
||||
screenPos.z = lookDepth;
|
||||
worldPoint = Camera.main.ScreenToWorldPoint(screenPos);
|
||||
}
|
||||
|
||||
}
|
||||
if(worldPoint == Vector3.zero){
|
||||
screenPos.z = lookDepth;
|
||||
worldPoint = Camera.main.ScreenToWorldPoint(screenPos);
|
||||
}
|
||||
|
||||
return worldPoint;
|
||||
}
|
||||
|
||||
@ -13,6 +13,7 @@ public class GameManager : MonoBehaviour
|
||||
|
||||
public static GameManager Instance { get; private set; }
|
||||
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
if (Instance != null && Instance != this)
|
||||
@ -98,10 +99,11 @@ public class GameManager : MonoBehaviour
|
||||
points += amount;
|
||||
uiController.UpdatePointsText(points);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public enum GameState
|
||||
{
|
||||
InGame,
|
||||
Loss
|
||||
Loss,
|
||||
}
|
||||
71
Assets/Scripts/MainMenuController.cs
Normal file
71
Assets/Scripts/MainMenuController.cs
Normal file
@ -0,0 +1,71 @@
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using UnityEngine.SceneManagement;
|
||||
using TMPro;
|
||||
|
||||
public class MainMenuController : MonoBehaviour
|
||||
{
|
||||
public enum MenuMode {
|
||||
MainMenu,
|
||||
Options,
|
||||
Help,
|
||||
Leaderboard
|
||||
}
|
||||
|
||||
[SerializeField]
|
||||
TMP_Text titleLabel;
|
||||
|
||||
[SerializeField]
|
||||
Transform startMenuParent;
|
||||
|
||||
[SerializeField]
|
||||
Transform optionsParent;
|
||||
[SerializeField]
|
||||
Transform helpParent;
|
||||
|
||||
MenuMode? lastMode;
|
||||
MenuMode mode;
|
||||
|
||||
private void Start() {
|
||||
SetMenuMode(MenuMode.MainMenu);
|
||||
}
|
||||
public void SetMenuMode(MenuMode mode) {
|
||||
//meh
|
||||
titleLabel.gameObject.SetActive(mode == MenuMode.MainMenu);
|
||||
startMenuParent.gameObject.SetActive(mode == MenuMode.MainMenu);
|
||||
optionsParent.gameObject.SetActive(mode == MenuMode.Options);
|
||||
helpParent.gameObject.SetActive(mode == MenuMode.Help);
|
||||
if(this.mode == MenuMode.MainMenu)
|
||||
lastMode = this.mode;
|
||||
|
||||
this.mode = mode;
|
||||
// ResetMenuState();
|
||||
}
|
||||
|
||||
public void OnPlay(){
|
||||
SceneManager.LoadScene("testing_art");
|
||||
|
||||
}
|
||||
|
||||
public void OnOptions(){
|
||||
SetMenuMode(MenuMode.Options);
|
||||
}
|
||||
|
||||
public void OnHelp(){
|
||||
SetMenuMode(MenuMode.Help);
|
||||
}
|
||||
|
||||
public void OnLeaderboard(){
|
||||
SetMenuMode(MenuMode.Leaderboard);
|
||||
}
|
||||
|
||||
public void OnBack(){
|
||||
if (lastMode != null)
|
||||
SetMenuMode(lastMode.Value);
|
||||
}
|
||||
|
||||
public void OnQuit(){
|
||||
Application.Quit();
|
||||
}
|
||||
}
|
||||
11
Assets/Scripts/MainMenuController.cs.meta
Normal file
11
Assets/Scripts/MainMenuController.cs.meta
Normal file
@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 63a136c2da9b90043bc035364152917d
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -11,7 +11,7 @@ public class PlayerController : MonoBehaviour
|
||||
// Start is called before the first frame update
|
||||
void Start()
|
||||
{
|
||||
//fireRateUpgrade = new FireRateUpgrade("Fire rate 1", 10, 0.4f);
|
||||
|
||||
}
|
||||
|
||||
// Update is called once per frame
|
||||
|
||||
@ -53,6 +53,15 @@ public partial class @ConjureCreativeJam20 : IInputActionCollection2, IDisposabl
|
||||
""processors"": """",
|
||||
""interactions"": """",
|
||||
""initialStateCheck"": false
|
||||
},
|
||||
{
|
||||
""name"": ""Pause"",
|
||||
""type"": ""Button"",
|
||||
""id"": ""1e10adeb-97dd-4b7c-9f30-b3fce70f993a"",
|
||||
""expectedControlType"": ""Button"",
|
||||
""processors"": """",
|
||||
""interactions"": """",
|
||||
""initialStateCheck"": false
|
||||
}
|
||||
],
|
||||
""bindings"": [
|
||||
@ -275,6 +284,28 @@ public partial class @ConjureCreativeJam20 : IInputActionCollection2, IDisposabl
|
||||
""action"": ""Fire"",
|
||||
""isComposite"": false,
|
||||
""isPartOfComposite"": false
|
||||
},
|
||||
{
|
||||
""name"": """",
|
||||
""id"": ""53312b67-7bed-4fba-950b-f39295c65c51"",
|
||||
""path"": ""<Keyboard>/escape"",
|
||||
""interactions"": """",
|
||||
""processors"": """",
|
||||
""groups"": ""Keyboard&Mouse"",
|
||||
""action"": ""Pause"",
|
||||
""isComposite"": false,
|
||||
""isPartOfComposite"": false
|
||||
},
|
||||
{
|
||||
""name"": """",
|
||||
""id"": ""e219b9a4-11c4-4175-b34c-c0a729cf0fe6"",
|
||||
""path"": ""<Keyboard>/p"",
|
||||
""interactions"": """",
|
||||
""processors"": """",
|
||||
""groups"": ""Keyboard&Mouse"",
|
||||
""action"": ""Pause"",
|
||||
""isComposite"": false,
|
||||
""isPartOfComposite"": false
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -863,6 +894,7 @@ public partial class @ConjureCreativeJam20 : IInputActionCollection2, IDisposabl
|
||||
m_Player_Move = m_Player.FindAction("Move", throwIfNotFound: true);
|
||||
m_Player_Look = m_Player.FindAction("Look", throwIfNotFound: true);
|
||||
m_Player_Fire = m_Player.FindAction("Fire", throwIfNotFound: true);
|
||||
m_Player_Pause = m_Player.FindAction("Pause", throwIfNotFound: true);
|
||||
// UI
|
||||
m_UI = asset.FindActionMap("UI", throwIfNotFound: true);
|
||||
m_UI_Navigate = m_UI.FindAction("Navigate", throwIfNotFound: true);
|
||||
@ -937,6 +969,7 @@ public partial class @ConjureCreativeJam20 : IInputActionCollection2, IDisposabl
|
||||
private readonly InputAction m_Player_Move;
|
||||
private readonly InputAction m_Player_Look;
|
||||
private readonly InputAction m_Player_Fire;
|
||||
private readonly InputAction m_Player_Pause;
|
||||
public struct PlayerActions
|
||||
{
|
||||
private @ConjureCreativeJam20 m_Wrapper;
|
||||
@ -944,6 +977,7 @@ public partial class @ConjureCreativeJam20 : IInputActionCollection2, IDisposabl
|
||||
public InputAction @Move => m_Wrapper.m_Player_Move;
|
||||
public InputAction @Look => m_Wrapper.m_Player_Look;
|
||||
public InputAction @Fire => m_Wrapper.m_Player_Fire;
|
||||
public InputAction @Pause => m_Wrapper.m_Player_Pause;
|
||||
public InputActionMap Get() { return m_Wrapper.m_Player; }
|
||||
public void Enable() { Get().Enable(); }
|
||||
public void Disable() { Get().Disable(); }
|
||||
@ -962,6 +996,9 @@ public partial class @ConjureCreativeJam20 : IInputActionCollection2, IDisposabl
|
||||
@Fire.started -= m_Wrapper.m_PlayerActionsCallbackInterface.OnFire;
|
||||
@Fire.performed -= m_Wrapper.m_PlayerActionsCallbackInterface.OnFire;
|
||||
@Fire.canceled -= m_Wrapper.m_PlayerActionsCallbackInterface.OnFire;
|
||||
@Pause.started -= m_Wrapper.m_PlayerActionsCallbackInterface.OnPause;
|
||||
@Pause.performed -= m_Wrapper.m_PlayerActionsCallbackInterface.OnPause;
|
||||
@Pause.canceled -= m_Wrapper.m_PlayerActionsCallbackInterface.OnPause;
|
||||
}
|
||||
m_Wrapper.m_PlayerActionsCallbackInterface = instance;
|
||||
if (instance != null)
|
||||
@ -975,6 +1012,9 @@ public partial class @ConjureCreativeJam20 : IInputActionCollection2, IDisposabl
|
||||
@Fire.started += instance.OnFire;
|
||||
@Fire.performed += instance.OnFire;
|
||||
@Fire.canceled += instance.OnFire;
|
||||
@Pause.started += instance.OnPause;
|
||||
@Pause.performed += instance.OnPause;
|
||||
@Pause.canceled += instance.OnPause;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1134,6 +1174,7 @@ public partial class @ConjureCreativeJam20 : IInputActionCollection2, IDisposabl
|
||||
void OnMove(InputAction.CallbackContext context);
|
||||
void OnLook(InputAction.CallbackContext context);
|
||||
void OnFire(InputAction.CallbackContext context);
|
||||
void OnPause(InputAction.CallbackContext context);
|
||||
}
|
||||
public interface IUIActions
|
||||
{
|
||||
|
||||
@ -31,6 +31,15 @@
|
||||
"processors": "",
|
||||
"interactions": "",
|
||||
"initialStateCheck": false
|
||||
},
|
||||
{
|
||||
"name": "Pause",
|
||||
"type": "Button",
|
||||
"id": "1e10adeb-97dd-4b7c-9f30-b3fce70f993a",
|
||||
"expectedControlType": "Button",
|
||||
"processors": "",
|
||||
"interactions": "",
|
||||
"initialStateCheck": false
|
||||
}
|
||||
],
|
||||
"bindings": [
|
||||
@ -253,6 +262,28 @@
|
||||
"action": "Fire",
|
||||
"isComposite": false,
|
||||
"isPartOfComposite": false
|
||||
},
|
||||
{
|
||||
"name": "",
|
||||
"id": "53312b67-7bed-4fba-950b-f39295c65c51",
|
||||
"path": "<Keyboard>/escape",
|
||||
"interactions": "",
|
||||
"processors": "",
|
||||
"groups": "Keyboard&Mouse",
|
||||
"action": "Pause",
|
||||
"isComposite": false,
|
||||
"isPartOfComposite": false
|
||||
},
|
||||
{
|
||||
"name": "",
|
||||
"id": "e219b9a4-11c4-4175-b34c-c0a729cf0fe6",
|
||||
"path": "<Keyboard>/p",
|
||||
"interactions": "",
|
||||
"processors": "",
|
||||
"groups": "Keyboard&Mouse",
|
||||
"action": "Pause",
|
||||
"isComposite": false,
|
||||
"isPartOfComposite": false
|
||||
}
|
||||
]
|
||||
},
|
||||
|
||||
@ -8,4 +8,10 @@ EditorBuildSettings:
|
||||
- enabled: 0
|
||||
path:
|
||||
guid: 00000000000000000000000000000000
|
||||
- enabled: 1
|
||||
path: Assets/Scenes/MainMenu.unity
|
||||
guid: e00e1e3705465134eb4853ed0bef2506
|
||||
- enabled: 1
|
||||
path: Assets/Scenes/testing_art.unity
|
||||
guid: 99c9720ab356a0642a771bea13969a05
|
||||
m_configObjects: {}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user