vdfs n idk what else

This commit is contained in:
ntr committed 2023-10-02 19:18:36 +11:00
1 parent e27f939601
commit 2e9292d4ed
15 files changed
+130 -11

No files matched your search

+4
View File
@@ -12243,6 +12243,10 @@ PrefabInstance:
propertyPath: ship
value:
objectReference: {fileID: 2015948214}
- target: {fileID: 8438506523596255020, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3}
propertyPath: audio
value:
objectReference: {fileID: 2015948217}
m_RemovedComponents: []
m_RemovedGameObjects:
- {fileID: 968610525847117003, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3}
+1 -1
View File
@@ -15,7 +15,7 @@ public enum NoticeCategory {
public class TimingNotice {
double Seconds;
NoticeCategory Category = NoticeCategory.Initial;
public NoticeCategory Category = NoticeCategory.Initial;
public static TimingNotice Compare(double seconds, double? pbSeconds = null, double? lrSeconds = null) => lrSeconds switch {
double lr when seconds < lr => new TimingNotice { Seconds = Math.Abs(lr - seconds), Category = NoticeCategory.Fastest },
+1
View File
@@ -36,6 +36,7 @@ public class PowerUnit {
static float shieldBoostAmount = 1000f;
public float Shield => shieldCurrent;
public float ShieldMax => shieldMax;
public string ShieldPct => $"{((shieldCurrent / shieldMax) * 100f):0}";
bool UsingMovementBoost => BoostActive.Any(b => b.output != Output.Shield);
+9 -1
View File
@@ -205,14 +205,22 @@ public class ShipControls : MonoBehaviour {
audio.PlayNoise();
// convert dmg to % to hide internals
float dmg = (amt / powerUnit.ShieldMax) * 100f;
timing.Message($"{dmg:0} Damage");
bool destroyed = powerUnit.ShieldReduce(amt);
if (destroyed) {
Debug.Log($"Ddddestroyed by {src}");
// play big noise!
Respawn();
}
}
public void OnTrackLimits() {
timing.Message("Track Limits");
Respawn();
}
void Deploy(Output output) {
bool deployed = powerUnit.Deploy(output);
if (deployed) audio.PlayNoise();
+2 -1
View File
@@ -10,13 +10,14 @@ public class ShipPhysics : MonoBehaviour {
void OnCollisionEnter(Collision collision) {
if (collision.gameObject.tag == "TrackLimits") {
Debug.Log("Track Limits " + collision.gameObject.name);
ship.Respawn();
ship.OnTrackLimits();
return;
}
float totalForce = collision.impulse.magnitude / Time.fixedDeltaTime;
Debug.Log($"mag {collision.relativeVelocity.magnitude}");
Debug.Log($"impulse {collision.impulse} {collision.impulse.magnitude} {totalForce}");
if (totalForce < 1f) return;
ship.Damage(totalForce, collision.gameObject.name);
}
}
+14 -1
View File
@@ -28,6 +28,7 @@ public class Timing: MonoBehaviour {
double lapStart;
IEnumerator noticeLifecycle;
IEnumerator msgLifecycle;
void Awake() {
ui = GetComponent<TimingUI>();
@@ -146,10 +147,22 @@ public class Timing: MonoBehaviour {
IEnumerator RecentLapLifecycle(Lap l) {
ui.ShowRecentLap(l);
yield return new WaitForSeconds(5);
yield return new WaitForSeconds(10);
ui.HideRecentLap();
}
public void Message(string msg) {
if (msgLifecycle != null) StopCoroutine(msgLifecycle);
msgLifecycle = ShowMessage(msg);
StartCoroutine(msgLifecycle);
}
IEnumerator ShowMessage(string msg) {
ui.ShowMessage(msg);
yield return new WaitForSeconds(5);
ui.HideMessage();
}
// these can be null after HMR
public Lap LapRecord => lapService?.LapRecord;
public Lap Pb => lapService?.Pb;
+19 -3
View File
@@ -14,6 +14,7 @@ public class TimingUI : MonoBehaviour {
VisualElement timer;
VisualElement timerSectors;
Label timerMsg;
Label timerTime;
Label timerPb;
Label timerPosition;
@@ -62,6 +63,7 @@ public class TimingUI : MonoBehaviour {
noticeTime = uiDocument.rootVisualElement.Q<Label>("noticeTime");
noticeDiff = uiDocument.rootVisualElement.Q<VisualElement>("noticeDiff");
timerMsg = uiDocument.rootVisualElement.Q<Label>("msg");
timerTime = uiDocument.rootVisualElement.Q<Label>("timerTime");
timerPb = uiDocument.rootVisualElement.Q<Label>("timerPb");
@@ -124,12 +126,17 @@ public class TimingUI : MonoBehaviour {
timer.AddToClassList("hidden");
notice.RemoveFromClassList("hidden");
TimingNotice lapNotice = timing.CompareLap(lap);
noticeTime.text = lap.ToString();
noticeDiff.Clear();
noticeDiff.Add(timing.CompareLap(lap).ToLabel());
noticeDiff.Add(lapNotice.ToLabel());
// int msgIndex = UnityEngine.Random.Range(0, completionMsgs.Length);
// noticeMsg.text = completionMsgs[msgIndex];
if (lapNotice.Category == NoticeCategory.Faster) ShowMessage("New PB!");
if (lapNotice.Category == NoticeCategory.Fastest) {
int msgIndex = UnityEngine.Random.Range(0, completionMsgs.Length);
ShowMessage(completionMsgs[msgIndex]);
}
noticeSectors.Clear();
foreach (SectorTime sector in lap.Sectors) {
@@ -140,7 +147,16 @@ public class TimingUI : MonoBehaviour {
public void HideRecentLap() {
Init();
HideMessage();
timer.RemoveFromClassList("hidden");
notice.AddToClassList("hidden");
}
public void ShowMessage(string msg) {
timerMsg.text = msg;
}
public void HideMessage() {
timerMsg.text = "";
}
}
+1
View File
@@ -8,6 +8,7 @@
"com.unity.test-framework": "1.1.33",
"com.unity.textmeshpro": "3.0.6",
"com.unity.timeline": "1.7.5",
"com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.6",
"com.unity.vectorgraphics": "2.0.0-preview.21",
"com.unity.visualeffectgraph": "14.0.8",
"com.unity.visualscripting": "1.9.0",
+26
View File
@@ -150,6 +150,22 @@
"com.unity.searcher": "4.9.2"
}
},
"com.unity.sysroot": {
"version": "2.0.7",
"depth": 1,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.sysroot.linux-x86_64": {
"version": "2.0.6",
"depth": 1,
"source": "registry",
"dependencies": {
"com.unity.sysroot": "2.0.7"
},
"url": "https://packages.unity.com"
},
"com.unity.test-framework": {
"version": "1.1.33",
"depth": 0,
@@ -192,6 +208,16 @@
},
"url": "https://packages.unity.com"
},
"com.unity.toolchain.win-x86_64-linux-x86_64": {
"version": "2.0.6",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.sysroot": "2.0.7",
"com.unity.sysroot.linux-x86_64": "2.0.6"
},
"url": "https://packages.unity.com"
},
"com.unity.ugui": {
"version": "1.0.0",
"depth": 1,
+4 -3
View File
@@ -138,8 +138,7 @@ PlayerSettings:
vulkanEnableCommandBufferRecycling: 1
loadStoreDebugModeEnabled: 0
bundleVersion: 1.0
preloadedAssets:
- {fileID: 11400000, guid: 020903acd8b50dd45a683fb9312ba7af, type: 2}
preloadedAssets: []
metroInputSource: 0
wsaTransparentSwapchain: 0
m_HolographicPauseOnTrackingLoss: 1
@@ -549,6 +548,7 @@ PlayerSettings:
switchSocketConcurrencyLimit: 14
switchScreenResolutionBehavior: 2
switchUseCPUProfiler: 0
switchEnableFileSystemTrace: 0
switchUseGOLDLinker: 0
switchLTOSetting: 0
switchApplicationID: 0x01004b9000490000
@@ -792,7 +792,8 @@ PlayerSettings:
scriptingDefineSymbols: {}
additionalCompilerArguments: {}
platformArchitecture: {}
scriptingBackend: {}
scriptingBackend:
Standalone: 1
il2cppCompilerConfiguration: {}
il2cppCodeGeneration: {}
managedStrippingLevel:
View File
File mode changed.
Regular → Executable
+1 -1
View File
@@ -12,6 +12,6 @@ VFXManager:
m_MaxDeltaTime: 0.05
m_MaxScrubTime: 30
m_CompiledVersion: 7
m_RuntimeVersion: 33
m_RuntimeVersion: 35
m_RuntimeResources: {fileID: 11400000, guid: bc10b42afe3813544bffd38ae2cd893d, type: 2}
m_BatchEmptyLifetime: 300
+24
View File
@@ -0,0 +1,24 @@
"AppBuild"
{
"AppID" "2599680" // your AppID
"Desc" "SpaceRace Linux" // internal description for this build
"ContentRoot" "C:\Users\ntr\code\SpaceRace\Build\Lnx-IL2CPP" // root content folder, relative to location of this file
"BuildOutput" "C:\Users\ntr\code\SpaceRace\Build\steam-output" // build output folder for build logs and build cache files
"Depots"
{
"2599684" // your DepotID
{
"FileMapping"
{
"LocalPath" "*" // all files from contentroot folder
"DepotPath" "." // mapped into the root of the depot
"recursive" "1" // include all subfolders
}
"FileExclusion" "SpaceRace_BurstDebugInformation_DoNotShip*" // exclude
"FileExclusion" "SpaceRace_BackUpThisFolder_ButDontShipItWithYourGame*"
}
}
}
+1
View File
@@ -18,6 +18,7 @@
}
"FileExclusion" "SpaceRace_BurstDebugInformation_DoNotShip*" // exclude
"FileExclusion" "SpaceRace_BackUpThisFolder_ButDontShipItWithYourGame*"
}
}
}
+23
View File
@@ -0,0 +1,23 @@
"AppBuild"
{
"AppID" "2599680" // your AppID
"Desc" "SpaceRace Windows" // internal description for this build
"ContentRoot" "/home/ntr/SpaceRace/Build/Win" // root content folder, relative to location of this file
"BuildOutput" "/home/ntr/SpaceRace/Build/steam-output" // build output folder for build logs and build cache files
"Depots"
{
"2599682" // your DepotID
{
"FileMapping"
{
"LocalPath" "*" // all files from contentroot folder
"DepotPath" "." // mapped into the root of the depot
"recursive" "1" // include all subfolders
}
"FileExclusion" "SpaceRace_BurstDebugInformation_DoNotShip*" // exclude
}
}
}