Hopefully fixed audio issues fixed credits & title

This commit is contained in:
Melbyj1125 2022-05-05 22:39:55 -05:00
parent fe2116f7ec
commit 7f0b3d1269
14 changed files with 356 additions and 82 deletions

View File

@ -625,7 +625,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -430, y: 340}
m_AnchoredPosition: {x: -400, y: 300}
m_SizeDelta: {x: 930, y: 175}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &617255485
@ -675,8 +675,8 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 100
m_fontSizeBase: 100
m_fontSize: 80
m_fontSizeBase: 80
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
@ -887,7 +887,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: 'Loken Kimberly
m_text: 'Kimberly Loken
'
m_isRightToLeft: 0
@ -916,8 +916,8 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 80
m_fontSizeBase: 80
m_fontSize: 50
m_fontSizeBase: 50
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
@ -1023,18 +1023,18 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: 'Butenhoff, Julia
m_text: 'Julia Butenhoff
Kazinski, Karl
Karl Kazinski
Melby, Justin
Justin Melby
Nydahl, Evan
Evan Nydahl
Rude,
Katherine
Rude
Wheat, Vincent
Vincent Wheat
'
m_isRightToLeft: 0
@ -1063,8 +1063,8 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 60
m_fontSizeBase: 60
m_fontSize: 50
m_fontSizeBase: 50
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
@ -1379,20 +1379,20 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: 'Brown, Lindsey
m_text: 'Lindsey Brown
Howard, Malcolm
Malcolm Howard
Otto, Camille
Camille Otto
Plath, Morgen
Morgen Plath
Stock,
Jaden
Stock
Vang, Kong
Kong Vang
Winebrenner, Mitchell'
Mitchell Winebrenner'
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: c9c6ab728bbf8974783d3354922a042f, type: 2}
m_sharedMaterial: {fileID: -1126714427571281196, guid: c9c6ab728bbf8974783d3354922a042f, type: 2}
@ -1419,8 +1419,8 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 60
m_fontSizeBase: 60
m_fontSize: 50
m_fontSizeBase: 50
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
@ -1509,7 +1509,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 236, y: 340}
m_AnchoredPosition: {x: 150, y: 300}
m_SizeDelta: {x: 930, y: 175}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1424464744
@ -1559,8 +1559,8 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 100
m_fontSizeBase: 100
m_fontSize: 80
m_fontSizeBase: 80
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
@ -1727,7 +1727,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -430, y: 50}
m_AnchoredPosition: {x: -400, y: 100}
m_SizeDelta: {x: 930, y: 175}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1675449419
@ -1777,8 +1777,8 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 100
m_fontSizeBase: 100
m_fontSize: 80
m_fontSizeBase: 80
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
@ -1928,7 +1928,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 873, y: 350}
m_AnchoredPosition: {x: 700, y: 300}
m_SizeDelta: {x: 930, y: 175}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1807625878
@ -1978,8 +1978,8 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 100
m_fontSizeBase: 100
m_fontSize: 80
m_fontSizeBase: 80
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
@ -2113,8 +2113,8 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 60
m_fontSizeBase: 60
m_fontSize: 50
m_fontSizeBase: 50
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18

View File

