saibotk/Bildschirmflausch-LD41
1
0
Fork 0
Code Releases Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Unknown 2018-04-23 20:08:09 +02:00
commit 89b2923b83
12 changed files with 269 additions and 108 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

183
Assets/Prefabs/Enemy.prefab → Assets/Prefabs/Bug.prefab
View file

@ -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

2
Assets/Prefabs/Enemy.prefab.meta → Assets/Prefabs/Bug.prefab.meta
View file

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: ff87b9de73979cd40a9853419833a91f
guid: dd625f75dbf83194392a299951cf04fb
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000

2
Assets/Prefabs/Player.prefab
View file

@ -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}

2
Assets/Prefabs/Scorpion.prefab
View file

@ -28,7 +28,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!1 &1513538628701824
GameObject:
m_ObjectHideFlags: 0

56
Assets/Scenes/CodeDEV.unity
View file

@ -623,11 +623,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
@ -751,6 +746,52 @@ MonoBehaviour:
- {fileID: 1908750963}
- {fileID: 368878861}
- {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
@ -976,7 +1017,7 @@ Prefab:
- target: {fileID: 224150154901314796, guid: 460d856ea4eb14cedb5fecde1fe6d743,
type: 2}
propertyPath: m_AnchoredPosition.x
value: 63.233368
value: 65.89836
objectReference: {fileID: 0}
- target: {fileID: 224150154901314796, guid: 460d856ea4eb14cedb5fecde1fe6d743,
type: 2}
@ -1381,6 +1422,7 @@ 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,
@ -1409,7 +1451,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: 1971451785855062, guid: ff87b9de73979cd40a9853419833a91f, type: 2}
Flag: {fileID: 1065161683117842, guid: 06aa81f4fbf9a3a4a8f9fdadafcbf7fa, type: 2}
playerPrefab: {fileID: 1679161327080020, guid: 3d1911457c1e44f53b6b4044334db52f,
type: 2}
ui: {fileID: 1379476069}

4
Assets/Scripts/Entities/Attack/SingleShot.cs
View file

@ -26,8 +26,10 @@ 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 = GameObject.Instantiate(bulletPrefab);
b.transform.rotation = spawn.rotation;
b.transform.position = spawn.position;

9
Assets/Scripts/Entities/Bug.cs
View file

@ -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);
}
}
}

4
Assets/Scripts/Entities/Player.cs
View file

@ -9,8 +9,8 @@ public class Player : Mob {
private GameObject bulletPrefab;
[SerializeField]
Transform bulletSpawn;
[SerializeField]
private int carDamage = 5;
//[SerializeField]
//private int carDamage = 5;
private SingleShot singleShot;
private GatlingGun ggun;

5
Assets/Scripts/GameController.cs
View file

@ -16,6 +16,8 @@ public class GameController : MonoBehaviour {
[Header("Enemys")]
[SerializeField]
GameObject scorpion;
[SerializeField]
GameObject bug;
[Space(10)]
// Generation Settings
@ -134,7 +136,8 @@ public class GameController : MonoBehaviour {
{ GenerationProcessor.ExtendedTileType.Flag, Flag }
};
enemyPrefabs = new Dictionary<Enemy.Enemys, GameObject> {
{ Enemy.Enemys.SCORPION, scorpion }
{ Enemy.Enemys.SCORPION, scorpion },
{ Enemy.Enemys.BUG, bug }
};
}

36
Assets/Scripts/Generation/DungeonGenerator.cs
View file

@ -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
@ -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:
List<GameObject> lg = new List<GameObject>();
//GameObject scorp = enemyPrefabs[Enemy.Enemys.SCORPION];
lg.Add(enemyPrefabs[Enemy.Enemys.SCORPION]);
EntityObjective eo = new EntityObjective(r, lg);
o = eo;
Objective o = null;
int rand = UnityEngine.Random.Range(0, 2);
switch (rand) {
case 0: {
// Scorpion 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.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);
}

35
Assets/graphics/textures/Entities/Enemies/Spider.png.meta
View file

@ -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: []

35
Assets/graphics/textures/Entities/Enemies/maikäfer.png.meta
View file

@ -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: []