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

Balancing!

Browse source
This commit is contained in:
Piegames 2018-04-24 15:58:27 +02:00
parent e3feb19b01
commit 1db113f138
27 changed files with 49 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Assets/Prefabs/Bug.prefab
View file

@ -145,7 +145,7 @@ Transform:
m_GameObject: {fileID: 1887677565572348} m_GameObject: {fileID: 1887677565572348}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1.3, y: 1.3, z: 1}
m_Children: m_Children:
- {fileID: 4193287044024648} - {fileID: 4193287044024648}
- {fileID: 4528190223728408} - {fileID: 4528190223728408}

2
Assets/Prefabs/Player.prefab
View file

@ -482,7 +482,7 @@ MonoBehaviour:
turnSpeed: 2 turnSpeed: 2
drift: 1 drift: 1
brake: 2 brake: 2
maxBrakeTime: 15 maxBrakeTime: 20
accelerationTime: 2.115 accelerationTime: 2.115
decelerationTime: 1.2346 decelerationTime: 1.2346
--- !u!198 &198306026557504490 --- !u!198 &198306026557504490

4
Assets/Prefabs/SlimeBullet.prefab
View file

@ -38,7 +38,7 @@ Transform:
m_GameObject: {fileID: 1340970730445882} m_GameObject: {fileID: 1340970730445882}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.15, y: 0.15, z: 1} m_LocalScale: {x: 0.25, y: 0.25, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
@ -99,7 +99,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 0cfff064e4589e34cb5b415dcc016dc1, type: 3} m_Script: {fileID: 11500000, guid: 0cfff064e4589e34cb5b415dcc016dc1, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
speed: 8 speed: 5
damage: 0 damage: 0
start: 0 start: 0
--- !u!212 &212627463552776370 --- !u!212 &212627463552776370

2
Assets/Prefabs/Tiles/rock.prefab
View file

@ -23,7 +23,7 @@ GameObject:
- component: {fileID: 61891926131160174} - component: {fileID: 61891926131160174}
m_Layer: 0 m_Layer: 0
m_Name: rock m_Name: rock
m_TagString: wall m_TagString: rock
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0

2
Assets/Prefabs/Tiles/rockD.prefab
View file

@ -23,7 +23,7 @@ GameObject:
- component: {fileID: 61798303579644032} - component: {fileID: 61798303579644032}
m_Layer: 0 m_Layer: 0
m_Name: rockD m_Name: rockD
m_TagString: wall m_TagString: rock
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0

2
Assets/Prefabs/Tiles/rockDL.prefab
View file

@ -23,7 +23,7 @@ GameObject:
- component: {fileID: 61362440249651478} - component: {fileID: 61362440249651478}
m_Layer: 0 m_Layer: 0
m_Name: rockDL m_Name: rockDL
m_TagString: wall m_TagString: rock
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0

2
Assets/Prefabs/Tiles/rockDLU.prefab
View file

@ -23,7 +23,7 @@ GameObject:
- component: {fileID: 61364379581901728} - component: {fileID: 61364379581901728}
m_Layer: 0 m_Layer: 0
m_Name: rockDLU m_Name: rockDLU
m_TagString: wall m_TagString: rock
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0

2
Assets/Prefabs/Tiles/rockDLUR.prefab
View file

@ -23,7 +23,7 @@ GameObject:
- component: {fileID: 61031428949727204} - component: {fileID: 61031428949727204}
m_Layer: 0 m_Layer: 0
m_Name: rockDLUR m_Name: rockDLUR
m_TagString: wall m_TagString: rock
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0

2
Assets/Prefabs/Tiles/rockDU.prefab
View file

@ -23,7 +23,7 @@ GameObject:
- component: {fileID: 61867638451973766} - component: {fileID: 61867638451973766}
m_Layer: 0 m_Layer: 0
m_Name: rockDU m_Name: rockDU
m_TagString: wall m_TagString: rock
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0

2
Assets/Prefabs/Tiles/rockL.prefab
View file

@ -23,7 +23,7 @@ GameObject:
- component: {fileID: 61829153926485560} - component: {fileID: 61829153926485560}
m_Layer: 0 m_Layer: 0
m_Name: rockL m_Name: rockL
m_TagString: wall m_TagString: rock
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0

2
Assets/Prefabs/Tiles/rockLR.prefab
View file

@ -23,7 +23,7 @@ GameObject:
- component: {fileID: 61236632091580028} - component: {fileID: 61236632091580028}
m_Layer: 0 m_Layer: 0
m_Name: rockLR m_Name: rockLR
m_TagString: wall m_TagString: rock
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0

2
Assets/Prefabs/Tiles/rockLU.prefab
View file

@ -23,7 +23,7 @@ GameObject:
- component: {fileID: 61902424584989724} - component: {fileID: 61902424584989724}
m_Layer: 0 m_Layer: 0
m_Name: rockLU m_Name: rockLU
m_TagString: wall m_TagString: rock
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0

2
Assets/Prefabs/Tiles/rockLUR.prefab
View file

@ -23,7 +23,7 @@ GameObject:
- component: {fileID: 61035825138540804} - component: {fileID: 61035825138540804}
m_Layer: 0 m_Layer: 0
m_Name: rockLUR m_Name: rockLUR
m_TagString: wall m_TagString: rock
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0

2
Assets/Prefabs/Tiles/rockR.prefab
View file

@ -23,7 +23,7 @@ GameObject:
- component: {fileID: 61456461862167858} - component: {fileID: 61456461862167858}
m_Layer: 0 m_Layer: 0
m_Name: rockR m_Name: rockR
m_TagString: wall m_TagString: rock
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0

2
Assets/Prefabs/Tiles/rockRD.prefab
View file

@ -23,7 +23,7 @@ GameObject:
- component: {fileID: 61341370786779490} - component: {fileID: 61341370786779490}
m_Layer: 0 m_Layer: 0
m_Name: rockRD m_Name: rockRD
m_TagString: wall m_TagString: rock
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0

2
Assets/Prefabs/Tiles/rockRDL.prefab
View file

@ -23,7 +23,7 @@ GameObject:
- component: {fileID: 61487560770014174} - component: {fileID: 61487560770014174}
m_Layer: 0 m_Layer: 0
m_Name: rockRDL m_Name: rockRDL
m_TagString: wall m_TagString: rock
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0

2
Assets/Prefabs/Tiles/rockU.prefab
View file

@ -23,7 +23,7 @@ GameObject:
- component: {fileID: 61699217941965386} - component: {fileID: 61699217941965386}
m_Layer: 0 m_Layer: 0
m_Name: rockU m_Name: rockU
m_TagString: wall m_TagString: rock
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0

2
Assets/Prefabs/Tiles/rockUR.prefab
View file

@ -23,7 +23,7 @@ GameObject:
- component: {fileID: 61699965863900698} - component: {fileID: 61699965863900698}
m_Layer: 0 m_Layer: 0
m_Name: rockUR m_Name: rockUR
m_TagString: wall m_TagString: rock
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0

2
Assets/Prefabs/Tiles/rockURD.prefab
View file

@ -23,7 +23,7 @@ GameObject:
- component: {fileID: 61660594946959392} - component: {fileID: 61660594946959392}
m_Layer: 0 m_Layer: 0
m_Name: rockURD m_Name: rockURD
m_TagString: wall m_TagString: rock
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0

2
Assets/Scenes/CodeDEV.unity
View file

@ -1543,7 +1543,7 @@ Prefab:
- target: {fileID: 224150154901314796, guid: 460d856ea4eb14cedb5fecde1fe6d743, - target: {fileID: 224150154901314796, guid: 460d856ea4eb14cedb5fecde1fe6d743,
type: 2} type: 2}
propertyPath: m_AnchoredPosition.x propertyPath: m_AnchoredPosition.x
value: 39.24086 value: 38.603355
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 224150154901314796, guid: 460d856ea4eb14cedb5fecde1fe6d743, - target: {fileID: 224150154901314796, guid: 460d856ea4eb14cedb5fecde1fe6d743,
type: 2} type: 2}

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