@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 705507994}
m_IndirectSpecularColor: {r: 0.8674563, g: 0.8218122, b: 0.7859322, a: 1}
m_IndirectSpecularColor: {r: 0.8672222, g: 0.82182354, b: 0.78585345, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@ -123,6 +123,140 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!1 &129712945
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 129712946}
- component: {fileID: 129712948}
- component: {fileID: 129712947}
m_Layer: 5
m_Name: Text (TMP)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &129712946
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 129712945}
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: 790862021}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 450, y: 120}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &129712947
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 129712945}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: Join Game
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: c9c6ab728bbf8974783d3354922a042f, type: 2}
m_sharedMaterial: {fileID: -1126714427571281196, guid: c9c6ab728bbf8974783d3354922a042f, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 65
m_fontSizeBase: 65
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!222 &129712948
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 129712945}
m_CullTransparentMesh: 1
--- !u!1 &149523687
GameObject:
m_ObjectHideFlags: 0
@ -1495,14 +1629,15 @@ RectTransform:
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_Children:
- {fileID: 129712946}
m_Father: {fileID: 884986644}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 280, y: 0}
m_SizeDelta: {x: 450, y: 150}
m_SizeDelta: {x: 450, y: 120}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &790862022
MonoBehaviour:
@ -1592,9 +1727,9 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: -5108014946330797908, guid: 31dc478c3b1a28d49a2f7c1bb710820e, type: 3}
m_Sprite: {fileID: -3778901795496232556, guid: 129d6de3c52ce5747b4594049bbc9a0b, type: 3}
m_Type: 0
m_PreserveAspect: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
@ -3288,14 +3423,15 @@ RectTransform:
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_Children:
- {fileID: 1795897211}
m_Father: {fileID: 1644081394}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -280, y: 0}
m_SizeDelta: {x: 450, y: 150}
m_SizeDelta: {x: 450, y: 120}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1614003510
MonoBehaviour:
@ -3385,15 +3521,15 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 4912627564054529409, guid: 31dc478c3b1a28d49a2f7c1bb710820e, type: 3}
m_Sprite: {fileID: -3778901795496232556, guid: 129d6de3c52ce5747b4594049bbc9a0b, type: 3}
m_Type: 0
m_PreserveAspect: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_UseSpriteMesh: 1
m_PixelsPerUnitMultiplier: 1
--- !u!222 &1614003512
CanvasRenderer:
@ -4014,6 +4150,140 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1795530225}
m_CullTransparentMesh: 1
--- !u!1 &1795897210
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1795897211}
- component: {fileID: 1795897213}
- component: {fileID: 1795897212}
m_Layer: 5
m_Name: Text (TMP)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1795897211
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1795897210}
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: 1614003509}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 450, y: 120}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1795897212
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1795897210}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: Host Game
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: c9c6ab728bbf8974783d3354922a042f, type: 2}
m_sharedMaterial: {fileID: -1126714427571281196, guid: c9c6ab728bbf8974783d3354922a042f, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 65
m_fontSizeBase: 65
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!222 &1795897213
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1795897210}
m_CullTransparentMesh: 1
--- !u!1 &1824262298
GameObject:
m_ObjectHideFlags: 0

View File

@ -28,12 +28,12 @@ public class AudioHandler : MonoBehaviour
public void Play()
{
mainTheme.Play();
if(mainTheme != null) mainTheme.Play();
}
void Stop()
{
mainTheme.Stop();
if(mainTheme != null) mainTheme.Stop();
}
// Start is called before the first frame update

View File

@ -95,7 +95,7 @@ public class Archer : NetworkBehaviour
if (target != null && shootingCooldown <= 0f) {
Vector3 position = target.position;
ShootArrowServerRPC(position);
fireSound.Play();
if(fireSound != null) fireSound.Play();
shootingCooldown = 1f/ fireRate;
}

View File

@ -19,7 +19,8 @@ public class Bumper : MonoBehaviour {
if(dirBump.x == 0 && dirBump.z == 0){
dirBump = new Vector3(1,.1f,1);
}
bumpNoise.Play();
if(bumpNoise != null) bumpNoise.Play();
playerMovement.GetHit(dirBump.normalized, bumpPower);
//
}

View File

@ -34,7 +34,7 @@ public class Thunderstorm : MonoBehaviour
{
inAir = true;
}
clouds.Play();
if(clouds != null) clouds.Play();
}
private void FixedUpdate()
@ -63,9 +63,9 @@ public class Thunderstorm : MonoBehaviour
if (hit.collider == null)
{
inAir = true;
bolt.Play();
sparks.Play();
pow.Play();
if(bolt != null) bolt.Play();
if(sparks != null) sparks.Play();
if(pow != null) pow.Play();
}
}

