Commit 455ebb16 authored by mmaluschnig's avatar mmaluschnig
Browse files

Final Build Yee Haw

parent e8bc861a
......@@ -2,15 +2,16 @@
<MonoDevelop.Ide.ItemProperties.Assembly-CSharp PreferredExecutionTarget="Unity.Editor" />
<MonoDevelop.Ide.Workbench ActiveDocument="Assets/Scripts/DaytimeScripts/TentInteractoins.cs">
<Files>
<File FileName="Assets/Scripts/DaytimeScripts/CharacterInteractions.cs" Line="60" Column="44" />
<File FileName="Assets/Scripts/DaytimeScripts/CharacterSpeech/AhavaSpeech.cs" Line="192" Column="73" />
<File FileName="Assets/Scripts/DaytimeScripts/CharacterInteractions.cs" Line="261" Column="14" />
<File FileName="Assets/Scripts/DaytimeScripts/CharacterSpeech/AhavaSpeech.cs" Line="88" Column="36" />
<File FileName="Assets/Scripts/DaytimeScripts/DaytimeManager.cs" Line="17" Column="7" />
<File FileName="Assets/Scripts/DaytimeScripts/CharacterSpeech/JohnSmithSpeech.cs" Line="237" Column="104" />
<File FileName="Assets/Scripts/PieScripts/PieManager.cs" Line="40" Column="53" />
<File FileName="Assets/Scripts/DaytimeScripts/CharacterSpeech/SimonSpeech.cs" Line="174" Column="111" />
<File FileName="Assets/Scripts/GameManager.cs" Line="151" Column="37" />
<File FileName="Assets/Scripts/DaytimeScripts/TentInteractoins.cs" Line="35" Column="91" />
<File FileName="Assets/Scripts/DaytimeScripts/TentInteractoins.cs" Line="31" Column="17" />
<File FileName="Assets/Scripts/DaytimeScripts/ObjectInteractions.cs" Line="1" Column="1" />
<File FileName="Assets/Scripts/DaytimeScripts/TentIntroInteractions.cs" Line="42" Column="11" />
</Files>
</MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
......
......@@ -73,6 +73,7 @@ public class AhavaSpeech : MonoBehaviour, Character {
currentResponses = responseQueue.Dequeue();
return conversation.Dequeue();
} else if(conversation.Count == 1){
GameManager.speechState = conversation.Count;
GameManager.HasTalkedToAhava = true;
currentResponses = responseQueue.Dequeue();
return conversation.Dequeue();
......
......@@ -12,7 +12,8 @@ General - Esc to access pause menu
Known issues:
Moving targets sometimes get stuck in place in pie throwing
Throwing a pie and then instantly tapping spacebar results in your pie not being thrown.(but you can stll throw the next pie).
Throwing a pie and then instantly tapping spacebar results in your pie not being thrown.(but you can still throw the next pie).
Songs desync if computer lags.
Music courtesy of Kevin Macleod and incompetech.com
Sound effects courtesy of freesound.org
\ No newline at end of file
{
"companyName": "DefaultCompany",
"productName": "RingMaster",
"dataUrl": "BuildPresentation.data.unityweb",
"wasmCodeUrl": "BuildPresentation.wasm.code.unityweb",
"wasmFrameworkUrl": "BuildPresentation.wasm.framework.unityweb",
"TOTAL_MEMORY": 268435456,
"graphicsAPI": ["WebGL 2.0", "WebGL 1.0"],
"webglContextAttributes": {"preserveDrawingBuffer": false},
"splashScreenStyle": "Dark",
"backgroundColor": "#231F20",
"cacheControl": {"default": "must-revalidate"}
}
\ No newline at end of file
function UnityProgress(gameInstance, progress) {
if (!gameInstance.Module)
return;
if (!gameInstance.logo) {
gameInstance.logo = document.createElement("div");
gameInstance.logo.className = "logo " + gameInstance.Module.splashScreenStyle;
gameInstance.container.appendChild(gameInstance.logo);
}
if (!gameInstance.progress) {
gameInstance.progress = document.createElement("div");
gameInstance.progress.className = "progress " + gameInstance.Module.splashScreenStyle;
gameInstance.progress.empty = document.createElement("div");
gameInstance.progress.empty.className = "empty";
gameInstance.progress.appendChild(gameInstance.progress.empty);
gameInstance.progress.full = document.createElement("div");
gameInstance.progress.full.className = "full";
gameInstance.progress.appendChild(gameInstance.progress.full);
gameInstance.container.appendChild(gameInstance.progress);
}
gameInstance.progress.full.style.width = (100 * progress) + "%";
gameInstance.progress.empty.style.width = (100 * (1 - progress)) + "%";
if (progress == 1)
gameInstance.logo.style.display = gameInstance.progress.style.display = "none";
}
\ No newline at end of file
.webgl-content * {border: 0; margin: 0; padding: 0}
.webgl-content {position: absolute; top: 50%; left: 50%; -webkit-transform: translate(-50%, -50%); transform: translate(-50%, -50%);}
.webgl-content .logo, .progress {position: absolute; left: 50%; top: 50%; -webkit-transform: translate(-50%, -50%); transform: translate(-50%, -50%);}
.webgl-content .logo {background: url('progressLogo.Light.png') no-repeat center / contain; width: 154px; height: 130px;}
.webgl-content .progress {height: 18px; width: 141px; margin-top: 90px;}
.webgl-content .progress .empty {background: url('progressEmpty.Light.png') no-repeat right / cover; float: right; width: 100%; height: 100%; display: inline-block;}
.webgl-content .progress .full {background: url('progressFull.Light.png') no-repeat left / cover; float: left; width: 0%; height: 100%; display: inline-block;}
.webgl-content .logo.Dark {background-image: url('progressLogo.Dark.png');}
.webgl-content .progress.Dark .empty {background-image: url('progressEmpty.Dark.png');}
.webgl-content .progress.Dark .full {background-image: url('progressFull.Dark.png');}
.webgl-content .footer {margin-top: 5px; height: 38px; line-height: 38px; font-family: Helvetica, Verdana, Arial, sans-serif; font-size: 18px;}
.webgl-content .footer .webgl-logo, .title, .fullscreen {height: 100%; display: inline-block; background: transparent center no-repeat;}
.webgl-content .footer .webgl-logo {background-image: url('webgl-logo.png'); width: 204px; float: left;}
.webgl-content .footer .title {margin-right: 10px; float: right;}
.webgl-content .footer .fullscreen {background-image: url('fullscreen.png'); width: 38px; float: right;}
\ No newline at end of file
<!DOCTYPE html>
<html lang="en-us">
<head>
<meta charset="utf-8">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Unity WebGL Player | RingMaster</title>
<link rel="shortcut icon" href="TemplateData/favicon.ico">
<link rel="stylesheet" href="TemplateData/style.css">
<script src="TemplateData/UnityProgress.js"></script>
<script src="Build/UnityLoader.js"></script>
<script>
var gameInstance = UnityLoader.instantiate("gameContainer", "Build/BuildPresentation.json", {onProgress: UnityProgress});
</script>
</head>
<body>
<div class="webgl-content">
<div id="gameContainer" style="width: 1280px; height: 720px"></div>
<div class="footer">
<div class="webgl-logo"></div>
<div class="fullscreen" onclick="gameInstance.SetFullscreen(1)"></div>
<div class="title">RingMaster</div>
</div>
</div>
</body>
</html>
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment