ntr/spacerace
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clear ui samples and fix speedo

Browse Source
This commit is contained in:
ntr committed 2023-08-08 16:27:38 +10:00
1 parent ba07b6ab49
commit bc0b39c575
6 files changed
+47 -16
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Scenes/sr_silverstorage/sr_silverstorage.unity
+15
View File
@@ -934,6 +934,10 @@ PrefabInstance:
propertyPath: timingDoc propertyPath: timingDoc
value: value:
objectReference: {fileID: 766862837} objectReference: {fileID: 766862837}
- target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3}
propertyPath: controlsUI
value:
objectReference: {fileID: 5198188376350273127}
- target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} - target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3}
propertyPath: controlsDoc propertyPath: controlsDoc
value: value:
@@ -1184,3 +1188,14 @@ MonoBehaviour:
m_Script: {fileID: 19102, guid: 0000000000000000e000000000000000, type: 0} m_Script: {fileID: 19102, guid: 0000000000000000e000000000000000, type: 0}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
--- !u!114 &5198188376350273127 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 3792430562793951787, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3}
m_PrefabInstance: {fileID: 5198188376350273124}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8401c141ee093632d847505914412cee, type: 3}
m_Name:
m_EditorClassIdentifier:
Assets/Scenes/sr_star_fraenkel_zermelo/sr_star_fraenkel_zermelo.unity
+15
View File
@@ -241,6 +241,17 @@ PrefabInstance:
m_AddedGameObjects: [] m_AddedGameObjects: []
m_AddedComponents: [] m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3}
--- !u!114 &235775466 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 3792430562793951787, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3}
m_PrefabInstance: {fileID: 235775465}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8401c141ee093632d847505914412cee, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &339815783 --- !u!1001 &339815783
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -985,6 +996,10 @@ PrefabInstance:
propertyPath: timingDoc propertyPath: timingDoc
value: value:
objectReference: {fileID: 766862837} objectReference: {fileID: 766862837}
- target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3}
propertyPath: controlsUI
value:
objectReference: {fileID: 235775466}
- target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} - target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3}
propertyPath: controlsDoc propertyPath: controlsDoc
value: value:
Assets/Src/ShipPhysics.cs
+5 -3
View File
@@ -4,18 +4,20 @@ public class ShipPhysics : MonoBehaviour {
ShipControls ship; ShipControls ship;
float maxDmg = 150f; float maxDmg = 150f;
float maxImpulse = 50f; float maxImpulse = 5000f;
void Awake() { void Awake() {
ship = GetComponent<ShipControls>(); ship = GetComponent<ShipControls>();
} }
void OnCollisionEnter(Collision collision) { void OnCollisionEnter(Collision collision) {
float totalForce = collision.impulse.magnitude / Time.fixedDeltaTime;
Debug.Log($"mag {collision.relativeVelocity.magnitude}"); Debug.Log($"mag {collision.relativeVelocity.magnitude}");
Debug.Log($"impulse {collision.impulse} {collision.impulse.magnitude}"); Debug.Log($"impulse {collision.impulse} {collision.impulse.magnitude} {totalForce}");
// if (collision.relativeVelocity.magnitude > maxDmg) { // if (collision.relativeVelocity.magnitude > maxDmg) {
if (collision.impulse.magnitude > maxImpulse) { if (totalForce > maxImpulse) {
Debug.Log("Ddddestroyed by" + collision.gameObject.name); Debug.Log("Ddddestroyed by" + collision.gameObject.name);
ship.Respawn(); ship.Respawn();
return; return;
Assets/Src/UI/Controls.uxml
+1 -1
View File
@@ -3,7 +3,7 @@
<ui:VisualElement name="VisualElement" style="-unity-font: url(&apos;project://database/Assets/UI%20Toolkit/Fonts/Jura-Medium.otf?fileID=12800000&amp;guid=65648a14640996362a6b0929c723b6e4&amp;type=3#Jura-Medium&apos;); -unity-font-definition: initial; flex-direction: row; flex-grow: 1;"> <ui:VisualElement name="VisualElement" style="-unity-font: url(&apos;project://database/Assets/UI%20Toolkit/Fonts/Jura-Medium.otf?fileID=12800000&amp;guid=65648a14640996362a6b0929c723b6e4&amp;type=3#Jura-Medium&apos;); -unity-font-definition: initial; flex-direction: row; flex-grow: 1;">
<ui:VisualElement name="left" style="flex-grow: 1; background-color: rgba(0, 0, 0, 0); justify-content: center; align-items: center;" /> <ui:VisualElement name="left" style="flex-grow: 1; background-color: rgba(0, 0, 0, 0); justify-content: center; align-items: center;" />
<ui:VisualElement name="middle" style="flex-direction: row; flex-grow: 1; justify-content: center; align-self: center; margin-top: 20%; -unity-text-align: upper-center;"> <ui:VisualElement name="middle" style="flex-direction: row; flex-grow: 1; justify-content: center; align-self: center; margin-top: 20%; -unity-text-align: upper-center;">
<ui:Label tabindex="-1" text="128&#10;" display-tooltip-when-elided="true" name="speed" style="min-width: 5%; -unity-text-align: upper-right; flex-basis: 10%;" /> <ui:Label tabindex="-1" display-tooltip-when-elided="true" name="speed" style="min-width: 5%; -unity-text-align: upper-right; flex-basis: 10%;" />
<ui:Label tabindex="-1" text="u/s" display-tooltip-when-elided="true" name="units" style="flex-basis: 10%; -unity-text-align: upper-left;" /> <ui:Label tabindex="-1" text="u/s" display-tooltip-when-elided="true" name="units" style="flex-basis: 10%; -unity-text-align: upper-left;" />
</ui:VisualElement> </ui:VisualElement>
<ui:VisualElement name="right" style="flex-grow: 1; background-color: rgba(0, 0, 0, 0); justify-content: center; align-items: center;" /> <ui:VisualElement name="right" style="flex-grow: 1; background-color: rgba(0, 0, 0, 0); justify-content: center; align-items: center;" />
Assets/Src/UI/Timing.uxml
+10 -10
View File
@@ -6,26 +6,26 @@
<ui:VisualElement name="Bottom" style="flex-grow: 0; background-color: rgba(0, 0, 0, 0.26); flex-direction: column; align-items: stretch; justify-content: flex-end; color: rgb(255, 255, 255); width: 33%; align-self: center;"> <ui:VisualElement name="Bottom" style="flex-grow: 0; background-color: rgba(0, 0, 0, 0.26); flex-direction: column; align-items: stretch; justify-content: flex-end; color: rgb(255, 255, 255); width: 33%; align-self: center;">
<ui:VisualElement name="notice" style="flex-grow: 1; background-color: rgba(0, 0, 0, 0);"> <ui:VisualElement name="notice" style="flex-grow: 1; background-color: rgba(0, 0, 0, 0);">
<ui:VisualElement name="noticeLap" style="flex-grow: 1; background-color: rgba(0, 0, 0, 0); flex-direction: row; justify-content: space-between; align-items: auto; width: auto; align-self: stretch; flex-shrink: 0;"> <ui:VisualElement name="noticeLap" style="flex-grow: 1; background-color: rgba(0, 0, 0, 0); flex-direction: row; justify-content: space-between; align-items: auto; width: auto; align-self: stretch; flex-shrink: 0;">
<ui:Label tabindex="-1" text="1:24.248" display-tooltip-when-elided="true" name="noticeTime" style="align-self: flex-end; align-items: auto;" /> <ui:Label tabindex="-1" display-tooltip-when-elided="true" name="noticeTime" style="align-self: flex-end; align-items: auto;" />
<ui:VisualElement name="noticeDiff" style="flex-grow: 1; background-color: rgba(0, 0, 0, 0); -unity-text-align: upper-right;"> <ui:VisualElement name="noticeDiff" style="flex-grow: 1; background-color: rgba(0, 0, 0, 0); -unity-text-align: upper-right;">
<ui:Label tabindex="-1" text="-0.999" display-tooltip-when-elided="true" /> <ui:Label tabindex="-1" display-tooltip-when-elided="true" />
</ui:VisualElement> </ui:VisualElement>
</ui:VisualElement> </ui:VisualElement>
<ui:VisualElement name="noticeSectors" class="sectors" style="flex-grow: 0; background-color: rgba(0, 0, 0, 0); flex-direction: row; -unity-text-align: upper-left;"> <ui:VisualElement name="noticeSectors" class="sectors" style="flex-grow: 0; background-color: rgba(0, 0, 0, 0); flex-direction: row; -unity-text-align: upper-left;">
<ui:Label tabindex="-1" text="+2.1" display-tooltip-when-elided="true" class="yellow" /> <ui:Label tabindex="-1" display-tooltip-when-elided="true" class="yellow" />
<ui:Label tabindex="-1" text="-1.9" display-tooltip-when-elided="true" class="green middle" /> <ui:Label tabindex="-1" display-tooltip-when-elided="true" class="green middle" />
<ui:Label tabindex="-1" text="-" display-tooltip-when-elided="true" class="purple" /> <ui:Label tabindex="-1" display-tooltip-when-elided="true" class="purple" />
</ui:VisualElement> </ui:VisualElement>
</ui:VisualElement> </ui:VisualElement>
<ui:VisualElement name="timer" style="flex-grow: 1; background-color: rgba(0, 0, 0, 0);"> <ui:VisualElement name="timer" style="flex-grow: 1; background-color: rgba(0, 0, 0, 0);">
<ui:VisualElement name="timerLap" style="flex-grow: 1; background-color: rgba(0, 0, 0, 0); flex-direction: row; justify-content: space-between; align-items: auto; width: auto; align-self: stretch; flex-shrink: 0;"> <ui:VisualElement name="timerLap" style="flex-grow: 1; background-color: rgba(0, 0, 0, 0); flex-direction: row; justify-content: space-between; align-items: auto; width: auto; align-self: stretch; flex-shrink: 0;">
<ui:Label tabindex="-1" text="Time" display-tooltip-when-elided="true" name="timerTime" style="align-self: flex-end; align-items: auto;" /> <ui:Label tabindex="-1" display-tooltip-when-elided="true" name="timerTime" style="align-self: flex-end; align-items: auto;" />
<ui:Label tabindex="-1" text="1:28.248" display-tooltip-when-elided="true" name="timerPb" /> <ui:Label tabindex="-1" display-tooltip-when-elided="true" name="timerPb" />
</ui:VisualElement> </ui:VisualElement>
<ui:VisualElement name="timerSectors" class="sectors" style="flex-grow: 0; background-color: rgba(0, 0, 0, 0); flex-direction: row; align-self: stretch; align-items: auto;"> <ui:VisualElement name="timerSectors" class="sectors" style="flex-grow: 0; background-color: rgba(0, 0, 0, 0); flex-direction: row; align-self: stretch; align-items: auto;">
<ui:Label tabindex="-1" text="32.0" display-tooltip-when-elided="true" class="yellow" /> <ui:Label tabindex="-1" display-tooltip-when-elided="true" class="yellow" />
<ui:Label tabindex="-1" text="64.0" display-tooltip-when-elided="true" class="green" /> <ui:Label tabindex="-1" display-tooltip-when-elided="true" class="green" />
<ui:Label tabindex="-1" text="1:28.8" display-tooltip-when-elided="true" class="purple" /> <ui:Label tabindex="-1" display-tooltip-when-elided="true" class="purple" />
</ui:VisualElement> </ui:VisualElement>
</ui:VisualElement> </ui:VisualElement>
</ui:VisualElement> </ui:VisualElement>
ProjectSettings/ProjectSettings.asset
+1 -2
View File
@@ -134,8 +134,7 @@ PlayerSettings:
vulkanEnableCommandBufferRecycling: 1 vulkanEnableCommandBufferRecycling: 1
loadStoreDebugModeEnabled: 0 loadStoreDebugModeEnabled: 0
bundleVersion: 0.1 bundleVersion: 0.1
preloadedAssets: preloadedAssets: []
- {fileID: 11400000, guid: 020903acd8b50dd45a683fb9312ba7af, type: 2}
metroInputSource: 0 metroInputSource: 0
wsaTransparentSwapchain: 0 wsaTransparentSwapchain: 0
m_HolographicPauseOnTrackingLoss: 1 m_HolographicPauseOnTrackingLoss: 1