View File

@ -173,7 +173,7 @@ public class KingPlace : NetworkBehaviour
// PLACE NETWORKED VERSION
SpawnSlimeServerRPC(slimeLoc, slimeRot, slimeBodyRot, SlimeDir);
//sound here?
placeSound.Play();
if(placeSound != null) placeSound.Play();
SlimePlacing = false;
MenuOff();
@ -275,7 +275,7 @@ public class KingPlace : NetworkBehaviour
SpawnBoxServerRPC(spawnLoc, spawnRot);
//sound here?
placeSound.Play();
if(placeSound != null) placeSound.Play();
// Remove the reference to PlaceTemp
Destroy(PlaceTemp);
@ -289,7 +289,7 @@ public class KingPlace : NetworkBehaviour
SpawnBumperServerRPC(spawnLoc, spawnRot);
//sound here?
placeSound.Play();
if(placeSound != null) placeSound.Play();
//Remove PlaceTemp
Destroy(PlaceTemp);
@ -407,7 +407,7 @@ public class KingPlace : NetworkBehaviour
SpawnHailServerRPC(spawnLoc);
//Sound here?
placeSound.Play();
if(placeSound != null) placeSound.Play();
Destroy(PlaceTemp);
Destroy(HailCorner);

View File

@ -396,7 +396,7 @@ public class AerialStateManager : NetworkBehaviour
AddImpact((GetWallJumpDirection()), pStats.JumpPow * 8.5f);
pStats.GravVel = pStats.JumpPow;
curJumpNum = 0;
jumpSound1.Play();
if(jumpSound1 != null) jumpSound1.Play();
}
else{
pStats.GravVel = pStats.JumpPow;
@ -408,21 +408,21 @@ public class AerialStateManager : NetworkBehaviour
//add check here for spring?
if (curJumpNum == 0)
{
jumpSound1.Play();
if(jumpSound1 != null) jumpSound1.Play();
}
if (curJumpNum == 1)
{
jumpSound2.Play();
if(jumpSound2 != null) jumpSound2.Play();
}
if (curJumpNum == 2)
{
jumpSound3.Play();
if(jumpSound3 != null) jumpSound3.Play();
}
}
if(pStats.JumpPow > 60)
{
springJumpSound.Play();
if(springJumpSound != null) springJumpSound.Play();
}
@ -630,7 +630,7 @@ public class AerialStateManager : NetworkBehaviour
{
//Debug.Log("Found Hook");
hookPoint = hookPoints[hookPointIndex]; //The point we are grappling from
grappleSound.Play();
if(grappleSound != null) grappleSound.Play();
return true;
}
}

View File

@ -36,6 +36,9 @@ public class AerialGrappleAirState : AerialBaseState
//Calculate the update y position for the hook
updatedYHookPoint = new Vector3(aSM.hookPoint.transform.position.x, aSM.hookPoint.transform.position.y - distanceBeneathHook, aSM.hookPoint.transform.position.z);
//Set Gravity to 0
aSM.pStats.GravVel = -1;
}
public override void ExitState(AerialStateManager aSM, AerialBaseState nextState)

View File

@ -347,7 +347,7 @@ public class MoveStateManager : NetworkBehaviour
//Actually move he player
moveController.Move(driftVel);
slideAudio.Play();
//slideAudio.Play();
}
//Camera and player rotation

View File

@ -105,6 +105,6 @@ public class NitroStateManager : NetworkBehaviour
currentState = state;
animationManager.updateCurrentPriority();
currentState.EnterState(this, previousState);
boostSound.Play();
//if(boostSound != null) boostSound.Play();
}
}

View File

