Merge remote-tracking branch 'origin/master' into Sound
This commit is contained in:
Piegames
commit
2b5a0b4d67
46 changed files with 5971 additions and 173 deletions
|
|
@ -9,162 +9,185 @@ Prefab:
|
|||
m_Modifications: []
|
||||
m_RemovedComponents: []
|
||||
m_ParentPrefab: {fileID: 0}
|
||||
m_RootGameObject: {fileID: 1971451785855062}
|
||||
m_RootGameObject: {fileID: 1887677565572348}
|
||||
m_IsPrefabParent: 1
|
||||
--- !u!1 &1336247710664522
|
||||
--- !u!1 &1259125736160938
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
serializedVersion: 5
|
||||
m_Component:
|
||||
- component: {fileID: 4340855217109864}
|
||||
m_Layer: 0
|
||||
- component: {fileID: 4528190223728408}
|
||||
m_Layer: 9
|
||||
m_Name: bulletspawn
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!1 &1310248020783766
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 1
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
serializedVersion: 5
|
||||
m_Component:
|
||||
- component: {fileID: 4011283098147256}
|
||||
- component: {fileID: 212750371912380942}
|
||||
m_Layer: 9
|
||||
m_Name: New Sprite
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!1 &1426189685467450
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
serializedVersion: 5
|
||||
m_Component:
|
||||
- component: {fileID: 4193287044024648}
|
||||
m_Layer: 9
|
||||
m_Name: Graphics
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!1 &1659126864891018
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 1
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
serializedVersion: 5
|
||||
m_Component:
|
||||
- component: {fileID: 4161383188196848}
|
||||
- component: {fileID: 212571453617041228}
|
||||
m_Layer: 0
|
||||
m_Name: enemyTMP
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!1 &1971451785855062
|
||||
--- !u!1 &1887677565572348
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
serializedVersion: 5
|
||||
m_Component:
|
||||
- component: {fileID: 4702455771231736}
|
||||
- component: {fileID: 50727245938404542}
|
||||
- component: {fileID: 61080315530130294}
|
||||
- component: {fileID: 114170512691432560}
|
||||
m_Layer: 0
|
||||
m_Name: Enemy
|
||||
m_TagString: Player
|
||||
- component: {fileID: 4665188581213052}
|
||||
- component: {fileID: 50033980456084712}
|
||||
- component: {fileID: 70142526866238118}
|
||||
- component: {fileID: 114843041321231988}
|
||||
m_Layer: 9
|
||||
m_Name: Bug
|
||||
m_TagString: Enemy
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &4161383188196848
|
||||
--- !u!4 &4011283098147256
|
||||
Transform:
|
||||
m_ObjectHideFlags: 1
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
m_GameObject: {fileID: 1659126864891018}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_GameObject: {fileID: 1310248020783766}
|
||||
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: 4340855217109864}
|
||||
m_Father: {fileID: 4193287044024648}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!4 &4340855217109864
|
||||
--- !u!4 &4193287044024648
|
||||
Transform:
|
||||
m_ObjectHideFlags: 1
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
m_GameObject: {fileID: 1336247710664522}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: -2.5, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 4161383188196848}
|
||||
m_Father: {fileID: 4702455771231736}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!4 &4702455771231736
|
||||
Transform:
|
||||
m_ObjectHideFlags: 1
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
m_GameObject: {fileID: 1971451785855062}
|
||||
m_GameObject: {fileID: 1426189685467450}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 0.25, y: 0.25, z: 0.25}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 4340855217109864}
|
||||
- {fileID: 4011283098147256}
|
||||
m_Father: {fileID: 4665188581213052}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!4 &4528190223728408
|
||||
Transform:
|
||||
m_ObjectHideFlags: 1
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
m_GameObject: {fileID: 1259125736160938}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0.319, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 4665188581213052}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!4 &4665188581213052
|
||||
Transform:
|
||||
m_ObjectHideFlags: 1
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
m_GameObject: {fileID: 1887677565572348}
|
||||
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: 4193287044024648}
|
||||
- {fileID: 4528190223728408}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!50 &50727245938404542
|
||||
--- !u!50 &50033980456084712
|
||||
Rigidbody2D:
|
||||
serializedVersion: 4
|
||||
m_ObjectHideFlags: 1
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
m_GameObject: {fileID: 1971451785855062}
|
||||
m_GameObject: {fileID: 1887677565572348}
|
||||
m_BodyType: 0
|
||||
m_Simulated: 1
|
||||
m_UseFullKinematicContacts: 0
|
||||
m_UseAutoMass: 0
|
||||
m_Mass: 1
|
||||
m_LinearDrag: 0.1
|
||||
m_AngularDrag: 0.01
|
||||
m_GravityScale: 0
|
||||
m_LinearDrag: 0
|
||||
m_AngularDrag: 0.05
|
||||
m_GravityScale: 1
|
||||
m_Material: {fileID: 0}
|
||||
m_Interpolate: 1
|
||||
m_Interpolate: 0
|
||||
m_SleepingMode: 1
|
||||
m_CollisionDetection: 0
|
||||
m_Constraints: 0
|
||||
--- !u!61 &61080315530130294
|
||||
BoxCollider2D:
|
||||
--- !u!70 &70142526866238118
|
||||
CapsuleCollider2D:
|
||||
m_ObjectHideFlags: 1
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
m_GameObject: {fileID: 1971451785855062}
|
||||
m_GameObject: {fileID: 1887677565572348}
|
||||
m_Enabled: 1
|
||||
m_Density: 1
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 0
|
||||
m_UsedByEffector: 0
|
||||
m_UsedByComposite: 0
|
||||
m_Offset: {x: 0.30773532, y: -2.1199532}
|
||||
m_SpriteTilingProperty:
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
pivot: {x: 0, y: 0}
|
||||
oldSize: {x: 0, y: 0}
|
||||
newSize: {x: 0, y: 0}
|
||||
adaptiveTilingThreshold: 0
|
||||
drawMode: 0
|
||||
adaptiveTiling: 0
|
||||
m_AutoTiling: 0
|
||||
serializedVersion: 2
|
||||
m_Size: {x: 5.3082895, y: 6.402458}
|
||||
m_EdgeRadius: 0
|
||||
--- !u!114 &114170512691432560
|
||||
m_Offset: {x: 0.008751139, y: -0.0116683245}
|
||||
m_Size: {x: 0.49416587, y: 0.5916126}
|
||||
m_Direction: 0
|
||||
--- !u!114 &114843041321231988
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 1
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
m_GameObject: {fileID: 1971451785855062}
|
||||
m_GameObject: {fileID: 1887677565572348}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 582bfd99a32c0ea45a7d09ef4f308d88, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: c5616b0c23c6dce40b9019a2217bc1a8, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
speed: 0.7
|
||||
speed: 2
|
||||
rotationSpeed: 1
|
||||
--- !u!212 &212571453617041228
|
||||
victim: {fileID: 0}
|
||||
body: {fileID: 50033980456084712}
|
||||
bulletSpawn: {fileID: 4528190223728408}
|
||||
bullet: {fileID: 1379543051791382, guid: c6c321ecc6516374781405a54c1fa6a7, type: 2}
|
||||
--- !u!212 &212750371912380942
|
||||
SpriteRenderer:
|
||||
m_ObjectHideFlags: 1
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
m_GameObject: {fileID: 1659126864891018}
|
||||
m_GameObject: {fileID: 1310248020783766}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 0
|
||||
m_ReceiveShadows: 0
|
||||
|
|
@ -194,12 +217,12 @@ SpriteRenderer:
|
|||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_Sprite: {fileID: 21300000, guid: c1bebd5f42b808e45a7ab9f786c4319b, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: 4452f4d6c09a1464c9869c0496d528a4, type: 3}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_FlipX: 0
|
||||
m_FlipY: 0
|
||||
m_DrawMode: 0
|
||||
m_Size: {x: 10, y: 10}
|
||||
m_Size: {x: 7.36, y: 6.21}
|
||||
m_AdaptiveModeThreshold: 0.5
|
||||
m_SpriteTileMode: 0
|
||||
m_WasSpriteAssigned: 1
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: ff87b9de73979cd40a9853419833a91f
|
||||
guid: dd625f75dbf83194392a299951cf04fb
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 100100000
|
||||
|
|
@ -141,7 +141,7 @@ Transform:
|
|||
m_PrefabInternal: {fileID: 100100000}
|
||||
m_GameObject: {fileID: 1136532900431144}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 2.23, z: 0}
|
||||
m_LocalPosition: {x: 0, y: 1.12, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 4079161515917916}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -59,8 +59,8 @@ BoxCollider2D:
|
|||
m_SpriteTilingProperty:
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
pivot: {x: 0.5, y: 0.5}
|
||||
oldSize: {x: 10, y: 10}
|
||||
newSize: {x: 10, y: 10}
|
||||
oldSize: {x: 1, y: 1}
|
||||
newSize: {x: 1, y: 1}
|
||||
adaptiveTilingThreshold: 0.5
|
||||
drawMode: 0
|
||||
adaptiveTiling: 0
|
||||
|
|
@ -84,8 +84,8 @@ BoxCollider2D:
|
|||
m_SpriteTilingProperty:
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
pivot: {x: 0.5, y: 0.5}
|
||||
oldSize: {x: 10, y: 10}
|
||||
newSize: {x: 10, y: 10}
|
||||
oldSize: {x: 1, y: 1}
|
||||
newSize: {x: 1, y: 1}
|
||||
adaptiveTilingThreshold: 0.5
|
||||
drawMode: 0
|
||||
adaptiveTiling: 0
|
||||
|
|
@ -145,7 +145,7 @@ SpriteRenderer:
|
|||
m_FlipX: 0
|
||||
m_FlipY: 0
|
||||
m_DrawMode: 0
|
||||
m_Size: {x: 10, y: 10}
|
||||
m_Size: {x: 1, y: 1}
|
||||
m_AdaptiveModeThreshold: 0.5
|
||||
m_SpriteTileMode: 0
|
||||
m_WasSpriteAssigned: 1
|
||||
|
|
|
|||
|
|
@ -59,8 +59,8 @@ BoxCollider2D:
|
|||
m_SpriteTilingProperty:
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
pivot: {x: 0.5, y: 0.5}
|
||||
oldSize: {x: 10, y: 10}
|
||||
newSize: {x: 10, y: 10}
|
||||
oldSize: {x: 1, y: 1}
|
||||
newSize: {x: 1, y: 1}
|
||||
adaptiveTilingThreshold: 0.5
|
||||
drawMode: 0
|
||||
adaptiveTiling: 0
|
||||
|
|
@ -84,8 +84,8 @@ BoxCollider2D:
|
|||
m_SpriteTilingProperty:
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
pivot: {x: 0.5, y: 0.5}
|
||||
oldSize: {x: 10, y: 10}
|
||||
newSize: {x: 10, y: 10}
|
||||
oldSize: {x: 1, y: 1}
|
||||
newSize: {x: 1, y: 1}
|
||||
adaptiveTilingThreshold: 0.5
|
||||
drawMode: 0
|
||||
adaptiveTiling: 0
|
||||
|
|
@ -145,7 +145,7 @@ SpriteRenderer:
|
|||
m_FlipX: 0
|
||||
m_FlipY: 0
|
||||
m_DrawMode: 0
|
||||
m_Size: {x: 10, y: 10}
|
||||
m_Size: {x: 1, y: 1}
|
||||
m_AdaptiveModeThreshold: 0.5
|
||||
m_SpriteTileMode: 0
|
||||
m_WasSpriteAssigned: 1
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ GameObject:
|
|||
- component: {fileID: 4167595944037000}
|
||||
- component: {fileID: 212910617741009226}
|
||||
m_Layer: 0
|
||||
m_Name: ground
|
||||
m_Name: ground0
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
87
Assets/Prefabs/Tiles/ground1.prefab
Normal file
87
Assets/Prefabs/Tiles/ground1.prefab
Normal file
|
|
@ -0,0 +1,87 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1001 &100100000
|
||||
Prefab:
|
||||
m_ObjectHideFlags: 1
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications: []
|
||||
m_RemovedComponents: []
|
||||
m_ParentPrefab: {fileID: 0}
|
||||
m_RootGameObject: {fileID: 1772182943815902}
|
||||
m_IsPrefabParent: 1
|
||||
--- !u!1 &1772182943815902
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
serializedVersion: 5
|
||||
m_Component:
|
||||
- component: {fileID: 4004370254865002}
|
||||
- component: {fileID: 212559770023032644}
|
||||
m_Layer: 0
|
||||
m_Name: ground1
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &4004370254865002
|
||||
Transform:
|
||||
m_ObjectHideFlags: 1
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
m_GameObject: {fileID: 1772182943815902}
|
||||
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}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!212 &212559770023032644
|
||||
SpriteRenderer:
|
||||
m_ObjectHideFlags: 1
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
m_GameObject: {fileID: 1772182943815902}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 0
|
||||
m_ReceiveShadows: 0
|
||||
m_DynamicOccludee: 1
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RenderingLayerMask: 4294967295
|
||||
m_Materials:
|
||||
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
m_StaticBatchRoot: {fileID: 0}
|
||||
m_ProbeAnchor: {fileID: 0}
|
||||
m_LightProbeVolumeOverride: {fileID: 0}
|
||||
m_ScaleInLightmap: 1
|
||||
m_PreserveUVs: 0
|
||||
m_IgnoreNormalsForChartDetection: 0
|
||||
m_ImportantGI: 0
|
||||
m_StitchLightmapSeams: 0
|
||||
m_SelectedEditorRenderState: 0
|
||||
m_MinimumChartSize: 4
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: 1778783263
|
||||
m_SortingLayer: -2
|
||||
m_SortingOrder: 0
|
||||
m_Sprite: {fileID: 21300000, guid: 49256f7e236f405479e9486997de5827, type: 3}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_FlipX: 0
|
||||
m_FlipY: 0
|
||||
m_DrawMode: 0
|
||||
m_Size: {x: 1, y: 1}
|
||||
m_AdaptiveModeThreshold: 0.5
|
||||
m_SpriteTileMode: 0
|
||||
m_WasSpriteAssigned: 1
|
||||
m_MaskInteraction: 0
|
||||
8
Assets/Prefabs/Tiles/ground1.prefab.meta
Normal file
8
Assets/Prefabs/Tiles/ground1.prefab.meta
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: d5ac6ff96b8389a4f89e000bb512df0c
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 100100000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
87
Assets/Prefabs/Tiles/ground2.prefab
Normal file
87
Assets/Prefabs/Tiles/ground2.prefab
Normal file
|
|
@ -0,0 +1,87 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1001 &100100000
|
||||
Prefab:
|
||||
m_ObjectHideFlags: 1
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications: []
|
||||
m_RemovedComponents: []
|
||||
m_ParentPrefab: {fileID: 0}
|
||||
m_RootGameObject: {fileID: 1292387089709784}
|
||||
m_IsPrefabParent: 1
|
||||
--- !u!1 &1292387089709784
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
serializedVersion: 5
|
||||
m_Component:
|
||||
- component: {fileID: 4651364019093178}
|
||||
- component: {fileID: 212787770381317586}
|
||||
m_Layer: 0
|
||||
m_Name: ground2
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &4651364019093178
|
||||
Transform:
|
||||
m_ObjectHideFlags: 1
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
m_GameObject: {fileID: 1292387089709784}
|
||||
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}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!212 &212787770381317586
|
||||
SpriteRenderer:
|
||||
m_ObjectHideFlags: 1
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
m_GameObject: {fileID: 1292387089709784}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 0
|
||||
m_ReceiveShadows: 0
|
||||
m_DynamicOccludee: 1
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RenderingLayerMask: 4294967295
|
||||
m_Materials:
|
||||
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
m_StaticBatchRoot: {fileID: 0}
|
||||
m_ProbeAnchor: {fileID: 0}
|
||||
m_LightProbeVolumeOverride: {fileID: 0}
|
||||
m_ScaleInLightmap: 1
|
||||
m_PreserveUVs: 0
|
||||
m_IgnoreNormalsForChartDetection: 0
|
||||
m_ImportantGI: 0
|
||||
m_StitchLightmapSeams: 0
|
||||
m_SelectedEditorRenderState: 0
|
||||
m_MinimumChartSize: 4
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: 1778783263
|
||||
m_SortingLayer: -2
|
||||
m_SortingOrder: 0
|
||||
m_Sprite: {fileID: 21300000, guid: 10d0c9bab26278e4997c44ba3f4833fd, type: 3}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_FlipX: 0
|
||||
m_FlipY: 0
|
||||
m_DrawMode: 0
|
||||
m_Size: {x: 1, y: 1}
|
||||
m_AdaptiveModeThreshold: 0.5
|
||||
m_SpriteTileMode: 0
|
||||
m_WasSpriteAssigned: 1
|
||||
m_MaskInteraction: 0
|
||||
8
Assets/Prefabs/Tiles/ground2.prefab.meta
Normal file
8
Assets/Prefabs/Tiles/ground2.prefab.meta
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: ea403377dca91e246a37fc2101f23c5d
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 100100000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
87
Assets/Prefabs/Tiles/ground3.prefab
Normal file
87
Assets/Prefabs/Tiles/ground3.prefab
Normal file
|
|
@ -0,0 +1,87 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1001 &100100000
|
||||
Prefab:
|
||||
m_ObjectHideFlags: 1
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications: []
|
||||
m_RemovedComponents: []
|
||||
m_ParentPrefab: {fileID: 0}
|
||||
m_RootGameObject: {fileID: 1395236729573066}
|
||||
m_IsPrefabParent: 1
|
||||
--- !u!1 &1395236729573066
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
serializedVersion: 5
|
||||
m_Component:
|
||||
- component: {fileID: 4921335849219796}
|
||||
- component: {fileID: 212224877339124618}
|
||||
m_Layer: 0
|
||||
m_Name: ground3
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &4921335849219796
|
||||
Transform:
|
||||
m_ObjectHideFlags: 1
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
m_GameObject: {fileID: 1395236729573066}
|
||||
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}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!212 &212224877339124618
|
||||
SpriteRenderer:
|
||||
m_ObjectHideFlags: 1
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
m_GameObject: {fileID: 1395236729573066}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 0
|
||||
m_ReceiveShadows: 0
|
||||
m_DynamicOccludee: 1
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RenderingLayerMask: 4294967295
|
||||
m_Materials:
|
||||
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
m_StaticBatchRoot: {fileID: 0}
|
||||
m_ProbeAnchor: {fileID: 0}
|
||||
m_LightProbeVolumeOverride: {fileID: 0}
|
||||
m_ScaleInLightmap: 1
|
||||
m_PreserveUVs: 0
|
||||
m_IgnoreNormalsForChartDetection: 0
|
||||
m_ImportantGI: 0
|
||||
m_StitchLightmapSeams: 0
|
||||
m_SelectedEditorRenderState: 0
|
||||
m_MinimumChartSize: 4
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: 1778783263
|
||||
m_SortingLayer: -2
|
||||
m_SortingOrder: 0
|
||||
m_Sprite: {fileID: 21300000, guid: 45575f1a36cb12649a2bb6eaa0f9fcfe, type: 3}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_FlipX: 0
|
||||
m_FlipY: 0
|
||||
m_DrawMode: 0
|
||||
m_Size: {x: 1, y: 1}
|
||||
m_AdaptiveModeThreshold: 0.5
|
||||
m_SpriteTileMode: 0
|
||||
m_WasSpriteAssigned: 1
|
||||
m_MaskInteraction: 0
|
||||
8
Assets/Prefabs/Tiles/ground3.prefab.meta
Normal file
8
Assets/Prefabs/Tiles/ground3.prefab.meta
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 2b27ba92cf33a624ea670c46a3e569b0
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 100100000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -753,11 +753,6 @@ Prefab:
|
|||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 60772848946696534, guid: 3d1911457c1e44f53b6b4044334db52f,
|
||||
type: 2}
|
||||
propertyPath: m_Enabled
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_ParentPrefab: {fileID: 100100000, guid: 3d1911457c1e44f53b6b4044334db52f, type: 2}
|
||||
m_IsPrefabParent: 0
|
||||
|
|
@ -886,6 +881,53 @@ MonoBehaviour:
|
|||
- {fileID: 2133072948}
|
||||
- {fileID: 2012930731}
|
||||
- {fileID: 2060531170}
|
||||
- {fileID: 1908750963}
|
||||
--- !u!1001 &934296221
|
||||
Prefab:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 4665188581213052, guid: dd625f75dbf83194392a299951cf04fb, type: 2}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4665188581213052, guid: dd625f75dbf83194392a299951cf04fb, type: 2}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4665188581213052, guid: dd625f75dbf83194392a299951cf04fb, type: 2}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4665188581213052, guid: dd625f75dbf83194392a299951cf04fb, type: 2}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4665188581213052, guid: dd625f75dbf83194392a299951cf04fb, type: 2}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4665188581213052, guid: dd625f75dbf83194392a299951cf04fb, type: 2}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4665188581213052, guid: dd625f75dbf83194392a299951cf04fb, type: 2}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4665188581213052, guid: dd625f75dbf83194392a299951cf04fb, type: 2}
|
||||
propertyPath: m_RootOrder
|
||||
value: 6
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1887677565572348, guid: dd625f75dbf83194392a299951cf04fb, type: 2}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_ParentPrefab: {fileID: 100100000, guid: dd625f75dbf83194392a299951cf04fb, type: 2}
|
||||
m_IsPrefabParent: 0
|
||||
--- !u!1 &1028937042
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1891,13 +1933,17 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
scorpion: {fileID: 1303102899095328, guid: 4c5ecfd27b4038941a6e493a8117ea0a, type: 2}
|
||||
bug: {fileID: 1887677565572348, guid: dd625f75dbf83194392a299951cf04fb, type: 2}
|
||||
BorderOuter: {fileID: 1062532744197412, guid: bc306521f11be424f9833117977b4319,
|
||||
type: 2}
|
||||
BorderInner: {fileID: 1893245914782828, guid: 7326753bf2b213d4e8c2ee93d78ba7d9,
|
||||
type: 2}
|
||||
BorderSingle: {fileID: 1277252496101342, guid: ed9537580662f6046a1514a4c5bfdd98,
|
||||
type: 2}
|
||||
Ground: {fileID: 1487413182883822, guid: bc8a58beb0459094483211a5c7933959, type: 2}
|
||||
Ground0: {fileID: 1487413182883822, guid: bc8a58beb0459094483211a5c7933959, type: 2}
|
||||
Ground1: {fileID: 1772182943815902, guid: d5ac6ff96b8389a4f89e000bb512df0c, type: 2}
|
||||
Ground2: {fileID: 1292387089709784, guid: ea403377dca91e246a37fc2101f23c5d, type: 2}
|
||||
Ground3: {fileID: 1395236729573066, guid: 2b27ba92cf33a624ea670c46a3e569b0, type: 2}
|
||||
DoorInner: {fileID: 1065161683117842, guid: 06aa81f4fbf9a3a4a8f9fdadafcbf7fa, type: 2}
|
||||
DoorOuter: {fileID: 1575370008060226, guid: 70bf9bb227285e74383db2dc84cc6c50, type: 2}
|
||||
Rock: {fileID: 1373919933116942, guid: 5f26192f79d542e49ad24fadc39f5654, type: 2}
|
||||
|
|
@ -1916,6 +1962,7 @@ MonoBehaviour:
|
|||
RockLUR: {fileID: 1938166751346222, guid: 6b83a6a46c57a634fa5085684bad0085, type: 2}
|
||||
RockURD: {fileID: 1437035058628240, guid: 30338afac8ce7054fbff8de89db815e8, type: 2}
|
||||
RockLRD: {fileID: 1251219893662246, guid: e37e0c5d4b013304cbcb32b223264452, type: 2}
|
||||
Flag: {fileID: 1065161683117842, guid: 06aa81f4fbf9a3a4a8f9fdadafcbf7fa, type: 2}
|
||||
playerPrefab: {fileID: 1679161327080020, guid: 3d1911457c1e44f53b6b4044334db52f,
|
||||
type: 2}
|
||||
ui: {fileID: 1379476069}
|
||||
|
|
|
|||
|
|
@ -16,6 +16,10 @@ public class Bullet : MonoBehaviour {
|
|||
|
||||
}
|
||||
|
||||
public void SetSpeed(float spd) {
|
||||
speed = spd;
|
||||
}
|
||||
|
||||
public void SetDamage(int dmg) {
|
||||
damage = dmg;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -65,13 +65,15 @@ public class Door : MonoBehaviour {
|
|||
/// <param name="collision"></param>
|
||||
private void OnTriggerExit2D(Collider2D collision) {
|
||||
if ( collision.tag == "Player") {
|
||||
// TODO better checks
|
||||
Player player = collision.gameObject.GetComponent<Player>();
|
||||
if ((boundingBox.offset - parent.GetCenter()).sqrMagnitude < ((Vector2) player.transform.position - parent.GetCenter()).sqrMagnitude)
|
||||
return;
|
||||
Debug.Log("Leaving Trigger");
|
||||
if(parent == null) {
|
||||
Debug.Log("This door has no parent Room!");
|
||||
return;
|
||||
}
|
||||
parent.OnPlayerEnter(collision.gameObject.GetComponent<Player>());
|
||||
parent.OnPlayerEnter(player);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
13
Assets/Scripts/Entities/Attack/GatlingGun.cs
Normal file
13
Assets/Scripts/Entities/Attack/GatlingGun.cs
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
namespace Assets.Scripts.Entities.Attack {
|
||||
class GatlingGun : SingleShot {
|
||||
public GatlingGun(GameObject owner) : base(owner) {
|
||||
damage = 5;
|
||||
cooldown = 0.1f;
|
||||
speed = 20;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
11
Assets/Scripts/Entities/Attack/GatlingGun.cs.meta
Normal file
11
Assets/Scripts/Entities/Attack/GatlingGun.cs.meta
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 947693703e16a8e4d9542d72d014e351
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -8,7 +8,7 @@ namespace Assets.Scripts.Entities.Attack {
|
|||
|
||||
int damage = 10;
|
||||
float cooldown = 1;
|
||||
float range = 2f;
|
||||
float range = 1f;
|
||||
GameObject owner;
|
||||
|
||||
public MeleeAttack(GameObject owner) {
|
||||
|
|
|
|||
|
|
@ -5,9 +5,10 @@ using UnityEngine;
|
|||
namespace Assets.Scripts.Entities.Attack {
|
||||
class SingleShot : IAttack {
|
||||
|
||||
int damage = 12;
|
||||
float cooldown = 1;
|
||||
int range = 4;
|
||||
protected int damage = 12;
|
||||
protected float cooldown = 1;
|
||||
protected int range = 4;
|
||||
protected float speed = 10;
|
||||
GameObject owner;
|
||||
GameObject bulletPrefab;
|
||||
Transform spawn;
|
||||
|
|
@ -25,13 +26,16 @@ namespace Assets.Scripts.Entities.Attack {
|
|||
}
|
||||
|
||||
public void Attack() {
|
||||
if ( bulletPrefab == null )
|
||||
if ( bulletPrefab == null ) {
|
||||
Debug.Log("SingleShot: No Prefab defined for Bullet!");
|
||||
return;
|
||||
}
|
||||
GameObject b = UnityEngine.Object.Instantiate(bulletPrefab);
|
||||
b.transform.rotation = spawn.rotation;
|
||||
b.transform.position = spawn.position;
|
||||
Bullet bu = b.GetComponent<Bullet>();
|
||||
bu.SetDamage(damage);
|
||||
bu.SetSpeed(speed);
|
||||
bu.SetOwner(owner);
|
||||
GameController.instance.GetAudioControl().SfxPlay(AudioControl.Sfx.shoot);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,13 +6,20 @@ using Assets.Scripts.Entities.Attack;
|
|||
namespace Assets.Scripts.Entities {
|
||||
|
||||
public class Bug : Enemy {
|
||||
[SerializeField]
|
||||
private Transform bulletSpawn;
|
||||
[SerializeField]
|
||||
private GameObject bullet;
|
||||
|
||||
public Bug() : base(15) {
|
||||
|
||||
}
|
||||
|
||||
private void Start() {
|
||||
SetAttack(new MeleeAttack(this.gameObject));
|
||||
SingleShot s = new SingleShot(this.gameObject);
|
||||
s.SetPrefab(bullet);
|
||||
s.SetSpawn(bulletSpawn);
|
||||
SetAttack(s);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,17 @@ using UnityEngine;
|
|||
|
||||
public class Player : Mob {
|
||||
|
||||
Rigidbody2D body;
|
||||
|
||||
[SerializeField]
|
||||
private GameObject bulletPrefab;
|
||||
[SerializeField]
|
||||
Transform bulletSpawn;
|
||||
[SerializeField]
|
||||
private int carDamage = 5;
|
||||
//[SerializeField]
|
||||
//private int carDamage = 5;
|
||||
|
||||
private SingleShot singleShot;
|
||||
private GatlingGun ggun;
|
||||
|
||||
private float nextAttackTime;
|
||||
|
||||
|
|
@ -18,10 +23,26 @@ public class Player : Mob {
|
|||
SingleShot s = new SingleShot(this.gameObject);
|
||||
s.SetPrefab(bulletPrefab);
|
||||
s.SetSpawn(bulletSpawn);
|
||||
singleShot = s;
|
||||
GatlingGun g = new GatlingGun(this.gameObject);
|
||||
g.SetPrefab(bulletPrefab);
|
||||
g.SetSpawn(bulletSpawn);
|
||||
ggun = g;
|
||||
body = GetComponent<Rigidbody2D>();
|
||||
SetAttack(s);
|
||||
}
|
||||
|
||||
void Update() {
|
||||
if(Input.GetKeyDown(KeyCode.G)) {
|
||||
if(attack != ggun) {
|
||||
attack = ggun;
|
||||
Debug.Log("Switched to GatlingGun");
|
||||
} else {
|
||||
attack = singleShot;
|
||||
Debug.Log("Switched to SingleShot");
|
||||
}
|
||||
|
||||
}
|
||||
if ( Time.timeSinceLevelLoad >= nextAttackTime && attack != null) {
|
||||
if ( Input.GetAxis("Fire") > 0 ) {
|
||||
Debug.Log("Attack pressed!");
|
||||
|
|
@ -29,6 +50,10 @@ public class Player : Mob {
|
|||
nextAttackTime = Time.timeSinceLevelLoad + attack.GetCooldownTime();
|
||||
}
|
||||
}
|
||||
// scale particle emissions by speed
|
||||
float velocity = body.velocity.magnitude;
|
||||
ParticleSystem.EmissionModule emission = GetComponentInChildren<ParticleSystem>().emission;
|
||||
emission.rateOverTime = velocity * (velocity / 2) * 20 + 20;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -55,6 +80,6 @@ public class Player : Mob {
|
|||
protected override void Death() {
|
||||
Debug.Log("Player died...");
|
||||
Destroy(this.gameObject);
|
||||
GameController.instance.ChangeState(GameController.GameState.ENDED);
|
||||
GameController.instance.EndGame(GameController.EndedCause.DIED);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ namespace Assets.Scripts.Entities {
|
|||
|
||||
private void Start() {
|
||||
SetAttack(new MeleeAttack(this.gameObject));
|
||||
GetComponentInChildren<ParticleSystem>().Play();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,6 +16,8 @@ public class GameController : MonoBehaviour {
|
|||
[Header("Enemys")]
|
||||
[SerializeField]
|
||||
GameObject scorpion;
|
||||
[SerializeField]
|
||||
GameObject bug;
|
||||
|
||||
[Space(10)]
|
||||
// Generation Settings
|
||||
|
|
@ -27,7 +29,13 @@ public class GameController : MonoBehaviour {
|
|||
[SerializeField]
|
||||
GameObject BorderSingle;
|
||||
[SerializeField]
|
||||
GameObject Ground;
|
||||
GameObject Ground0;
|
||||
[SerializeField]
|
||||
GameObject Ground1;
|
||||
[SerializeField]
|
||||
GameObject Ground2;
|
||||
[SerializeField]
|
||||
GameObject Ground3;
|
||||
[SerializeField]
|
||||
GameObject DoorInner;
|
||||
[SerializeField]
|
||||
|
|
@ -64,6 +72,8 @@ public class GameController : MonoBehaviour {
|
|||
GameObject RockURD;
|
||||
[SerializeField]
|
||||
GameObject RockLRD;
|
||||
[SerializeField]
|
||||
GameObject Flag;
|
||||
|
||||
private Dictionary<GenerationProcessor.ExtendedTileType, GameObject> genPrefabs;
|
||||
private Dictionary<Enemy.Enemys, GameObject> enemyPrefabs;
|
||||
|
|
@ -117,12 +127,17 @@ public class GameController : MonoBehaviour {
|
|||
{ GenerationProcessor.ExtendedTileType.RockLUR, RockLUR },
|
||||
{ GenerationProcessor.ExtendedTileType.RockURD, RockURD },
|
||||
{ GenerationProcessor.ExtendedTileType.RockLRD, RockLRD },
|
||||
{ GenerationProcessor.ExtendedTileType.Ground, Ground },
|
||||
{ GenerationProcessor.ExtendedTileType.Ground0, Ground0 },
|
||||
{ GenerationProcessor.ExtendedTileType.Ground1, Ground1 },
|
||||
{ GenerationProcessor.ExtendedTileType.Ground2, Ground2 },
|
||||
{ GenerationProcessor.ExtendedTileType.Ground3, Ground3 },
|
||||
{ GenerationProcessor.ExtendedTileType.DoorInner, DoorInner },
|
||||
{ GenerationProcessor.ExtendedTileType.DoorOuter, DoorOuter }
|
||||
{ GenerationProcessor.ExtendedTileType.DoorOuter, DoorOuter },
|
||||
{ GenerationProcessor.ExtendedTileType.Flag, Flag }
|
||||
};
|
||||
enemyPrefabs = new Dictionary<Enemy.Enemys, GameObject> {
|
||||
{ Enemy.Enemys.SCORPION, scorpion }
|
||||
{ Enemy.Enemys.SCORPION, scorpion },
|
||||
{ Enemy.Enemys.BUG, bug }
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -219,6 +234,7 @@ public class GameController : MonoBehaviour {
|
|||
finish.SetDoorsRootObject(doorRootf);
|
||||
finish.Reload();
|
||||
finish.transform.SetParent(mapRoot.transform);
|
||||
gp.CreateGOFromType(finish.GetCenter(), 0, Room.TileType.DOOR, GenerationProcessor.ExtendedTileType.Flag, goFinish);
|
||||
|
||||
// Other Rooms
|
||||
foreach (GenRoom gr in dg.rooms) {
|
||||
|
|
@ -292,6 +308,7 @@ public class GameController : MonoBehaviour {
|
|||
ui.GetComponent<UIController>().ShowGameOverUI();
|
||||
} else if(endCause == EndedCause.WIN) {
|
||||
//cam.GetComponent<AudioControl>().SfxPlay(2);
|
||||
player.InflictDamage(int.MaxValue/2);
|
||||
ui.GetComponent<UIController>().ShowWinUI();
|
||||
}
|
||||
} else {
|
||||
|
|
@ -316,6 +333,8 @@ public class GameController : MonoBehaviour {
|
|||
}
|
||||
|
||||
public void EndGame(EndedCause cause) {
|
||||
if (endCause != null && state == GameState.ENDED)
|
||||
return; // Already ended game
|
||||
endCause = cause;
|
||||
ChangeState(GameState.ENDED);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -135,7 +135,7 @@ public class DungeonGenerator {
|
|||
}
|
||||
allDoors.UnionWith(r.AllDoors());
|
||||
foreach ( Vector2Int v in r.AllDoors() ) {
|
||||
Debug.Log("Door: " + v);
|
||||
//Debug.Log("Door: " + v);
|
||||
if ( !r.bounds.Contains(v) )
|
||||
throw new NotSupportedException("This is a bug where doors land in the wrong room. It should have been fixed.");
|
||||
else
|
||||
|
|
@ -432,7 +432,7 @@ public class DungeonGenerator {
|
|||
r.tiles[pos].type = Room.TileType.ROCK;
|
||||
continue;
|
||||
}
|
||||
float prob2 = 0.02f;
|
||||
float prob2 = 0.04f;
|
||||
if (UnityEngine.Random.value > 1 - prob2)
|
||||
{
|
||||
r.spawnpoints.Add(pos);
|
||||
|
|
@ -443,16 +443,34 @@ public class DungeonGenerator {
|
|||
|
||||
public static void GenerateObjective(Room r) {
|
||||
Dictionary<Enemy.Enemys, GameObject> enemyPrefabs = GameController.instance.GetEnemyPrefabs(); // TODO not so cool
|
||||
// TODO add more types
|
||||
Objective o;
|
||||
|
||||
// ENTITYOBJECTIVE ENEMYS:
|
||||
Objective o = null;
|
||||
|
||||
int rand = UnityEngine.Random.Range(0, 2);
|
||||
switch (rand) {
|
||||
case 0: {
|
||||
// Scorpion Attack!!!!:
|
||||
List<GameObject> lg = new List<GameObject>();
|
||||
//GameObject scorp = enemyPrefabs[Enemy.Enemys.SCORPION];
|
||||
int count = UnityEngine.Random.Range(1, r.GetSpawnpoints().Count);
|
||||
for ( int c = 0; c < count; c++ ) {
|
||||
lg.Add(enemyPrefabs[Enemy.Enemys.SCORPION]);
|
||||
}
|
||||
EntityObjective eo = new EntityObjective(r, lg);
|
||||
o = eo;
|
||||
|
||||
}
|
||||
break;
|
||||
case 1: {
|
||||
// Bug Attack!!!!:
|
||||
List<GameObject> lg = new List<GameObject>();
|
||||
int count = UnityEngine.Random.Range(1, r.GetSpawnpoints().Count);
|
||||
for ( int c = 0; c < count; c++ ) {
|
||||
lg.Add(enemyPrefabs[Enemy.Enemys.BUG]);
|
||||
}
|
||||
EntityObjective eo = new EntityObjective(r, lg);
|
||||
o = eo;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
r.SetObjective(o);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ using UnityEngine;
|
|||
|
||||
public class GenerationProcessor {
|
||||
public enum ExtendedTileType {
|
||||
BorderOuter, BorderInner, BorderSingle, Ground, DoorInner, DoorOuter, Rock, RockL, RockU, RockR, RockD, RockLU, RockLR, RockLD, RockUR, RockUD, RockRD, RockLURD, RockLUD, RockLUR, RockURD, RockLRD
|
||||
BorderOuter, BorderInner, BorderSingle, Ground0, Ground1, Ground2, Ground3, DoorInner, DoorOuter, Rock, RockL, RockU, RockR, RockD, RockLU, RockLR, RockLD, RockUR, RockUD, RockRD, RockLURD, RockLUD, RockLUR, RockURD, RockLRD, Flag
|
||||
}
|
||||
Dictionary<ExtendedTileType, GameObject> prefabs;
|
||||
public GenerationProcessor(Dictionary<ExtendedTileType, GameObject> prefabs) {
|
||||
|
|
@ -16,7 +16,7 @@ public class GenerationProcessor {
|
|||
name = "Room"
|
||||
};
|
||||
foreach ( Vector2Int v in tiles.Keys ) {
|
||||
ExtendedTileType type = ExtendedTileType.Ground;
|
||||
ExtendedTileType type = GetRandomGroundType();
|
||||
int rotation = 0;
|
||||
switch ( tiles[v].type ) {
|
||||
case Room.TileType.WALL:
|
||||
|
|
@ -24,7 +24,7 @@ public class GenerationProcessor {
|
|||
rotation = GetCorrectWallRotation(type, tiles[v].position);
|
||||
break;
|
||||
case Room.TileType.GROUND:
|
||||
type = ExtendedTileType.Ground;
|
||||
type = GetRandomGroundType();
|
||||
break;
|
||||
case Room.TileType.DOOR:
|
||||
type = GetCorrectDoorType(tiles, v);
|
||||
|
|
@ -39,10 +39,10 @@ public class GenerationProcessor {
|
|||
return root;
|
||||
}
|
||||
|
||||
private GameObject CreateGOFromType(Vector2 v, int rotation, Room.TileType type, ExtendedTileType t, GameObject root) {
|
||||
public GameObject CreateGOFromType(Vector2 v, int rotation, Room.TileType type, ExtendedTileType t, GameObject root) {
|
||||
GameObject tmp = null;
|
||||
if (type != Room.TileType.GROUND)
|
||||
CreateGOFromType(v, 0, Room.TileType.GROUND, ExtendedTileType.Ground, root);
|
||||
CreateGOFromType(v, 0, Room.TileType.GROUND, GetRandomGroundType(), root);
|
||||
if ( prefabs.ContainsKey(t) && root != null ) {
|
||||
tmp = Object.Instantiate(prefabs[t], root.transform);
|
||||
tmp.transform.position = v;
|
||||
|
|
@ -194,7 +194,6 @@ public class GenerationProcessor {
|
|||
return 90;
|
||||
toCheck = position + new Vector2Int(1, 0);
|
||||
return 0;
|
||||
break;
|
||||
case ExtendedTileType.DoorInner:
|
||||
Vector2Int toCheckD = position + new Vector2Int(0, -1);
|
||||
if(tiles.ContainsKey(toCheckD) && tiles[toCheckD].type == Room.TileType.DOOR)
|
||||
|
|
@ -203,4 +202,18 @@ public class GenerationProcessor {
|
|||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
private ExtendedTileType GetRandomGroundType() {
|
||||
int num = (int) (UnityEngine.Random.value * 4);
|
||||
switch(num) {
|
||||
case 0:
|
||||
return ExtendedTileType.Ground0;
|
||||
case 1:
|
||||
return ExtendedTileType.Ground1;
|
||||
case 2:
|
||||
return ExtendedTileType.Ground2;
|
||||
default:
|
||||
return ExtendedTileType.Ground3;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,11 +20,11 @@ public class NotificationManager : MonoBehaviour {
|
|||
this.duration = duration;
|
||||
}
|
||||
|
||||
public string getText() {
|
||||
public string GetText() {
|
||||
return text;
|
||||
}
|
||||
|
||||
public float getDuration() {
|
||||
public float GetDuration() {
|
||||
return duration;
|
||||
}
|
||||
}
|
||||
|
|
@ -34,43 +34,44 @@ public class NotificationManager : MonoBehaviour {
|
|||
delay = 0;
|
||||
messages = new List<Notification>();
|
||||
text = GetComponent<Text>();
|
||||
hide();
|
||||
Hide();
|
||||
}
|
||||
|
||||
void Update() {
|
||||
if ( showingMessage ) {
|
||||
if ( Time.time > delay ) {
|
||||
if (messages.Count <= 1) {
|
||||
Debug.Log(delay - Time.time);
|
||||
Debug.Log(messages.Count);
|
||||
if (messages.Count == 1) {
|
||||
messages.Remove(messages[0]);
|
||||
hide();
|
||||
} else {
|
||||
Hide();
|
||||
} else if (messages.Count > 1) {
|
||||
messages.Remove(messages[0]);
|
||||
text.text = messages[0].getText();
|
||||
delay = Time.time + messages[0].getDuration();
|
||||
text.text = messages[0].GetText();
|
||||
delay = Time.time + messages[0].GetDuration();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void showMessage(string text, float duration) {
|
||||
if ( showingMessage ) {
|
||||
public void ShowMessage(string text, float duration) {
|
||||
messages.Add(new Notification(text, duration));
|
||||
} else {
|
||||
showingMessage = true;
|
||||
|
||||
if (!showingMessage) {
|
||||
showingMessage = true;
|
||||
GetComponent<Text>().text = text;
|
||||
delay = Time.time + duration;
|
||||
show();
|
||||
Show();
|
||||
}
|
||||
}
|
||||
|
||||
void show() {
|
||||
void Show() {
|
||||
GetComponentInParent<Image>().enabled = true;
|
||||
text.enabled = true;
|
||||
showingMessage = true;
|
||||
}
|
||||
|
||||
void hide() {
|
||||
void Hide() {
|
||||
GetComponentInParent<Image>().enabled = false;
|
||||
text.enabled = false;
|
||||
showingMessage = false;
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ public class FinishObjective : Objective {
|
|||
}
|
||||
|
||||
public override void UpdateGoal() {
|
||||
if ((room.GetCenter() - (Vector2)player.transform.position).magnitude < 2)
|
||||
ReachedGoal();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
using UnityEngine;
|
||||
|
||||
public class PlayerMovement : MonoBehaviour {
|
||||
private bool firstKeyPressed;
|
||||
bool firstKeyPressed;
|
||||
bool messagePosted;
|
||||
|
||||
[SerializeField]
|
||||
public float acceleration = 3;
|
||||
|
|
@ -19,9 +20,14 @@ public class PlayerMovement : MonoBehaviour {
|
|||
// Use this for initialization
|
||||
void Start() {
|
||||
rb = GetComponent<Rigidbody2D>();
|
||||
messagePosted = false;
|
||||
}
|
||||
|
||||
void Update() {
|
||||
if (!firstKeyPressed && !messagePosted) {
|
||||
messagePosted = true;
|
||||
GameController.instance.GetUI().GetNotificationManager().ShowMessage("Press any key to start!", 2);
|
||||
}
|
||||
if ( !firstKeyPressed && Input.anyKey ) {
|
||||
firstKeyPressed = true;
|
||||
}
|
||||
|
|
@ -57,11 +63,20 @@ public class PlayerMovement : MonoBehaviour {
|
|||
//Debug.Log(br);
|
||||
Debug.DrawLine(transform.position, transform.position + br, Color.red, 0.01f, false);
|
||||
}
|
||||
//transform.Rotate(Vector3.forward * turnSpeed);
|
||||
if (Input.GetAxis("Horizontal") < 0)
|
||||
{
|
||||
//rb.rotation += turnSpeed;
|
||||
rb.MoveRotation(rb.rotation + turnSpeed);
|
||||
} else
|
||||
//transform.Rotate(Vector3.forward * turnSpeed);
|
||||
if (Input.GetAxis("Horizontal") > 0)
|
||||
{
|
||||
//rb.rotation -= turnSpeed;
|
||||
rb.MoveRotation(rb.rotation - turnSpeed);
|
||||
} else {
|
||||
rb.MoveRotation(rb.rotation);
|
||||
}
|
||||
//transform.Rotate(Vector3.forward * -turnSpeed);
|
||||
// Debug lines
|
||||
Debug.DrawLine(transform.position, transform.position + speedVec, Color.magenta, 0.01f, false);
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ TextureImporter:
|
|||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spritePixelsToUnits: 1000
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
|
|
@ -67,6 +67,39 @@ TextureImporter:
|
|||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: WebGL
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ TextureImporter:
|
|||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spritePixelsToUnits: 1000
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
|
|
@ -67,6 +67,39 @@ TextureImporter:
|
|||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: WebGL
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 7.9 KiB After Width: | Height: | Size: 27 KiB |
|
|
@ -1,7 +1,12 @@
|
|||
fileFormatVersion: 2
|
||||
guid: c859997db2d488d42a8189791f73e0fb
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
fileIDToRecycleName:
|
||||
21300000: doorInner_0
|
||||
21300002: doorInner_1
|
||||
21300004: doorInner_2
|
||||
21300006: doorInner_3
|
||||
21300008: doorInner_4
|
||||
externalObjects: {}
|
||||
serializedVersion: 5
|
||||
mipmaps:
|
||||
|
|
@ -38,9 +43,9 @@ TextureImporter:
|
|||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
spriteMode: 2
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
spriteMeshType: 0
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 1000
|
||||
|
|
@ -80,7 +85,107 @@ TextureImporter:
|
|||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
sprites:
|
||||
- serializedVersion: 2
|
||||
name: doorInner_0
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 1
|
||||
y: 0
|
||||
width: 1000
|
||||
height: 1000
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: 0
|
||||
bones: []
|
||||
spriteID: ff24c891c98e210409333a11c14c9871
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
- serializedVersion: 2
|
||||
name: doorInner_1
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 1001
|
||||
y: 0
|
||||
width: 1000
|
||||
height: 1000
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: 0
|
||||
bones: []
|
||||
spriteID: 7bdb864aee9485148bde8d3cfbbbdc5f
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
- serializedVersion: 2
|
||||
name: doorInner_2
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 2001
|
||||
y: 0
|
||||
width: 1000
|
||||
height: 1000
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: 0
|
||||
bones: []
|
||||
spriteID: f94cbef5cf2971d44894e9de89fe745f
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
- serializedVersion: 2
|
||||
name: doorInner_3
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 3001
|
||||
y: 0
|
||||
width: 1000
|
||||
height: 1000
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: 0
|
||||
bones: []
|
||||
spriteID: ca69375da37546d4ebefe163f8eaecf0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
- serializedVersion: 2
|
||||
name: doorInner_4
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 4001
|
||||
y: 0
|
||||
width: 1000
|
||||
height: 1000
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: 0
|
||||
bones: []
|
||||
spriteID: 658408fbabe66cd4098f1f5cd14458dc
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 8.3 KiB After Width: | Height: | Size: 30 KiB |
|
|
@ -1,7 +1,12 @@
|
|||
fileFormatVersion: 2
|
||||
guid: d9380a46a795012449f336288fbd1854
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
fileIDToRecycleName:
|
||||
21300000: doorOuter_0
|
||||
21300002: doorOuter_1
|
||||
21300004: doorOuter_2
|
||||
21300006: doorOuter_3
|
||||
21300008: doorOuter_4
|
||||
externalObjects: {}
|
||||
serializedVersion: 5
|
||||
mipmaps:
|
||||
|
|
@ -38,9 +43,9 @@ TextureImporter:
|
|||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
spriteMode: 2
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
spriteMeshType: 0
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 1000
|
||||
|
|
@ -80,7 +85,107 @@ TextureImporter:
|
|||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
sprites:
|
||||
- serializedVersion: 2
|
||||
name: doorOuter_0
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 1
|
||||
y: 0
|
||||
width: 1000
|
||||
height: 1000
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: 0
|
||||
bones: []
|
||||
spriteID: 92fa8f89d0bd20545a9f309dbb60b579
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
- serializedVersion: 2
|
||||
name: doorOuter_1
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 1001
|
||||
y: 0
|
||||
width: 1000
|
||||
height: 1000
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: 0
|
||||
bones: []
|
||||
spriteID: dcc900c022bf81f4698d78422c95505b
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
- serializedVersion: 2
|
||||
name: doorOuter_2
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 2001
|
||||
y: 0
|
||||
width: 1000
|
||||
height: 1000
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: 0
|
||||
bones: []
|
||||
spriteID: 33bc4d994b6971845931299c722b6092
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
- serializedVersion: 2
|
||||
name: doorOuter_3
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 3001
|
||||
y: 0
|
||||
width: 1000
|
||||
height: 1000
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: 0
|
||||
bones: []
|
||||
spriteID: b6d2defddd3098d4185e6c978f4fb690
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
- serializedVersion: 2
|
||||
name: doorOuter_4
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 4001
|
||||
y: 0
|
||||
width: 1000
|
||||
height: 1000
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: 0
|
||||
bones: []
|
||||
spriteID: 0a609f92ee6fdf94887b453284b21310
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
BIN
Assets/graphics/textures/FixedObjects/Ground/ground2.png
Normal file
BIN
Assets/graphics/textures/FixedObjects/Ground/ground2.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 11 KiB |
|
|
@ -0,0 +1,95 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 10d0c9bab26278e4997c44ba3f4833fd
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
externalObjects: {}
|
||||
serializedVersion: 5
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
isReadable: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: -1
|
||||
aniso: -1
|
||||
mipBias: -1
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 1000
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: e2ba73102b6276e4c966fa0218c4b480
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
BIN
Assets/graphics/textures/FixedObjects/Ground/ground3.png
Normal file
BIN
Assets/graphics/textures/FixedObjects/Ground/ground3.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 10 KiB |
|
|
@ -0,0 +1,95 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 45575f1a36cb12649a2bb6eaa0f9fcfe
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
externalObjects: {}
|
||||
serializedVersion: 5
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
isReadable: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: -1
|
||||
aniso: -1
|
||||
mipBias: -1
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 1000
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: c1a6f3db0a300dc458be863b0baac069
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
BIN
Assets/graphics/textures/UI/StartButton.png
Normal file
BIN
Assets/graphics/textures/UI/StartButton.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 343 KiB |
84
Assets/graphics/textures/UI/StartButton.png.meta
Normal file
84
Assets/graphics/textures/UI/StartButton.png.meta
Normal file
|
|
@ -0,0 +1,84 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 2a91b245cfd4d1749ac511fe24cca1ff
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
externalObjects: {}
|
||||
serializedVersion: 5
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
isReadable: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: -1
|
||||
aniso: -1
|
||||
mipBias: -1
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 12491b72a7b2c764e8f621fa1998afc1
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
BIN
Assets/graphics/textures/UI/singleButton.png
Normal file
BIN
Assets/graphics/textures/UI/singleButton.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 284 KiB |
84
Assets/graphics/textures/UI/singleButton.png.meta
Normal file
84
Assets/graphics/textures/UI/singleButton.png.meta
Normal file
|
|
@ -0,0 +1,84 @@
|
|||
fileFormatVersion: 2
|
||||
guid: b6a11c113c248ba40878092360565936
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
externalObjects: {}
|
||||
serializedVersion: 5
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
isReadable: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: -1
|
||||
aniso: -1
|
||||
mipBias: -1
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 32f94a069764d11459de937557c1bd3c
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Loading…
Add table
Reference in a new issue