Skip to content

Invaders: Fix various bugs, changes graphics and upgrade to 2020.3.13LTS #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jul 21, 2021
Merged

Invaders: Fix various bugs, changes graphics and upgrade to 2020.3.13LTS #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5b95753
[Invaders] Upgrade Invaders to Unity 2020.3.13 LTS + a bunch of fixes…
Cosmin-B Jul 13, 2021
9ec4d5f
Added Graphics (replaces old Alien and Saucer style art)
chrispope Jul 14, 2021
0a81ca4
[InvadersGame] Fix a crash in shipping builds
Cosmin-B Jul 15, 2021
585a9a9
Update Basic/Invaders/Assets/Scripts/EnemyAgent.cs
Cosmin-B Jul 19, 2021
4ee8652
Update Basic/Invaders/Assets/Scripts/InvadersGame.cs
Cosmin-B Jul 19, 2021
99e5427
[Assets] Remove all the old assets from the project!
Cosmin-B Jul 19, 2021
5983e16
[Player] Fix a minor issue where the player is not "Destroyed" on all…
Cosmin-B Jul 20, 2021
7b80360
[Project] Add new Invaders changelog
Cosmin-B Jul 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Basic/Invaders/Assets/Prefabs/Invaders Game Manager.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d643b609c6a71c54984c1ad454faa28b, type: 3}
m_Name:
m_EditorClassIdentifier:
alien1Prefab: {fileID: 100000, guid: 43ae6ad1bdadd0747811bb7a00740c2c, type: 3}
alien2Prefab: {fileID: 100000, guid: 38a8441efb2d6d245adbf08f08705374, type: 3}
alien3Prefab: {fileID: 100000, guid: aa50d36274d0dfc4faff2c69820b3711, type: 3}
saucerPrefab: {fileID: 100000, guid: e811e4fb062e31444aaf36dbec5de77c, type: 3}
enemy1Prefab: {fileID: 100000, guid: 43ae6ad1bdadd0747811bb7a00740c2c, type: 3}
enemy2Prefab: {fileID: 100000, guid: 38a8441efb2d6d245adbf08f08705374, type: 3}
enemy3Prefab: {fileID: 100000, guid: aa50d36274d0dfc4faff2c69820b3711, type: 3}
superEnemyPrefab: {fileID: 100000, guid: e811e4fb062e31444aaf36dbec5de77c, type: 3}
shieldPrefab: {fileID: 100000, guid: b990a6e6dcf54b646a7397028fed6045, type: 3}
gameTimerText: {fileID: 0}
scoreText: {fileID: 0}
Expand All @@ -57,7 +57,7 @@ MonoBehaviour:
m_DelayedStartTime: 5
m_TickPeriodic:
m_InternalValue: 0.2
m_AlienDirection:
m_EnemyMovingDirection:
m_InternalValue: 0.3
m_RandomThresholdForSaucerCreation: 0.92
--- !u!114 &4266113290039088509
Expand Down
2 changes: 1 addition & 1 deletion Basic/Invaders/Assets/Prefabs/bullet.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
owner: {fileID: 0}
m_TravelSpeed: 6
m_TravelSpeed: 7.25
--- !u!61 &6100000
BoxCollider2D:
m_ObjectHideFlags: 0
Expand Down
5 changes: 3 additions & 2 deletions Basic/Invaders/Assets/Prefabs/alien1.prefab → Basic/Invaders/Assets/Prefabs/enemy1.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ GameObject:
- component: {fileID: 4223722966607089368}
- component: {fileID: 2037077820506562951}
m_Layer: 0
m_Name: alien1
m_Name: enemy1
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Expand Down Expand Up @@ -76,7 +76,7 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: 46fc833f46553be4bae0ba363af8e5b7, type: 3}
m_Sprite: {fileID: 21300000, guid: 4ab7e7189ab754124aa83e1fa63dc0c2, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
Expand All @@ -101,6 +101,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
score: 10
bulletPrefab: {fileID: 100000, guid: ac6ffb0923d0f7448852a32312a0263c, type: 3}
GraceShootingPeriod: 1
--- !u!61 &6100000
BoxCollider2D:
m_ObjectHideFlags: 0
Expand Down
0 ...nvaders/Assets/Prefabs/alien1.prefab.meta → ...nvaders/Assets/Prefabs/enemy1.prefab.meta
View file
Open in desktop
File renamed without changes.
5 changes: 3 additions & 2 deletions Basic/Invaders/Assets/Prefabs/alien2.prefab → Basic/Invaders/Assets/Prefabs/enemy2.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ GameObject:
- component: {fileID: 8401436849663568366}
- component: {fileID: 1361474663871475650}
m_Layer: 0
m_Name: alien2
m_Name: enemy2
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Expand Down Expand Up @@ -76,7 +76,7 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: bb17efd32f1b62b47b9d3876d96c0b2c, type: 3}
m_Sprite: {fileID: 21300000, guid: 6416b5a3e55ca443985a9882ff71d879, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
Expand All @@ -101,6 +101,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
score: 20
bulletPrefab: {fileID: 100000, guid: ac6ffb0923d0f7448852a32312a0263c, type: 3}
GraceShootingPeriod: 1
--- !u!61 &6100000
BoxCollider2D:
m_ObjectHideFlags: 0
Expand Down
0 ...nvaders/Assets/Prefabs/alien2.prefab.meta → ...nvaders/Assets/Prefabs/enemy2.prefab.meta
View file
Open in desktop
File renamed without changes.
5 changes: 3 additions & 2 deletions Basic/Invaders/Assets/Prefabs/alien3.prefab → Basic/Invaders/Assets/Prefabs/enemy3.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ GameObject:
- component: {fileID: 8349640660830732066}
- component: {fileID: 7651551376209856180}
m_Layer: 0
m_Name: alien3
m_Name: enemy3
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Expand Down Expand Up @@ -76,7 +76,7 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: 33ed2981c8de0d44b9881e822df7a931, type: 3}
m_Sprite: {fileID: 21300000, guid: b8a22d7f951c14967b823fdb049384a8, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
Expand All @@ -101,6 +101,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
score: 30
bulletPrefab: {fileID: 100000, guid: ac6ffb0923d0f7448852a32312a0263c, type: 3}
GraceShootingPeriod: 1
--- !u!61 &6100000
BoxCollider2D:
m_ObjectHideFlags: 0
Expand Down
0 ...nvaders/Assets/Prefabs/alien3.prefab.meta → ...nvaders/Assets/Prefabs/enemy3.prefab.meta
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...nvaders/Assets/Prefabs/alienbullet.prefab → ...nvaders/Assets/Prefabs/enemyBullet.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ GameObject:
- component: {fileID: 2336033219118315817}
- component: {fileID: 5836440591138289839}
m_Layer: 0
m_Name: alienbullet
m_Name: enemyBullet
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Expand Down
0 ...rs/Assets/Prefabs/alienbullet.prefab.meta → ...rs/Assets/Prefabs/enemyBullet.prefab.meta
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions Basic/Invaders/Assets/Prefabs/player 1.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: 6e31b7ae591614d4396749e68a6ba020, type: 3}
m_Sprite: {fileID: 21300000, guid: ccc6b3ea84f7e4550b618abc8d06dd5d, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
Expand Down Expand Up @@ -119,7 +119,7 @@ BoxCollider2D:
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
oldSize: {x: 1.28, y: 0.84}
oldSize: {x: 1.28, y: 1.28}
newSize: {x: 1, y: 1}
adaptiveTilingThreshold: 0.5
drawMode: 0
Expand Down
4 changes: 2 additions & 2 deletions Basic/Invaders/Assets/Prefabs/player.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: 6e31b7ae591614d4396749e68a6ba020, type: 3}
m_Sprite: {fileID: 21300000, guid: ccc6b3ea84f7e4550b618abc8d06dd5d, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
Expand Down Expand Up @@ -120,7 +120,7 @@ BoxCollider2D:
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
oldSize: {x: 1.28, y: 0.84}
oldSize: {x: 1.28, y: 1.28}
newSize: {x: 1, y: 1}
adaptiveTilingThreshold: 0.5
drawMode: 0
Expand Down
7 changes: 4 additions & 3 deletions Basic/Invaders/Assets/Prefabs/saucerr.prefab → ...Invaders/Assets/Prefabs/superEnemy.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ GameObject:
- component: {fileID: 8984612552865464625}
- component: {fileID: 3955316467729786863}
m_Layer: 0
m_Name: saucerr
m_Name: superEnemy
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Expand Down Expand Up @@ -77,7 +77,7 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: 9b0a23d4f4a4b5f4dad77b73d477aec2, type: 3}
m_Sprite: {fileID: 21300000, guid: 4814484f2408640ddb51647c66bdbc8e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
Expand Down Expand Up @@ -123,6 +123,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
score: 75
bulletPrefab: {fileID: 100000, guid: ac6ffb0923d0f7448852a32312a0263c, type: 3}
GraceShootingPeriod: 1
--- !u!114 &11400004
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -153,7 +154,7 @@ BoxCollider2D:
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
oldSize: {x: 2.05, y: 1.02}
oldSize: {x: 1.28, y: 1.28}
newSize: {x: 1, y: 1}
adaptiveTilingThreshold: 0.5
drawMode: 0
Expand Down
0 ...vaders/Assets/Prefabs/saucerr.prefab.meta → ...ers/Assets/Prefabs/superEnemy.prefab.meta
View file
Open in desktop
File renamed without changes.
15 changes: 5 additions & 10 deletions Basic/Invaders/Assets/Scenes/InGame.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -146.79999}
m_AnchoredPosition: {x: 0, y: -75.218}
m_SizeDelta: {x: 90, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &16114619
Expand Down Expand Up @@ -557,7 +557,7 @@ MonoBehaviour:
m_fontColor32:
serializedVersion: 2
rgba: 4280690380
m_fontColor: {r: 0.8018868, g: 0.14751692, b: 0.14751692, a: 1}
m_fontColor: {r: 0.990566, g: 0, b: 0.13591357, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
Expand Down Expand Up @@ -809,7 +809,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -361.4607, y: -142}
m_AnchoredPosition: {x: -200, y: -52.172}
m_SizeDelta: {x: 135.624, y: 46.0926}
m_Pivot: {x: 1, y: 1}
--- !u!114 &740254072
Expand Down Expand Up @@ -1332,7 +1332,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -168.6}
m_AnchoredPosition: {x: 0, y: -109}
m_SizeDelta: {x: 72.0173, y: 50}
m_Pivot: {x: 0.5, y: 1}
--- !u!114 &1087760897
Expand Down Expand Up @@ -1472,7 +1472,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 400, y: -123.363464}
m_AnchoredPosition: {x: 200, y: -56}
m_SizeDelta: {x: 186.1548, y: 38.4365}
m_Pivot: {x: 0, y: 1}
--- !u!114 &1118830665
Expand Down Expand Up @@ -1846,11 +1846,6 @@ PrefabInstance:
propertyPath: saucerSpawnPoint
value:
objectReference: {fileID: 1031245994}
- target: {fileID: 4266113290039088507, guid: 67eb58ec33df0475ca152786107f9037,
type: 3}
propertyPath: m_DelayedStartTime
value: 10
objectReference: {fileID: 0}
- target: {fileID: 4266113290039088508, guid: 67eb58ec33df0475ca152786107f9037,
type: 3}
propertyPath: m_Name
Expand Down
11 changes: 6 additions & 5 deletions Basic/Invaders/Assets/Scenes/InvadersLobby.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: bb17efd32f1b62b47b9d3876d96c0b2c, type: 3}
m_Sprite: {fileID: 21300000, guid: 6416b5a3e55ca443985a9882ff71d879, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
Expand Down Expand Up @@ -450,7 +450,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 46fc833f46553be4bae0ba363af8e5b7, type: 3}
m_Sprite: {fileID: 21300000, guid: 4ab7e7189ab754124aa83e1fa63dc0c2, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
Expand Down Expand Up @@ -532,6 +532,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_InGameSceneName: InGame
m_MinimumPlayerCount: 2
LobbyText: {fileID: 888252281}
--- !u!114 &698002441
MonoBehaviour:
Expand Down Expand Up @@ -1249,7 +1250,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 33ed2981c8de0d44b9881e822df7a931, type: 3}
m_Sprite: {fileID: 21300000, guid: b8a22d7f951c14967b823fdb049384a8, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
Expand Down Expand Up @@ -1302,7 +1303,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -208.49, y: -177.95}
m_SizeDelta: {x: 80, y: 40}
m_SizeDelta: {x: 50, y: 70}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1979523618
MonoBehaviour:
Expand All @@ -1324,7 +1325,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 9b0a23d4f4a4b5f4dad77b73d477aec2, type: 3}
m_Sprite: {fileID: 21300000, guid: 4814484f2408640ddb51647c66bdbc8e, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
Expand Down
10 changes: 5 additions & 5 deletions Basic/Invaders/Assets/Scenes/StartMenu.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: bb17efd32f1b62b47b9d3876d96c0b2c, type: 3}
m_Sprite: {fileID: 21300000, guid: 6416b5a3e55ca443985a9882ff71d879, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
Expand Down Expand Up @@ -674,7 +674,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 46fc833f46553be4bae0ba363af8e5b7, type: 3}
m_Sprite: {fileID: 21300000, guid: 4ab7e7189ab754124aa83e1fa63dc0c2, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
Expand Down Expand Up @@ -1510,7 +1510,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 33ed2981c8de0d44b9881e822df7a931, type: 3}
m_Sprite: {fileID: 21300000, guid: b8a22d7f951c14967b823fdb049384a8, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
Expand Down Expand Up @@ -1563,7 +1563,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -208.49, y: -177.95}
m_SizeDelta: {x: 80, y: 40}
m_SizeDelta: {x: 60, y: 70}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1979523618
MonoBehaviour:
Expand All @@ -1585,7 +1585,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 9b0a23d4f4a4b5f4dad77b73d477aec2, type: 3}
m_Sprite: {fileID: 21300000, guid: 4814484f2408640ddb51647c66bdbc8e, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
Expand Down
Loading