Commit 6f77db9c authored by RaptorTwitch's avatar RaptorTwitch

Merge branch 'master' of...

Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/turtle-takeover-reloaded
parents a09cab8a 7e9ffb8b
......@@ -117,7 +117,7 @@ MonoBehaviour:
keycards: 0
hp: 3
maxhp: 3
renderer: {fileID: 6256094775660448605}
render: {fileID: 6256094775660448605}
PlayerModel: {fileID: 7684202323498604895}
explosionFX: {fileID: 3849051887377255970, guid: 6dfb3bf841f5c5e448b6360edfb447cb,
type: 3}
......@@ -152,6 +152,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6249cfc2dc61cb64582ee3de38f25652, type: 3}
m_Name:
m_EditorClassIdentifier:
laserSFX: {fileID: 0}
pf_bulletCluster: {fileID: 8619152150821977904, guid: e8677d7e3f737654881c72a0c0d88c3d,
type: 3}
pf_bullet: {fileID: 8778073330423009085, guid: 42a1d25853eebe342b168b7069ec815c,
......@@ -509,12 +510,6 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2ddf822bc9c1563449d56162810bc54b, type: 3}
--- !u!1 &7684202323498604895 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: 2ddf822bc9c1563449d56162810bc54b,
type: 3}
m_PrefabInstance: {fileID: 1838075967555420246}
m_PrefabAsset: {fileID: 0}
--- !u!4 &6699276605682576204 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 2ddf822bc9c1563449d56162810bc54b,
......@@ -527,6 +522,12 @@ SkinnedMeshRenderer:
type: 3}
m_PrefabInstance: {fileID: 1838075967555420246}
m_PrefabAsset: {fileID: 0}
--- !u!1 &7684202323498604895 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: 2ddf822bc9c1563449d56162810bc54b,
type: 3}
m_PrefabInstance: {fileID: 1838075967555420246}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &4656227959290092217
PrefabInstance:
m_ObjectHideFlags: 0
......
......@@ -160,6 +160,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: dd842e6609b9428dbb425392bd1dadfc, type: 3}
m_Name:
m_EditorClassIdentifier:
mesh: {fileID: 3955904631137254441}
type: 0
facing: 0
connectionLocations: 0000000003000000
......@@ -1711,15 +1712,15 @@ PrefabInstance:
objectReference: {fileID: 2100000, guid: 1488a02b515c5594692169991771e567, type: 2}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 27f4304954bd11ecfabd36d3fd002633, type: 3}
--- !u!4 &53317060168830522 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 27f4304954bd11ecfabd36d3fd002633,
type: 3}
m_PrefabInstance: {fileID: 5028233094915515680}
m_PrefabAsset: {fileID: 0}
--- !u!1 &3955904631137254441 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: 27f4304954bd11ecfabd36d3fd002633,
type: 3}
m_PrefabInstance: {fileID: 5028233094915515680}
m_PrefabAsset: {fileID: 0}
--- !u!4 &53317060168830522 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 27f4304954bd11ecfabd36d3fd002633,
type: 3}
m_PrefabInstance: {fileID: 5028233094915515680}
m_PrefabAsset: {fileID: 0}
......@@ -582,6 +582,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: dd842e6609b9428dbb425392bd1dadfc, type: 3}
m_Name:
m_EditorClassIdentifier:
mesh: {fileID: 7035565595211952408}
type: 4
facing: 0
connectionLocations: 00000000
......
......@@ -1547,6 +1547,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: dd842e6609b9428dbb425392bd1dadfc, type: 3}
m_Name:
m_EditorClassIdentifier:
mesh: {fileID: 2892101343077857840}
type: 2
facing: 0
connectionLocations: 00000000010000000200000003000000
......@@ -1743,15 +1744,15 @@ PrefabInstance:
objectReference: {fileID: 2100000, guid: 3fc062a057420e943ac6fe0fd2e032b6, type: 2}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 38e18f066b0cd542cb06bc76b30d15a9, type: 3}
--- !u!1 &2892101343077857840 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: 38e18f066b0cd542cb06bc76b30d15a9,
type: 3}
m_PrefabInstance: {fileID: 6558124855799751481}
m_PrefabAsset: {fileID: 0}
--- !u!4 &2195952327477889059 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 38e18f066b0cd542cb06bc76b30d15a9,
type: 3}
m_PrefabInstance: {fileID: 6558124855799751481}
m_PrefabAsset: {fileID: 0}
--- !u!1 &2892101343077857840 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: 38e18f066b0cd542cb06bc76b30d15a9,
type: 3}
m_PrefabInstance: {fileID: 6558124855799751481}
m_PrefabAsset: {fileID: 0}
......@@ -220,6 +220,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: dd842e6609b9428dbb425392bd1dadfc, type: 3}
m_Name:
m_EditorClassIdentifier:
mesh: {fileID: 4416492001748188020}
type: 1
facing: 0
connectionLocations: 010000000200000003000000
......@@ -1727,15 +1728,15 @@ PrefabInstance:
objectReference: {fileID: 2100000, guid: 304d677be1e20f4438651e7a0b76b422, type: 2}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 5296bfdb9af34830db20f216ab8081b9, type: 3}
--- !u!4 &797649281415317863 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 5296bfdb9af34830db20f216ab8081b9,
type: 3}
m_PrefabInstance: {fileID: 5650721230077207165}
m_PrefabAsset: {fileID: 0}
--- !u!1 &4416492001748188020 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: 5296bfdb9af34830db20f216ab8081b9,
type: 3}
m_PrefabInstance: {fileID: 5650721230077207165}
m_PrefabAsset: {fileID: 0}
--- !u!4 &797649281415317863 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 5296bfdb9af34830db20f216ab8081b9,
type: 3}
m_PrefabInstance: {fileID: 5650721230077207165}
m_PrefabAsset: {fileID: 0}
......@@ -477,6 +477,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: dd842e6609b9428dbb425392bd1dadfc, type: 3}
m_Name:
m_EditorClassIdentifier:
mesh: {fileID: 8469122502630112995}
type: 3
facing: 0
connectionLocations: 0000000002000000
......@@ -1711,15 +1712,15 @@ PrefabInstance:
objectReference: {fileID: 2100000, guid: 6792fb5f67dd38545be740bf406759c5, type: 2}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 5e936606779ca40a68594731e7adb093, type: 3}
--- !u!1 &8469122502630112995 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: 5e936606779ca40a68594731e7adb093,
type: 3}
m_PrefabInstance: {fileID: 480111772805081066}
m_PrefabAsset: {fileID: 0}
--- !u!4 &4887258625981943024 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 5e936606779ca40a68594731e7adb093,
type: 3}
m_PrefabInstance: {fileID: 480111772805081066}
m_PrefabAsset: {fileID: 0}
--- !u!1 &8469122502630112995 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: 5e936606779ca40a68594731e7adb093,
type: 3}
m_PrefabInstance: {fileID: 480111772805081066}
m_PrefabAsset: {fileID: 0}
......@@ -175,6 +175,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_text: 'Level:'
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 0efd3cd25a1954648be6b3dfe9f272ea, type: 2}
......@@ -211,7 +213,7 @@ MonoBehaviour:
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_textAlignment: 257
m_textAlignment: 260
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
......@@ -493,6 +495,12 @@ MonoBehaviour:
- {fileID: 3344877540166372075, guid: 9f9d7dec030fd33d88aa9b1928a57095, type: 3}
- {fileID: 1374397549283580844, guid: 7d66f9bb90d32db63a1673bec75be674, type: 3}
- {fileID: 5739927381129667486, guid: 569e5ecd36da0a14cad172cff216dced, type: 3}
tileColors:
- {r: 0, g: 0.7058824, b: 0, a: 0}
- {r: 0, g: 0.53653914, b: 0.6226415, a: 0}
- {r: 1, g: 1, b: 1, a: 0}
- {r: 0.4811321, g: 0, b: 0.16024186, a: 0}
- {r: 1, g: 0, b: 0.028076172, a: 0}
gm: {fileID: 1477020996}
pickupLogic: {fileID: 6282504407602761075, guid: de88192e9e62c2b31b892e225be920f8,
type: 3}
......@@ -546,6 +554,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 7ae1fed89ce8a3e43b094fd302f14bde, type: 3}
m_FontSize: 35
......@@ -642,6 +652,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 7ae1fed89ce8a3e43b094fd302f14bde, type: 3}
m_FontSize: 14
......@@ -720,6 +732,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 92e2b81f58a8e3847acd5613473eb3ed, type: 3}
m_Type: 0
m_PreserveAspect: 1
......@@ -930,6 +944,8 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!114 &649347309
MonoBehaviour:
m_ObjectHideFlags: 0
......@@ -948,6 +964,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 8afe5ce9793197341a95c25f9a612f15, type: 3}
m_Type: 2
m_PreserveAspect: 0
......@@ -1021,6 +1039,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 7ae1fed89ce8a3e43b094fd302f14bde, type: 3}
m_FontSize: 25
......@@ -1101,6 +1121,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 8afe5ce9793197341a95c25f9a612f15, type: 3}
m_Type: 2
m_PreserveAspect: 0
......@@ -1245,6 +1267,8 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!114 &782977230
MonoBehaviour:
m_ObjectHideFlags: 0
......@@ -1263,6 +1287,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 8afe5ce9793197341a95c25f9a612f15, type: 3}
m_Type: 2
m_PreserveAspect: 0
......@@ -1405,6 +1431,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 7ae1fed89ce8a3e43b094fd302f14bde, type: 3}
m_FontSize: 14
......@@ -1556,6 +1584,8 @@ MonoBehaviour:
HPPanelprefab: {fileID: 1058129929124974519, guid: 118509fb8e27ca945a8dc004ea087314,
type: 3}
keycardCountText: {fileID: 469286980}
levelText: {fileID: 216893790}
scoreText: {fileID: 1059798635}
--- !u!114 &1049494711
MonoBehaviour:
m_ObjectHideFlags: 0
......@@ -1625,6 +1655,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_text: LOADING...
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 0efd3cd25a1954648be6b3dfe9f272ea, type: 2}
......@@ -1760,7 +1792,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -5.72, y: 86}
m_AnchoredPosition: {x: -5.7199707, y: 86}
m_SizeDelta: {x: 235.66, y: 16.540009}
m_Pivot: {x: 1, y: 0}
--- !u!114 &1059798635
......@@ -1781,6 +1813,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_text: Score
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 0efd3cd25a1954648be6b3dfe9f272ea, type: 2}
......@@ -1937,6 +1971,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 7ae1fed89ce8a3e43b094fd302f14bde, type: 3}
m_FontSize: 14
......@@ -2016,6 +2052,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 7d480d8f40692634f9f10d1aa5d08181, type: 3}
m_Type: 0
m_PreserveAspect: 0
......@@ -2089,6 +2127,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 7ae1fed89ce8a3e43b094fd302f14bde, type: 3}
m_FontSize: 25
......@@ -2236,6 +2276,8 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!114 &1428618605
MonoBehaviour:
m_ObjectHideFlags: 0
......@@ -2254,6 +2296,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 8afe5ce9793197341a95c25f9a612f15, type: 3}
m_Type: 2
m_PreserveAspect: 0
......@@ -2309,10 +2353,10 @@ MonoBehaviour:
toidTurretModel: {fileID: 2784080251743448897, guid: a762565cbb15b464894d68c2f8e05d26,
type: 3}
eBullet: {fileID: 8849718972375602660, guid: 6a6f43447713fa94ba3ca2b2dee5f898, type: 3}
camera: {fileID: 307351461}
cam: {fileID: 307351461}
canvas: {fileID: 1049494705}
loadingScreen: {fileID: 528006434}
camTransitionMultiplier: 1
camTransitionMultiplier: 1.5
--- !u!4 &1477020997
Transform:
m_ObjectHideFlags: 0
......@@ -2382,6 +2426,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: f58a0faa75287cb4898418a7229d2020, type: 3}
m_Type: 1
m_PreserveAspect: 0
......@@ -2459,6 +2505,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 8afe5ce9793197341a95c25f9a612f15, type: 3}
m_Type: 2
m_PreserveAspect: 0
......@@ -2603,6 +2651,8 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!114 &1802487627
MonoBehaviour:
m_ObjectHideFlags: 0
......@@ -2621,6 +2671,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 8afe5ce9793197341a95c25f9a612f15, type: 3}
m_Type: 2
m_PreserveAspect: 0
......@@ -2765,6 +2817,8 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!114 &1804402713
MonoBehaviour:
m_ObjectHideFlags: 0
......@@ -2783,6 +2837,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 8afe5ce9793197341a95c25f9a612f15, type: 3}
m_Type: 2
m_PreserveAspect: 0
......@@ -2947,6 +3003,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 7ae1fed89ce8a3e43b094fd302f14bde, type: 3}
m_FontSize: 25
......@@ -3024,6 +3082,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 7ae1fed89ce8a3e43b094fd302f14bde, type: 3}
m_FontSize: 14
......@@ -3107,6 +3167,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 7ae1fed89ce8a3e43b094fd302f14bde, type: 3}
m_FontSize: 14
......
......@@ -71,7 +71,7 @@ public class BasicAI : MonoBehaviour
animator.SetTrigger("fire");
canFire = false;
EnemyBullet bullet = gm.getBullet();
EnemyBullet bullet = gm.GetBullet();
bullet.transform.position = transform.position;
bullet.transform.rotation = Quaternion.Euler(0, 180, 0);
bullet.activate();
......
......@@ -30,7 +30,7 @@ public class ToidHeart : MonoBehaviour
void initDeath()
{
gm.reportDeath();
gm.ReportDeath();
int rng = Random.Range(0, 100);
if(rng <= dropChance)
Instantiate(pickup, transform.position, Quaternion.identity);
......
......@@ -90,7 +90,7 @@ public class TurretAI : MonoBehaviour
if(canFire)
{
canFire = false;
EnemyBullet bullet = gm.getBullet();
EnemyBullet bullet = gm.GetBullet();
bullet.transform.position = transform.position;
bullet.transform.rotation = transform.rotation;
bullet.activate();
......
......@@ -32,11 +32,11 @@ public class BoundaryClass : MonoBehaviour
{
tile.GetComponent<TileClass>().gates[direction].OpenGate();
tile.GetComponent<TileClass>().gates[direction].IsLocked = false;
tile.GetComponent<TileClass>().moveTile(direction);
tile.GetComponent<TileClass>().MoveTile(direction);
}
}
else
tile.GetComponent<TileClass>().moveTile(direction);
tile.GetComponent<TileClass>().MoveTile(direction);
}
}
}
......@@ -55,13 +55,18 @@ public class GameMaster : MonoBehaviour
return difficulty;
}
public void levelGenerated()
public void LevelGenerated()
{
difficulty++;
canvas.GetComponent<HUD>().SetLevelCount(difficulty);
canvas.GetComponent<HUD>().UpdateScore(highscore);
if(difficulty % 2 == 0)
minTurrets++;
currentTile = (TileClass)lvlgen.grid[new Vector2(0, 0)];
cam.position = currentTile.getCamPos().position;
cam.position = currentTile.GetCamPos().position;
Transform navigation = currentTile.transform.Find("NavPoints");
int i = 0;
foreach (Transform child in navigation)
......@@ -78,7 +83,7 @@ public class GameMaster : MonoBehaviour
i++;
}
currentTile.setTrigger();
currentTile.SetTrigger();
//currentTile.openGates(false);
}
......@@ -104,8 +109,8 @@ public class GameMaster : MonoBehaviour
Cursor.visible = true;
Time.timeScale = 0.0f;
pauseMenu.OpenPauseMenu();
AudioListener.pause = true;
paused = true;
}
}
}
......@@ -116,6 +121,7 @@ public class GameMaster : MonoBehaviour
Cursor.visible = false;
Time.timeScale = 1.0f;
pauseMenu.BackToGame();
AudioListener.pause = false;
paused = false;
}
......@@ -126,10 +132,11 @@ public class GameMaster : MonoBehaviour
gameover = true;
pauseMenu.BackToGame();
pauseMenu.OpenDeathScreen();
AudioListener.pause = true;
Destroy(player);
}
void spawnEnemies()
void SpawnEnemies()
{
if (currentTile.IsCompleted)
return;
......@@ -156,7 +163,7 @@ public class GameMaster : MonoBehaviour
StartCoroutine(coroutine2);
}
void spawnBasicToid()
void SpawnBasicToid()
{
BasicAI toid;
toid = Instantiate(toidBasicModel, tileNavPoints[0].position, Quaternion.identity).GetComponent<BasicAI>();
......@@ -167,7 +174,7 @@ public class GameMaster : MonoBehaviour
currentEnemies++;
}
void spawnTurretToid()
void SpawnTurretToid()
{
if (tempTurretSpawns.Count != 0)
{
......@@ -184,17 +191,18 @@ public class GameMaster : MonoBehaviour
}
}
public void reportDeath()
public void ReportDeath()
{
currentEnemies--;
highscore += 10;
hud.UpdateScore(highscore);
if (currentEnemies <= 0)
{
StartCoroutine("endFight");
}
}
public EnemyBullet getBullet()
public EnemyBullet GetBullet()
{
EnemyBullet bullet = enemyBulletPool[nextEBullet];
nextEBullet++;
......@@ -208,11 +216,11 @@ public class GameMaster : MonoBehaviour
hud.UpdateHUD(maxHP, HP, Keycards);
}
public void transitToTile(TileClass nextTile, Facing direction)
public void TransitToTile(TileClass nextTile, Facing direction)
{
player.GetComponent<PrimaryWeaponLogic>().DeactivateAliveClusters();
Vector3 newPos = nextTile.getCamPos().position;
Vector3 newPos = nextTile.GetCamPos().position;
StartCoroutine(Transition(newPos, TileClass.CalcPlayerPos(TileClass.InvertFacing(direction), newPos)));
currentTile = nextTile;
......@@ -239,7 +247,7 @@ public class GameMaster : MonoBehaviour
for (int i = 0; i < num; i++)
{
yield return new WaitForSeconds(0.5f);
spawnBasicToid();
SpawnBasicToid();
}
}
......@@ -248,18 +256,18 @@ public class GameMaster : MonoBehaviour
for (int i = 0; i < num; i++)
{
yield return new WaitForSeconds(0.2f);
spawnTurretToid();
SpawnTurretToid();
}
}
IEnumerator endFight()
IEnumerator EndFight()
{
currentTile.IsCompleted = true;
if (currentTile.item)