@ -49,13 +49,13 @@ public class PostGameUI : NetworkBehaviour {
// Runners win
switch (winnerCount) {
case 1:
runnerWin.Play();
if(runnerWin != null) runnerWin.Play();
winText = "And the winner is the Runner " + playerFinishedNames[0] + "!";
active[1] = true;
player1.SetActive(active[1]);
break;
case 2:
runnerWin.Play();
if(runnerWin != null) runnerWin.Play();
winText = "And the winners are the Runners " + playerFinishedNames[0] + " and " + playerFinishedNames[1] + "!";
active[1] = true;
active[2] = true;
@ -65,7 +65,7 @@ public class PostGameUI : NetworkBehaviour {
}
} else {
// King wins
kingWin.Play();
if(kingWin != null) kingWin.Play();
winText = "And the winner is King " + kingName + "!";
active[0] = true;
king.SetActive(active[0]);

View File

@ -90,7 +90,7 @@ public class WeatherWheel : NetworkBehaviour {
{
// Snow
SpawnWeatherServerRPC(PlayerStats.Weather.Snow);
snowJingle.Play();
if(snowJingle != null) snowJingle.Play();
// Set angle back to centered
transform.localRotation = Quaternion.Euler(0, 0, 90);
}
@ -106,7 +106,7 @@ public class WeatherWheel : NetworkBehaviour {
{
// Fog
SpawnWeatherServerRPC(PlayerStats.Weather.Fog);
fogJingle.Play();
if(fogJingle != null) fogJingle.Play();
// Set angle back to centered
transform.localRotation = Quaternion.Euler(0, 0, 270);
}
@ -163,7 +163,7 @@ public class WeatherWheel : NetworkBehaviour {
foreach(GameObject go in Rains) {
go.GetComponent<ParticleSystem>().Play();
}
RainAmbi.Play();
if(RainAmbi != null) RainAmbi.Play();
break;
case PlayerStats.Weather.Snow:
GameObject[] Snows = GameObject.FindGameObjectsWithTag("SnowSystem");
@ -179,7 +179,7 @@ public class WeatherWheel : NetworkBehaviour {
// Also store the wind direction
go.GetComponent<WindDirection>().windDireciton = windDir;
}
windAmbi.Play();
if(windAmbi != null) windAmbi.Play();
break;
case PlayerStats.Weather.Fog:
GameObject[] Fogs = GameObject.FindGameObjectsWithTag("FogSystem");

View File

@ -9,32 +9,32 @@ EditorUserSettings:
value: 22424703114646680e0b0227036c7c1f18030a25203b68252320092a
flags: 0
RecentlyUsedScenePath-1:
value: 22424703114646680e0b0227036c7c1f18030a25203b68252320092a
value: 22424703114646680e0b0227036c731f1415016439262f2434
flags: 0
RecentlyUsedScenePath-2:
value: 22424703114646680e0b0227036c731f1415016439262f2434
value: 22424703114646680e0b0227036c7000021e17243f66333e243d04
flags: 0
RecentlyUsedScenePath-3:
value: 22424703114646680e0b0227036c7000021e17243f66333e243d04
flags: 0
RecentlyUsedScenePath-4:
value: 22424703114646680e0b0227036c7000021e17243f66333e243d04
flags: 0
RecentlyUsedScenePath-5:
value: 22424703114646680e0b0227036c6b19021b1d192f2d2835633c133af6f9
flags: 0
RecentlyUsedScenePath-6:
value: 22424703114646680e0b0227036c6f1f05033f2b212d68252320092a
flags: 0
RecentlyUsedScenePath-7:
RecentlyUsedScenePath-5:
value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb
flags: 0
RecentlyUsedScenePath-8:
RecentlyUsedScenePath-6:
value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26
flags: 0
RecentlyUsedScenePath-9:
RecentlyUsedScenePath-7:
value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb
flags: 0
RecentlyUsedScenePath-8:
value: 22424703114646680e0b0227036c6b19021b1d192f2d2835633c133af6f9
flags: 0
RecentlyUsedScenePath-9:
value: 22424703114646680e0b0227036c7c021313113e3f66333e243d04
flags: 0
vcSharedLogLevel:
value: 0d5e400f0650
flags: 0