Skip to content

Commit

Permalink
Update Viva banner and bundle version
Browse files Browse the repository at this point in the history
Fix calibrate hands not stopping
  • Loading branch information
SolidStonee committed Aug 3, 2022
1 parent 15ef2ce commit d956284
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 23 deletions.
14 changes: 1 addition & 13 deletions Assets/Resources/Models/player/pauseMenuBook.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &3048337214233128422
RectTransform:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -10599,18 +10599,6 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 6875727050392151967}
m_TargetAssemblyTypeName:
m_MethodName: clickRoot
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument: clickCloseMenu
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 6875727050392151967}
m_TargetAssemblyTypeName: viva.PauseMenu, Assembly-CSharp
m_MethodName: clickCalibrateHands
Expand Down
5 changes: 3 additions & 2 deletions Assets/Scripts/PauseMenu.cs
Original file line number Diff line number Diff line change
Expand Up @@ -636,14 +636,15 @@ public void clickTogglePressToTurn()
}

public void clickCalibrateHands()
{
SetPauseMenu(Menu.CALIBRATE_HANDS);
{
if (calibrationCoroutine != null)
{
SetPauseMenu(Menu.ROOT);
StopCalibration();
}
else
{
SetPauseMenu(Menu.CALIBRATE_HANDS);
StartCalibration();
}

Expand Down
4 changes: 2 additions & 2 deletions Assets/Textures/banner.psd
Git LFS file not shown
9 changes: 3 additions & 6 deletions ProjectSettings/ProjectSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ PlayerSettings:
useOnDemandResources: 0
accelerometerFrequency: 60
companyName: OpenViva
productName: VivaProject
productName: ' Viva Project'
defaultCursor: {fileID: 0}
cursorHotspot: {x: 0, y: 0}
m_SplashScreenBackgroundColor: {r: 0.27044028, g: 0, b: 0.3773585, a: 1}
Expand Down Expand Up @@ -142,14 +142,11 @@ PlayerSettings:
16:10: 1
16:9: 1
Others: 1
bundleVersion: 0.2.0
bundleVersion: 0.2.1
preloadedAssets:
- {fileID: 11400000, guid: 8b0be70a9ccfd19469b5e80d3aa62282, type: 2}
- {fileID: 0}
- {fileID: 11400000, guid: 1241fa79cb1539b49b2e291e216b5ef2, type: 2}
- {fileID: 3432870880609460142, guid: 08dd485950628844c81f08f1489466f3, type: 2}
- {fileID: 11400000, guid: 80309c9f4f4a3914f9c1a70c66e5ccef, type: 2}
- {fileID: 9130097496388808908, guid: b0cb10e782039904495e2f27de552d0e, type: 2}
metroInputSource: 0
wsaTransparentSwapchain: 0
m_HolographicPauseOnTrackingLoss: 1
Expand All @@ -168,7 +165,7 @@ PlayerSettings:
androidSupportedAspectRatio: 1
androidMaxAspectRatio: 2.1
applicationIdentifier:
Standalone: com.OpenViva.VivaProject
Standalone: com.OpenViva.-Viva-Project
buildNumber:
Standalone: 0
iPhone: 0
Expand Down

0 comments on commit d956284

Please sign in to comment.