@ -38,6 +38,10 @@ namespace Assets.Scripts.Entities.Attack {
this.bulletPrefab = bullet; this.bulletPrefab = bullet;
} }
public void SetRange(int range) {
this.range = range;
}
public void Attack() { public void Attack() {
if ( bulletPrefab == null ) { if ( bulletPrefab == null ) {
Debug.Log("SingleShot: No Prefab defined for Bullet!"); Debug.Log("SingleShot: No Prefab defined for Bullet!");

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

@ -17,7 +17,8 @@ namespace Assets.Scripts.Entities {
protected override void Start() { protected override void Start() {
base.Start(); base.Start();
SingleShot s = new SingleShot(this.gameObject, 12, 3, 8 ); SingleShot s = new SingleShot(this.gameObject, 8, 3, 8 );
s.SetRange(3);
s.SetPrefab(bullet); s.SetPrefab(bullet);
s.SetSpawn(bulletSpawn); s.SetSpawn(bulletSpawn);
SetAttack(s); SetAttack(s);

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

@ -50,7 +50,12 @@ public class Player : Mob {
if ( collision.collider.tag == "wall" ) { if ( collision.collider.tag == "wall" ) {
//InflictDamage(maxHP / 2); //InflictDamage(maxHP / 2);
Death(); Death();
} else if ( collision.collider.tag == "Enemy" ) { } else if (collision.collider.tag == "rock")
{
InflictDamage(maxHP / 10);
//Death();
}
else if ( collision.collider.tag == "Enemy" ) {
Mob m = collision.collider.GetComponent(typeof(Mob)) as Mob; Mob m = collision.collider.GetComponent(typeof(Mob)) as Mob;
if ( m != null ) { if ( m != null ) {
//m.InflictDamage(carDamage); //m.InflictDamage(carDamage);

3
Assets/Scripts/Entities/Spider.cs
View file

@ -11,13 +11,14 @@ namespace Assets.Scripts.Entities {
[SerializeField] [SerializeField]
private GameObject bullet; private GameObject bullet;
public Spider() : base(25) { public Spider() : base(15) {
} }
protected override void Start() { protected override void Start() {
base.Start(); base.Start();
SingleShot s = new SingleShot(this.gameObject, 25, 4, 2); SingleShot s = new SingleShot(this.gameObject, 25, 4, 2);
s.SetRange(10);
s.SetPrefab(bullet); s.SetPrefab(bullet);
s.SetSpawn(bulletSpawn); s.SetSpawn(bulletSpawn);
SetAttack(s); SetAttack(s);

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

@ -444,10 +444,10 @@ public class DungeonGenerator {
} }
float prob2 = 0.04f; float prob2 = 0.04f;
if (UnityEngine.Random.value > 1 - prob2 if (UnityEngine.Random.value > 1 - prob2
&& x > r.bounds.x +1 && x > r.bounds.x + 2
&& x < r.bounds.x + r.bounds.width-1 && x < r.bounds.x + r.bounds.width-2
&& y > r.bounds.y+1 && y > r.bounds.y+ 2
&& y < r.bounds.y + r.bounds.height-1) && y < r.bounds.y + r.bounds.height-2)
{ {
r.spawnpoints.Add(pos); r.spawnpoints.Add(pos);
} }
@ -463,11 +463,10 @@ public class DungeonGenerator {
int rand = UnityEngine.Random.Range(0, 7); int rand = UnityEngine.Random.Range(0, 7);
switch (rand) { switch (rand) {
case 0: case 0: {
case 1: {
// Scorpion Attack!!!!: // Scorpion Attack!!!!:
List<GameObject> lg = new List<GameObject>(); List<GameObject> lg = new List<GameObject>();
int count = Math.Min(UnityEngine.Random.Range(1, ( int ) Mathf.Floor(r.GetSpawnpoints().Count)), 4); int count = UnityEngine.Random.Range(1, ( int ) Math.Min(Mathf.Floor(r.GetSpawnpoints().Count), 4));
for ( int c = 0; c < count; c++ ) { for ( int c = 0; c < count; c++ ) {
lg.Add(enemyPrefabs[Entity.Entities.SCORPION]); lg.Add(enemyPrefabs[Entity.Entities.SCORPION]);
} }
@ -501,9 +500,10 @@ public class DungeonGenerator {
o = eo; o = eo;
} }
break; break;
case 6: case 6:
case 1:
{ {
// Coins!!!!: // Siders!!!!:
List<GameObject> lg = new List<GameObject>(); List<GameObject> lg = new List<GameObject>();
int count = Math.Min(UnityEngine.Random.Range(1, (int)Mathf.Floor(r.GetSpawnpoints().Count)), 3); int count = Math.Min(UnityEngine.Random.Range(1, (int)Mathf.Floor(r.GetSpawnpoints().Count)), 3);
for (int c = 0; c < count; c++) for (int c = 0; c < count; c++)

7
Assets/sound/AudioMixer.mixer
View file

@ -80,13 +80,14 @@ AudioMixerSnapshotController:
m_SnapshotID: d3789ccdbdc046a448f1887d94c3f7f5 m_SnapshotID: d3789ccdbdc046a448f1887d94c3f7f5
m_FloatValues: m_FloatValues:
aa6b64c186541834a990dc7d71ef0490: -9.833286 aa6b64c186541834a990dc7d71ef0490: -9.833286
2531afd284b58274a93052c093565106: -9.960263 9f873922b4189f746a4d13a9b60e6375: 2.4583216
2531afd284b58274a93052c093565106: -8.963343
25123d234de4ec84aafee1d0c380f3ad: 0.025578512 25123d234de4ec84aafee1d0c380f3ad: 0.025578512
af748c25161478f4c933cb5cf60cf925: -4.560346 af748c25161478f4c933cb5cf60cf925: -4.560346
8b04b72683f112d418bf818b2395ba51: -9.833286 8b04b72683f112d418bf818b2395ba51: -9.332112
ce741f86488e78548ad32eec9ad31803: -13.0627575 ce741f86488e78548ad32eec9ad31803: -13.0627575
3085c47799436ad43a18d4ae4adb712d: -9.833286 3085c47799436ad43a18d4ae4adb712d: -9.833286
7e224658afaf14242ba3996793ac12a1: -0.02577656 7e224658afaf14242ba3996793ac12a1: -5.3230715
644f6589fc60a074a98ad67d609f2bfb: 5.1526957 644f6589fc60a074a98ad67d609f2bfb: 5.1526957
5da050aa578318a4f8f1fed71a509fce: -14.816608 5da050aa578318a4f8f1fed71a509fce: -14.816608
bf89843b5f1f52248935471e56d764be: -9.833286 bf89843b5f1f52248935471e56d764be: -9.833286

1
ProjectSettings/TagManager.asset
View file

@ -9,6 +9,7 @@ TagManager:
- DoorRoot - DoorRoot
- SpawnlistRoot - SpawnlistRoot
- Enemy - Enemy
- rock
layers: layers:
- Default - Default
- TransparentFX - TransparentFX