Last version

dolovnyak · Jun 16, 2019 · 270341d · 270341d
1 parent e4adfd3
commit 270341d
Show file tree

Hide file tree

Showing 37 changed files with 115 additions and 105 deletions.
diff --git a/.idea/.idea.mcs-hack/.idea/workspace.xml b/.idea/.idea.mcs-hack/.idea/workspace.xml
diff --git 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
@@ -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
@@ -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
@@ -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
diff --git a/Library/PlayerDataCache/iOS/Data/Managed/Assembly-CSharp.dll b/Library/PlayerDataCache/iOS/Data/Managed/Assembly-CSharp.dll
diff --git a/Library/PlayerDataCache/iOS/Data/Managed/Unity.Analytics.DataPrivacy.dll b/Library/PlayerDataCache/iOS/Data/Managed/Unity.Analytics.DataPrivacy.dll
diff --git a/Library/PlayerDataCache/iOS/Data/Managed/Unity.TextMeshPro.dll b/Library/PlayerDataCache/iOS/Data/Managed/Unity.TextMeshPro.dll
diff --git a/Library/PlayerDataCache/iOS/Data/Managed/Unity.Timeline.dll b/Library/PlayerDataCache/iOS/Data/Managed/Unity.Timeline.dll
diff --git a/Library/PlayerDataCache/iOS/Data/Managed/UnityEngine.SpatialTracking.dll b/Library/PlayerDataCache/iOS/Data/Managed/UnityEngine.SpatialTracking.dll
diff --git a/Library/PlayerDataCache/iOS/Data/Managed/UnityEngine.XR.LegacyInputHelpers.dll b/Library/PlayerDataCache/iOS/Data/Managed/UnityEngine.XR.LegacyInputHelpers.dll
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
diff --git a/Library/PlayerDataCache/iOS/Data/globalgamemanagers b/Library/PlayerDataCache/iOS/Data/globalgamemanagers
diff --git a/Library/PlayerDataCache/iOS/Data/level0 b/Library/PlayerDataCache/iOS/Data/level0
diff --git a/Library/PlayerDataCache/iOS/Data/sharedassets0.assets b/Library/PlayerDataCache/iOS/Data/sharedassets0.assets
diff --git a/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll b/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
diff --git a/Library/ScriptAssemblies/Assembly-CSharp.dll b/Library/ScriptAssemblies/Assembly-CSharp.dll
diff --git a/Library/ScriptAssemblies/Assembly-CSharp.pdb b/Library/ScriptAssemblies/Assembly-CSharp.pdb
diff --git a/Library/ScriptAssemblies/Unity.Analytics.DataPrivacy.dll b/Library/ScriptAssemblies/Unity.Analytics.DataPrivacy.dll
diff --git a/Library/ScriptAssemblies/Unity.CollabProxy.Editor.dll b/Library/ScriptAssemblies/Unity.CollabProxy.Editor.dll
diff --git a/Library/ScriptAssemblies/Unity.PackageManagerUI.Editor.dll b/Library/ScriptAssemblies/Unity.PackageManagerUI.Editor.dll
diff --git a/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll b/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll
diff --git a/Library/ScriptAssemblies/Unity.TextMeshPro.dll b/Library/ScriptAssemblies/Unity.TextMeshPro.dll
diff --git a/Library/ScriptAssemblies/Unity.Timeline.Editor.dll b/Library/ScriptAssemblies/Unity.Timeline.Editor.dll
diff --git a/Library/ScriptAssemblies/Unity.Timeline.dll b/Library/ScriptAssemblies/Unity.Timeline.dll
diff --git a/Library/ScriptAssemblies/UnityEditor.SpatialTracking.dll b/Library/ScriptAssemblies/UnityEditor.SpatialTracking.dll
diff --git a/Library/ScriptAssemblies/UnityEditor.XR.LegacyInputHelpers.dll b/Library/ScriptAssemblies/UnityEditor.XR.LegacyInputHelpers.dll
diff --git a/Library/ScriptAssemblies/UnityEngine.SpatialTracking.dll b/Library/ScriptAssemblies/UnityEngine.SpatialTracking.dll
diff --git a/Library/ScriptAssemblies/UnityEngine.XR.LegacyInputHelpers.dll b/Library/ScriptAssemblies/UnityEngine.XR.LegacyInputHelpers.dll
diff --git a/Library/ScriptAssemblies/com.unity.multiplayer-hlapi.Editor.dll b/Library/ScriptAssemblies/com.unity.multiplayer-hlapi.Editor.dll
diff --git a/Library/ScriptAssemblies/com.unity.multiplayer-hlapi.Runtime.dll b/Library/ScriptAssemblies/com.unity.multiplayer-hlapi.Runtime.dll
diff --git a/Library/ScriptAssemblies/com.unity.multiplayer-weaver.Editor.dll b/Library/ScriptAssemblies/com.unity.multiplayer-weaver.Editor.dll
diff --git 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}
+{"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}
diff --git 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}
+{"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}
diff --git a/Library/assetDatabase3 b/Library/assetDatabase3
diff --git a/Library/metadata/20/20c6dbf0102c7bc468113ccdd97dad83 b/Library/metadata/20/20c6dbf0102c7bc468113ccdd97dad83
Original file line number	Diff line number	Diff line change
		@@ -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}
		{"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}
Original file line number	Diff line number	Diff line change
		@@ -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}
		{"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}