diff --git a/.idea/.idea.mcs-hack/.idea/workspace.xml b/.idea/.idea.mcs-hack/.idea/workspace.xml index 68a9f0b2..ec25c5ed 100644 --- a/.idea/.idea.mcs-hack/.idea/workspace.xml +++ b/.idea/.idea.mcs-hack/.idea/workspace.xml @@ -2,23 +2,12 @@ - - - - - - + - - - - - - @@ -26,15 +15,9 @@ - - - - - - @@ -55,11 +38,7 @@ - - - - - + - @@ -570,25 +571,6 @@ - - - - - - - - - - - - - - - - - - - @@ -680,19 +662,6 @@ - - - - - - - - - - - - - @@ -717,25 +686,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/Assets/Frolov/Main.unity b/Assets/Frolov/Main.unity index 784310d2..2d3836cc 100644 --- a/Assets/Frolov/Main.unity +++ b/Assets/Frolov/Main.unity @@ -3748,7 +3748,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_text: Famaly + m_text: Family m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 84dd14695854bbc43a5faa24fcf93d0d, type: 2} m_sharedMaterial: {fileID: 21261991626553910, guid: 84dd14695854bbc43a5faa24fcf93d0d, @@ -4070,7 +4070,7 @@ MonoBehaviour: m_EditorClassIdentifier: proggresBar: {fileID: 482714852} barAnimatior: {fileID: 482714850} - transitionAfter: 50 + transitionAfter: 100 --- !u!222 &482714855 CanvasRenderer: m_ObjectHideFlags: 0 @@ -6962,7 +6962,7 @@ MonoBehaviour: m_EditorClassIdentifier: proggresBar: {fileID: 879818669} barAnimatior: {fileID: 879818670} - transitionAfter: 50 + transitionAfter: 100 --- !u!222 &879818672 CanvasRenderer: m_ObjectHideFlags: 0 @@ -10805,7 +10805,7 @@ MonoBehaviour: m_EditorClassIdentifier: proggresBar: {fileID: 1481277047} barAnimatior: {fileID: 1481277048} - transitionAfter: 50 + transitionAfter: 100 --- !u!222 &1481277050 CanvasRenderer: m_ObjectHideFlags: 0 @@ -12767,7 +12767,7 @@ MonoBehaviour: m_EditorClassIdentifier: proggresBar: {fileID: 1733521838} barAnimatior: {fileID: 1733521839} - transitionAfter: 50 + transitionAfter: 100 --- !u!222 &1733521841 CanvasRenderer: m_ObjectHideFlags: 0 @@ -13819,7 +13819,7 @@ MonoBehaviour: m_EditorClassIdentifier: proggresBar: {fileID: 1871751794} barAnimatior: {fileID: 1871751796} - transitionAfter: 50 + transitionAfter: 100 --- !u!95 &1871751796 Animator: serializedVersion: 3 @@ -15696,7 +15696,7 @@ MonoBehaviour: m_EditorClassIdentifier: proggresBar: {fileID: 2030439631} barAnimatior: {fileID: 2030439632} - transitionAfter: 50 + transitionAfter: 100 --- !u!222 &2030439634 CanvasRenderer: m_ObjectHideFlags: 0 @@ -16993,7 +16993,7 @@ MonoBehaviour: m_EditorClassIdentifier: proggresBar: {fileID: 7955025509959168944} barAnimatior: {fileID: 6613932608667027235} - transitionAfter: 50 + transitionAfter: 100 --- !u!114 &3614796034276135469 MonoBehaviour: m_ObjectHideFlags: 0 @@ -17008,7 +17008,7 @@ MonoBehaviour: m_EditorClassIdentifier: proggresBar: {fileID: 7955025509738118438} barAnimatior: {fileID: 6613932607806474677} - transitionAfter: 50 + transitionAfter: 100 --- !u!114 &3975794642621939949 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Modern UI Pack/Scripts/ProgressBar.cs b/Assets/Modern UI Pack/Scripts/ProgressBar.cs index 84533ee3..0d823905 100644 --- a/Assets/Modern UI Pack/Scripts/ProgressBar.cs +++ b/Assets/Modern UI Pack/Scripts/ProgressBar.cs @@ -47,7 +47,6 @@ void Update() if (currentPercent == 100 || currentPercent >= 100 && restart == true) { currentPercent = 0; - speed = 0; onLoaded.Invoke(); } diff --git a/Assets/SALEY/SALEY/Scripts/ImageSender/ImageGetter.cs b/Assets/SALEY/SALEY/Scripts/ImageSender/ImageGetter.cs index 37a8e8ee..875883a2 100755 --- a/Assets/SALEY/SALEY/Scripts/ImageSender/ImageGetter.cs +++ b/Assets/SALEY/SALEY/Scripts/ImageSender/ImageGetter.cs @@ -16,6 +16,8 @@ public class ImageGetter : MonoBehaviour public GameObject mainPage; public GameObject logPage; + private bool isFirst = true; + // private void Update() // { // if (Input.GetKeyDown(KeyCode.Space)) @@ -29,6 +31,13 @@ private void OnPostRender() FillTexture(); byte[] image = GetPNG(); StartCoroutine(UploadPNG(image)); + if (isFirst) + { + isFirst = false; + FillTexture(); + image = GetPNG(); + StartCoroutine(UploadPNG(image)); + } grab = false; } diff --git a/Assets/SALEY/SALEY/TMP_renderTexture.renderTexture b/Assets/SALEY/SALEY/TMP_renderTexture.renderTexture index 2b305603..fb3e5baa 100644 --- a/Assets/SALEY/SALEY/TMP_renderTexture.renderTexture +++ b/Assets/SALEY/SALEY/TMP_renderTexture.renderTexture @@ -14,7 +14,7 @@ RenderTexture: m_DownscaleFallback: 0 serializedVersion: 3 m_Width: 512 - m_Height: 910 + m_Height: 1108 m_AntiAliasing: 1 m_DepthFormat: 2 m_ColorFormat: 8 diff --git a/Library/LastBuild.buildreport b/Library/LastBuild.buildreport index d3688617..f6ec0921 100644 Binary files a/Library/LastBuild.buildreport and b/Library/LastBuild.buildreport differ diff --git a/Library/PlayerDataCache/iOS/Data/Managed/Assembly-CSharp.dll b/Library/PlayerDataCache/iOS/Data/Managed/Assembly-CSharp.dll index 637854c4..08f15715 100644 Binary files a/Library/PlayerDataCache/iOS/Data/Managed/Assembly-CSharp.dll and b/Library/PlayerDataCache/iOS/Data/Managed/Assembly-CSharp.dll differ diff --git a/Library/PlayerDataCache/iOS/Data/Managed/Unity.Analytics.DataPrivacy.dll b/Library/PlayerDataCache/iOS/Data/Managed/Unity.Analytics.DataPrivacy.dll index d66c47a7..da34eea3 100644 Binary files a/Library/PlayerDataCache/iOS/Data/Managed/Unity.Analytics.DataPrivacy.dll and b/Library/PlayerDataCache/iOS/Data/Managed/Unity.Analytics.DataPrivacy.dll differ diff --git a/Library/PlayerDataCache/iOS/Data/Managed/Unity.TextMeshPro.dll b/Library/PlayerDataCache/iOS/Data/Managed/Unity.TextMeshPro.dll index 4f397bd4..4a971a6e 100644 Binary files a/Library/PlayerDataCache/iOS/Data/Managed/Unity.TextMeshPro.dll and b/Library/PlayerDataCache/iOS/Data/Managed/Unity.TextMeshPro.dll differ diff --git a/Library/PlayerDataCache/iOS/Data/Managed/Unity.Timeline.dll b/Library/PlayerDataCache/iOS/Data/Managed/Unity.Timeline.dll index f7e4add7..c6df06b9 100644 Binary files a/Library/PlayerDataCache/iOS/Data/Managed/Unity.Timeline.dll and b/Library/PlayerDataCache/iOS/Data/Managed/Unity.Timeline.dll differ diff --git a/Library/PlayerDataCache/iOS/Data/Managed/UnityEngine.SpatialTracking.dll b/Library/PlayerDataCache/iOS/Data/Managed/UnityEngine.SpatialTracking.dll index 9fac8bd8..d07dc39e 100644 Binary files a/Library/PlayerDataCache/iOS/Data/Managed/UnityEngine.SpatialTracking.dll and b/Library/PlayerDataCache/iOS/Data/Managed/UnityEngine.SpatialTracking.dll differ diff --git a/Library/PlayerDataCache/iOS/Data/Managed/UnityEngine.XR.LegacyInputHelpers.dll b/Library/PlayerDataCache/iOS/Data/Managed/UnityEngine.XR.LegacyInputHelpers.dll index 19a6e87b..9dbd7070 100644 Binary files a/Library/PlayerDataCache/iOS/Data/Managed/UnityEngine.XR.LegacyInputHelpers.dll and b/Library/PlayerDataCache/iOS/Data/Managed/UnityEngine.XR.LegacyInputHelpers.dll differ diff --git a/Library/PlayerDataCache/iOS/Data/Managed/com.unity.multiplayer-hlapi.Runtime.dll b/Library/PlayerDataCache/iOS/Data/Managed/com.unity.multiplayer-hlapi.Runtime.dll index df87e456..02ba6ffc 100644 Binary files a/Library/PlayerDataCache/iOS/Data/Managed/com.unity.multiplayer-hlapi.Runtime.dll and b/Library/PlayerDataCache/iOS/Data/Managed/com.unity.multiplayer-hlapi.Runtime.dll differ diff --git a/Library/PlayerDataCache/iOS/Data/globalgamemanagers b/Library/PlayerDataCache/iOS/Data/globalgamemanagers index d9c2ee68..b5d869d6 100644 Binary files a/Library/PlayerDataCache/iOS/Data/globalgamemanagers and b/Library/PlayerDataCache/iOS/Data/globalgamemanagers differ diff --git a/Library/PlayerDataCache/iOS/Data/level0 b/Library/PlayerDataCache/iOS/Data/level0 index 43fe984d..c7b032c3 100644 Binary files a/Library/PlayerDataCache/iOS/Data/level0 and b/Library/PlayerDataCache/iOS/Data/level0 differ diff --git a/Library/PlayerDataCache/iOS/Data/sharedassets0.assets b/Library/PlayerDataCache/iOS/Data/sharedassets0.assets index 2ec4d876..6de6d704 100644 Binary files a/Library/PlayerDataCache/iOS/Data/sharedassets0.assets and b/Library/PlayerDataCache/iOS/Data/sharedassets0.assets differ diff --git a/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll b/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll index fb7c1adb..b0fd3bcb 100644 Binary files a/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll and b/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll differ diff --git a/Library/ScriptAssemblies/Assembly-CSharp.dll b/Library/ScriptAssemblies/Assembly-CSharp.dll index 5485fb8a..6932abfe 100644 Binary files a/Library/ScriptAssemblies/Assembly-CSharp.dll and b/Library/ScriptAssemblies/Assembly-CSharp.dll differ diff --git a/Library/ScriptAssemblies/Assembly-CSharp.pdb b/Library/ScriptAssemblies/Assembly-CSharp.pdb index c7dd1643..c8929865 100644 Binary files a/Library/ScriptAssemblies/Assembly-CSharp.pdb and b/Library/ScriptAssemblies/Assembly-CSharp.pdb differ diff --git a/Library/ScriptAssemblies/Unity.Analytics.DataPrivacy.dll b/Library/ScriptAssemblies/Unity.Analytics.DataPrivacy.dll index 7ad54e8f..14d70c46 100644 Binary files a/Library/ScriptAssemblies/Unity.Analytics.DataPrivacy.dll and b/Library/ScriptAssemblies/Unity.Analytics.DataPrivacy.dll differ diff --git a/Library/ScriptAssemblies/Unity.CollabProxy.Editor.dll b/Library/ScriptAssemblies/Unity.CollabProxy.Editor.dll index 2e690d35..7f82ae4e 100644 Binary files a/Library/ScriptAssemblies/Unity.CollabProxy.Editor.dll and b/Library/ScriptAssemblies/Unity.CollabProxy.Editor.dll differ diff --git a/Library/ScriptAssemblies/Unity.PackageManagerUI.Editor.dll b/Library/ScriptAssemblies/Unity.PackageManagerUI.Editor.dll index 1b1f9b02..370d5e14 100644 Binary files a/Library/ScriptAssemblies/Unity.PackageManagerUI.Editor.dll and b/Library/ScriptAssemblies/Unity.PackageManagerUI.Editor.dll differ diff --git a/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll b/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll index e267e219..1d686f15 100644 Binary files a/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll and b/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll differ diff --git a/Library/ScriptAssemblies/Unity.TextMeshPro.dll b/Library/ScriptAssemblies/Unity.TextMeshPro.dll index 7cc40585..f903b1df 100644 Binary files a/Library/ScriptAssemblies/Unity.TextMeshPro.dll and b/Library/ScriptAssemblies/Unity.TextMeshPro.dll differ diff --git a/Library/ScriptAssemblies/Unity.Timeline.Editor.dll b/Library/ScriptAssemblies/Unity.Timeline.Editor.dll index 1483c3d4..c404ed09 100644 Binary files a/Library/ScriptAssemblies/Unity.Timeline.Editor.dll and b/Library/ScriptAssemblies/Unity.Timeline.Editor.dll differ diff --git a/Library/ScriptAssemblies/Unity.Timeline.dll b/Library/ScriptAssemblies/Unity.Timeline.dll index 7826b0e3..0f1fd787 100644 Binary files a/Library/ScriptAssemblies/Unity.Timeline.dll and b/Library/ScriptAssemblies/Unity.Timeline.dll differ diff --git a/Library/ScriptAssemblies/UnityEditor.SpatialTracking.dll b/Library/ScriptAssemblies/UnityEditor.SpatialTracking.dll index c1f9348e..9ac7c399 100644 Binary files a/Library/ScriptAssemblies/UnityEditor.SpatialTracking.dll and b/Library/ScriptAssemblies/UnityEditor.SpatialTracking.dll differ diff --git a/Library/ScriptAssemblies/UnityEditor.XR.LegacyInputHelpers.dll b/Library/ScriptAssemblies/UnityEditor.XR.LegacyInputHelpers.dll index 1ded718c..55dbd2ca 100644 Binary files a/Library/ScriptAssemblies/UnityEditor.XR.LegacyInputHelpers.dll and b/Library/ScriptAssemblies/UnityEditor.XR.LegacyInputHelpers.dll differ diff --git a/Library/ScriptAssemblies/UnityEngine.SpatialTracking.dll b/Library/ScriptAssemblies/UnityEngine.SpatialTracking.dll index 471a3fe7..95816f2a 100644 Binary files a/Library/ScriptAssemblies/UnityEngine.SpatialTracking.dll and b/Library/ScriptAssemblies/UnityEngine.SpatialTracking.dll differ diff --git a/Library/ScriptAssemblies/UnityEngine.XR.LegacyInputHelpers.dll b/Library/ScriptAssemblies/UnityEngine.XR.LegacyInputHelpers.dll index 89991de6..5fbb0d69 100644 Binary files a/Library/ScriptAssemblies/UnityEngine.XR.LegacyInputHelpers.dll and b/Library/ScriptAssemblies/UnityEngine.XR.LegacyInputHelpers.dll differ diff --git a/Library/ScriptAssemblies/com.unity.multiplayer-hlapi.Editor.dll b/Library/ScriptAssemblies/com.unity.multiplayer-hlapi.Editor.dll index b646dac3..be6563d8 100644 Binary files a/Library/ScriptAssemblies/com.unity.multiplayer-hlapi.Editor.dll and b/Library/ScriptAssemblies/com.unity.multiplayer-hlapi.Editor.dll differ diff --git a/Library/ScriptAssemblies/com.unity.multiplayer-hlapi.Runtime.dll b/Library/ScriptAssemblies/com.unity.multiplayer-hlapi.Runtime.dll index 78c9176f..ea0d9ab9 100644 Binary files a/Library/ScriptAssemblies/com.unity.multiplayer-hlapi.Runtime.dll and b/Library/ScriptAssemblies/com.unity.multiplayer-hlapi.Runtime.dll differ diff --git a/Library/ScriptAssemblies/com.unity.multiplayer-weaver.Editor.dll b/Library/ScriptAssemblies/com.unity.multiplayer-weaver.Editor.dll index 76e33650..14fdb9ce 100644 Binary files a/Library/ScriptAssemblies/com.unity.multiplayer-weaver.Editor.dll and b/Library/ScriptAssemblies/com.unity.multiplayer-weaver.Editor.dll differ diff --git a/Library/StateCache/Hierarchy/b4d921-mainStage.json b/Library/StateCache/Hierarchy/b4d921-mainStage.json index 67da9793..5ef9324b 100644 --- a/Library/StateCache/Hierarchy/b4d921-mainStage.json +++ b/Library/StateCache/Hierarchy/b4d921-mainStage.json @@ -1 +1 @@ -{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[-27540,-27484,-27468,-27306,-27250,-26774,-25356,-25304,-24828,-24336,-24280,-23804,-19814,-19632,-17820,-17810,-17550,-17278,-16622,-16606,-16574,-16132,-5234,-1596,-1140,15496,15508,15568,15622,15672,15972,16062,16112,16414,16438,16464,16492,16538,16582,16658,16712,16744,16756,16804,16814,16928,16952,16960,16966,16972,34070,34094,34492,34568,34706,35226,35458,35980,63436,63594,64130,64380,68848,68914,68954,69148,69522,69684,70304,89140],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":90452} \ No newline at end of file +{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[-29404,-29352,-28876,-27540,-27484,-27468,-27306,-27250,-26774,-25356,-25304,-24828,-24336,-24280,-23804,-19814,-19632,-17820,-17810,-17550,-17278,-16622,-16606,-16574,-16132,-5234,-1596,-1140,15496,15508,15568,15622,15672,15972,16062,16112,16414,16438,16464,16492,16538,16582,16658,16712,16744,16756,16804,16814,16928,16952,16960,16966,16972,34070,34094,34492,34568,34706,35226,35458,35980,63436,63594,64130,64380,68848,68914,68954,69148,69522,69684,70304,88982,89140,89244,89314,89528,89668,89910,89914,90068,90280,90574,90618],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0} \ No newline at end of file diff --git a/Library/StateCache/SceneView/f1e9c4-mainStage.json b/Library/StateCache/SceneView/f1e9c4-mainStage.json index b0feb87a..4805e006 100644 --- a/Library/StateCache/SceneView/f1e9c4-mainStage.json +++ b/Library/StateCache/SceneView/f1e9c4-mainStage.json @@ -1 +1 @@ -{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":false,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":true,"pivot":{"x":846.4153442382813,"y":2221.94677734375,"z":-25090.056640625},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":391.3769226074219,"orthographic":true} \ No newline at end of file +{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":false,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":true,"pivot":{"x":1334.8543701171875,"y":1313.10888671875,"z":-25531.13671875},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":2589.709228515625,"orthographic":true} \ No newline at end of file diff --git a/Library/assetDatabase3 b/Library/assetDatabase3 index 488362ed..0b1403be 100644 Binary files a/Library/assetDatabase3 and b/Library/assetDatabase3 differ diff --git a/Library/metadata/20/20c6dbf0102c7bc468113ccdd97dad83 b/Library/metadata/20/20c6dbf0102c7bc468113ccdd97dad83 index fefed0d6..c1b72905 100644 Binary files a/Library/metadata/20/20c6dbf0102c7bc468113ccdd97dad83 and b/Library/metadata/20/20c6dbf0102c7bc468113ccdd97dad83 differ