diff --git a/Assets/Scripts/OscHandler.cs b/Assets/Scripts/OscHandler.cs index 04193de..3fbdb6d 100644 --- a/Assets/Scripts/OscHandler.cs +++ b/Assets/Scripts/OscHandler.cs @@ -101,16 +101,16 @@ public class OscHandler : MonoBehaviour { elapsed += Time.deltaTime; - // if (duration - elapsed > _lastDurationToShow) - // { - // mask.fillAmount = 0; - // mask.gameObject.SetActive(false); - // } - // else - // { + if (duration - elapsed > _lastDurationToShow) + { + mask.fillAmount = 0; + mask.gameObject.SetActive(false); + } + else + { mask.gameObject.SetActive(true); - mask.fillAmount = Mathf.Lerp(0f, 1f, (duration - elapsed) / duration); - // } + mask.fillAmount = Mathf.Lerp(0f, 1f, (duration - elapsed) / _lastDurationToShow); + } yield return null; } @@ -229,7 +229,7 @@ public class OscHandler : MonoBehaviour else { hintforInput.alpha = 1.0f; - + if (hint.alpha < 1f) { if (coroutine_hint != null) StopCoroutine(coroutine_hint); diff --git a/Assets/Scripts/UploadToGoogleDrive.cs b/Assets/Scripts/UploadToGoogleDrive.cs index 3e40181..5efbef3 100644 --- a/Assets/Scripts/UploadToGoogleDrive.cs +++ b/Assets/Scripts/UploadToGoogleDrive.cs @@ -73,10 +73,12 @@ public class UploadToGoogleDrive : MonoBehaviour string uploadDest = parmas[0].Trim(); string id = parmas[1].Trim(); + + string id_to_print=id; var id_paths = id.Split('/'); if (id_paths.Length > 0) { - id = id_paths[id_paths.Length - 1]; + id_to_print = id_paths[id_paths.Length - 1]; } string summary = parmas[2].Trim(); @@ -112,7 +114,7 @@ public class UploadToGoogleDrive : MonoBehaviour } - TextNumber.SetText(id); + TextNumber.SetText(id_to_print); TextSummary.SetText(summary); TextNumber.ForceMeshUpdate(); @@ -259,9 +261,11 @@ public class UploadToGoogleDrive : MonoBehaviour string path = _fileId; int lastSlash = path.LastIndexOf('/'); + Debug.Log("Extracted path: " + path + ", lastSlash=" + lastSlash); if (lastSlash >= 0) { - path = path[..lastSlash]; + // path = path[..lastSlash]; + path=path.Substring(0, lastSlash); } Debug.Log("Uploading file to Google Drive: " + _uploadFile + " folder=" + path); diff --git a/Material/token.json/Google.Apis.Auth.OAuth2.Responses.TokenResponse-user b/Material/token.json/Google.Apis.Auth.OAuth2.Responses.TokenResponse-user index eafffe1..0268a6c 100644 --- a/Material/token.json/Google.Apis.Auth.OAuth2.Responses.TokenResponse-user +++ b/Material/token.json/Google.Apis.Auth.OAuth2.Responses.TokenResponse-user @@ -1 +1 @@ -{"access_token":"ya29.a0AQQ_BDSyYFR0Qe3zu1bn_0aweFMg37CihdVqetg4dHS_mhsSLUi0KM_vw-HcWX_SCFVlAJ3CBgxmnC1UkTosfa1DmluENigUaoMjzNQyxpnLpSf25YlupYeFnD8K5pkKAf39XOPUi7vpH6FHQwaghZ6524L9C_tl0P1quhICwLg2EZvkqhWkxock-4cA3sk0MliQvHFyqQaCgYKAYgSARESFQHGX2MiixJdxEGNEJVOwUJp5BE2dw0209","token_type":"Bearer","expires_in":3599,"refresh_token":"1//0e-urCtqMVSK6CgYIARAAGA4SNwF-L9IrTWfNUsKFuBn8-mJmQxbXhkBlRW8776bD9xuFk1rFTaMH0dA9yRyESXHTchyXJDAJgkU","scope":"https://www.googleapis.com/auth/drive","Issued":"2025-10-13T15:10:42.617+08:00","IssuedUtc":"2025-10-13T07:10:42.617Z"} \ No newline at end of file +{"access_token":"ya29.a0AQQ_BDRa1-YdH5UOLzdnogSvoDpb21VbxqME1y0PXD_NCp0zT7JgiERrnXQ-jaQeOktYFBqbtbFUywS5enA4MCKDVulXWu3DzMyRocVdqr9AoFmSTuQo5Yd7BccMN5ifodZ3ZDbuXHugaSLVdUqPQNqVwrYQXjbyZzZSAMDQ6PbQiy9hb_jznTSKCDhv8cyUQcTuqyQ0AwaCgYKAe8SARESFQHGX2MiGawhGvPFDAY5kaIjelR2DQ0209","token_type":"Bearer","expires_in":3599,"refresh_token":"1//0e-urCtqMVSK6CgYIARAAGA4SNwF-L9IrTWfNUsKFuBn8-mJmQxbXhkBlRW8776bD9xuFk1rFTaMH0dA9yRyESXHTchyXJDAJgkU","scope":"https://www.googleapis.com/auth/drive","Issued":"2025-10-14T18:01:49.905+08:00","IssuedUtc":"2025-10-14T10:01:49.905Z"} \ No newline at end of file