Skip to content
Snippets Groups Projects
Commit 9878a5f1 authored by Guillaume Meinesz's avatar Guillaume Meinesz
Browse files

Fix pour permettre Maj plugin HM 1.6.4 + update unity V 2022.3.16f1

la scene Main de evalulu avait le même guid qu'une scene du plugin.
parent 7b432a56
No related branches found
No related tags found
No related merge requests found
Showing
with 5258 additions and 13718 deletions
......@@ -109,6 +109,7 @@ public class NewSystemeDeTraces : MonoBehaviour
public static string returnUserIDFLuence_or_UserIDHM()
{
string UserIdToUse = "Evalulu_missin_gmode_Plugin_HM_cant_fetchUserID";
if (SplashScreenScript.mode_Plugin_HM && HM_DataController.currentChildUser != null)
{
UserIdToUse = "Evalulu_currentTeacherAccount_" + HM_DataController.currentTeacherAccount.teacherCode.ToString() + "_HM_userID_" + HM_DataController.currentChildUser.userID.ToString() + "_HM_loginCode_" + HM_DataController.currentChildUser.loginCode;
......@@ -297,6 +298,7 @@ public class NewSystemeDeTraces : MonoBehaviour
{
NewSystemeDeTracesJSONRoot tracesJson = new NewSystemeDeTracesJSONRoot();
tracesJson.fluenceId = returnUserIDFLuence_or_UserIDHM();
if (HM_DataController.currentTeacherAccount != null)
{
tracesJson.teacherCode = HM_DataController.currentTeacherAccount.teacherCode.ToString();
......@@ -484,6 +486,7 @@ public class NewSystemeDeTraces : MonoBehaviour
{
try
{
HM_PluginController.UploadTrace(currentTemporaryFilePath, transfertAsynchroneFinished);
}
catch (Exception ex)
......
......@@ -227,6 +227,11 @@
Used to dispatch commands that need to be captured externally, usually by Modules
</summary>
</member>
<member name="T:DG.Tweening.Core.DOTweenUtils">
<summary>
Various utils
</summary>
</member>
<member name="M:DG.Tweening.Core.DOTweenUtils.Vector3FromAngle(System.Single,System.Single)">
<summary>
Returns a Vector3 with z = 0
......@@ -1000,7 +1005,7 @@
<summary>
Tweens a virtual float.
You can add regular settings to the generated tween,
but do not use <code>SetUpdate</code> or you will overwrite the onVirtualUpdate parameter
but do not use <code>OnUpdate</code> or you will overwrite the onVirtualUpdate parameter
</summary>
<param name="from">The value to start from</param>
<param name="to">The value to tween to</param>
......@@ -1011,18 +1016,29 @@
<summary>
Tweens a virtual int.
You can add regular settings to the generated tween,
but do not use <code>SetUpdate</code> or you will overwrite the onVirtualUpdate parameter
but do not use <code>OnUpdate</code> or you will overwrite the onVirtualUpdate parameter
</summary>
<param name="from">The value to start from</param>
<param name="to">The value to tween to</param>
<param name="duration">The duration of the tween</param>
<param name="onVirtualUpdate">A callback which must accept a parameter of type int, called at each update</param>
</member>
<member name="M:DG.Tweening.DOVirtual.Vector2(UnityEngine.Vector2,UnityEngine.Vector2,System.Single,DG.Tweening.TweenCallback{UnityEngine.Vector2})">
<summary>
Tweens a virtual Vector2.
You can add regular settings to the generated tween,
but do not use <code>OnUpdate</code> or you will overwrite the onVirtualUpdate parameter
</summary>
<param name="from">The value to start from</param>
<param name="to">The value to tween to</param>
<param name="duration">The duration of the tween</param>
<param name="onVirtualUpdate">A callback which must accept a parameter of type Vector3, called at each update</param>
</member>
<member name="M:DG.Tweening.DOVirtual.Vector3(UnityEngine.Vector3,UnityEngine.Vector3,System.Single,DG.Tweening.TweenCallback{UnityEngine.Vector3})">
<summary>
Tweens a virtual Vector3.
You can add regular settings to the generated tween,
but do not use <code>SetUpdate</code> or you will overwrite the onVirtualUpdate parameter
but do not use <code>OnUpdate</code> or you will overwrite the onVirtualUpdate parameter
</summary>
<param name="from">The value to start from</param>
<param name="to">The value to tween to</param>
......@@ -1033,7 +1049,7 @@
<summary>
Tweens a virtual Color.
You can add regular settings to the generated tween,
but do not use <code>SetUpdate</code> or you will overwrite the onVirtualUpdate parameter
but do not use <code>OnUpdate</code> or you will overwrite the onVirtualUpdate parameter
</summary>
<param name="from">The value to start from</param>
<param name="to">The value to tween to</param>
......@@ -1525,6 +1541,16 @@
<member name="M:DG.Tweening.TweenExtensions.IsBackwards(DG.Tweening.Tween)">
<summary>Returns TRUE if this tween was reversed and is set to go backwards</summary>
</member>
<member name="M:DG.Tweening.TweenExtensions.IsLoopingOrExecutingBackwards(DG.Tweening.Tween)">
<summary>NOTE: To check if a tween was simply set to go backwards see <see cref="M:DG.Tweening.TweenExtensions.IsBackwards(DG.Tweening.Tween)"/>.<para/>
Returns TRUE if this tween is going backwards for any of these reasons:<para/>
- The tween was reversed and is going backwards on a straight loop<para/>
- The tween was reversed and is going backwards on an odd Yoyo loop<para/>
- The tween is going forward but on an even Yoyo loop<para/>
IMPORTANT: if used inside a tween's callback, this will return a result concerning the exact frame when it's asked,
so for example in a callback at the end of a Yoyo loop step this method will never return FALSE
because the frame will never end exactly there and the tween will already be going backwards when the callback is fired</summary>
</member>
<member name="M:DG.Tweening.TweenExtensions.IsComplete(DG.Tweening.Tween)">
<summary>Returns TRUE if the tween is complete
(silently fails and returns FALSE if the tween has been killed)</summary>
......
No preview for this file type
No preview for this file type
......@@ -4,6 +4,31 @@
<name>DOTweenEditor</name>
</assembly>
<members>
<member name="T:DG.DOTweenEditor.EditorCompatibilityUtils">
<summary>
Contains compatibility methods taken from DemiEditor (for when DOTween is without it)
</summary>
</member>
<member name="M:DG.DOTweenEditor.EditorCompatibilityUtils.FindObjectOfType``1(System.Boolean)">
<summary>
Warning: some versions of this method don't have the includeInactive parameter so it won't be taken into account
</summary>
</member>
<member name="M:DG.DOTweenEditor.EditorCompatibilityUtils.FindObjectOfType(System.Type,System.Boolean)">
<summary>
Warning: some versions of this method don't have the includeInactive parameter so it won't be taken into account
</summary>
</member>
<member name="M:DG.DOTweenEditor.EditorCompatibilityUtils.FindObjectsOfType``1(System.Boolean)">
<summary>
Warning: some versions of this method don't have the includeInactive parameter so it won't be taken into account
</summary>
</member>
<member name="M:DG.DOTweenEditor.EditorCompatibilityUtils.FindObjectsOfType(System.Type,System.Boolean)">
<summary>
Warning: some versions of this method don't have the includeInactive parameter so it won't be taken into account
</summary>
</member>
<member name="M:DG.DOTweenEditor.DOTweenEditorPreview.Start(System.Action)">
<summary>
Starts the update loop of tween in the editor. Has no effect during playMode.
......@@ -106,5 +131,14 @@
Not used as menu item anymore, but as a utiity function
</summary>
</member>
<member name="F:DG.DOTweenEditor.UnityEditorVersion.Version">
<summary>Full major version + first minor version (ex: 2018.1f)</summary>
</member>
<member name="F:DG.DOTweenEditor.UnityEditorVersion.MajorVersion">
<summary>Major version</summary>
</member>
<member name="F:DG.DOTweenEditor.UnityEditorVersion.MinorVersion">
<summary>First minor version (ex: in 2018.1 it would be 1)</summary>
</member>
</members>
</doc>
No preview for this file type
No preview for this file type
// Author: Daniele Giardini - http://www.demigiant.com
// Author: Daniele Giardini - http://www.demigiant.com
// Created: 2018/07/13
#if true // MODULE_MARKER
......@@ -6,9 +6,7 @@ using System;
using DG.Tweening.Core;
using DG.Tweening.Plugins.Options;
using UnityEngine;
#if UNITY_5 || UNITY_2017_1_OR_NEWER
using UnityEngine.Audio; // Required for AudioMixer
#endif
#pragma warning disable 1591
namespace DG.Tweening
......@@ -43,8 +41,7 @@ namespace DG.Tweening
#endregion
#if UNITY_5 || UNITY_2017_1_OR_NEWER
#region AudioMixer (Unity 5 or Newer)
#region AudioMixer
/// <summary>Tweens an AudioMixer's exposed float to the given value.
/// Also stores the AudioMixer as the tween's target so it can be used for filtered operations.
......@@ -194,7 +191,6 @@ namespace DG.Tweening
#endregion
#endregion
#endif
#endregion
}
......
// Author: Daniele Giardini - http://www.demigiant.com
// Author: Daniele Giardini - http://www.demigiant.com
// Created: 2018/07/13
#if true // MODULE_MARKER
......
// Author: Daniele Giardini - http://www.demigiant.com
// Author: Daniele Giardini - http://www.demigiant.com
// Created: 2018/07/13
#if true && (UNITY_4_3 || UNITY_4_4 || UNITY_4_5 || UNITY_4_6 || UNITY_5 || UNITY_2017_1_OR_NEWER) // MODULE_MARKER
#if true // MODULE_MARKER
using System;
using DG.Tweening.Core;
using DG.Tweening.Plugins;
......
// Author: Daniele Giardini - http://www.demigiant.com
// Created: 2018/07/13
#if true && (UNITY_4_3 || UNITY_4_4 || UNITY_4_5 || UNITY_4_6 || UNITY_5 || UNITY_2017_1_OR_NEWER) // MODULE_MARKER
#if true // MODULE_MARKER
using System;
using UnityEngine;
using DG.Tweening.Core;
......
// Author: Daniele Giardini - http://www.demigiant.com
// Created: 2018/07/13
#if true && (UNITY_4_6 || UNITY_5 || UNITY_2017_1_OR_NEWER) // MODULE_MARKER
#if true // MODULE_MARKER
using System;
using System.Globalization;
......
......@@ -18,9 +18,6 @@ namespace DG.Tweening
/// </summary>
public static class DOTweenModuleUnityVersion
{
#if UNITY_4_3 || UNITY_4_4 || UNITY_4_5 || UNITY_4_6 || UNITY_5 || UNITY_2017_1_OR_NEWER
#region Unity 4.3 or Newer
#region Material
/// <summary>Tweens a Material's color using the given gradient
......@@ -74,12 +71,6 @@ namespace DG.Tweening
#endregion
#endregion
#endif
#if UNITY_5_3_OR_NEWER || UNITY_2017_1_OR_NEWER
#region Unity 5.3 or Newer
#region CustomYieldInstructions
/// <summary>
......@@ -172,9 +163,6 @@ namespace DG.Tweening
#endregion
#endregion
#endif
#if UNITY_2018_1_OR_NEWER
#region Unity 2018.1 or Newer
......@@ -320,7 +308,6 @@ namespace DG.Tweening
// ███ CLASSES █████████████████████████████████████████████████████████████████████████████████████████████████████████
// █████████████████████████████████████████████████████████████████████████████████████████████████████████████████████
#if UNITY_5_3_OR_NEWER || UNITY_2017_1_OR_NEWER
public static class DOTweenCYInstruction
{
public class WaitForCompletion : CustomYieldInstruction
......@@ -399,5 +386,4 @@ namespace DG.Tweening
}
}
}
#endif
}
// Author: Daniele Giardini - http://www.demigiant.com
// Author: Daniele Giardini - http://www.demigiant.com
// Created: 2018/07/13
using System;
......
source diff could not be displayed: it is too large. Options to address this: view the blob.
fileFormatVersion: 2
guid: 2cda990e2423bbf4892e6590ba056729
guid: af50cb8e93ed4675807e50f4641fc9b9
DefaultImporter:
externalObjects: {}
userData:
......
fileFormatVersion: 2
guid: 3fed5cef0df1bab4495923b9e1b24dcd
guid: 2cda990e2423bbf4892e6590ba056729
DefaultImporter:
externalObjects: {}
userData:
......
source diff could not be displayed: it is too large. Options to address this: view the blob.
......@@ -11,6 +11,8 @@ public class HM_ContentBonjour : HM_Content
public override int InitContent()
{
PlayerPrefs.Save();
if (pluginController.sceneStart && HM_Scripts.optionPanel.isButtonVisible)
{
HM_Scripts.optionPanel.HideButton();
......
......@@ -193,7 +193,9 @@ public class HM_ContentCode : HM_Content
panelErrorOpen = false;
errorText.gameObject.SetActive(false);
#if UNITY_ANDROID //&& !UNITY_EDITOR
keyboardOpen = false;
#endif
return 0;
}
......@@ -202,7 +204,9 @@ public class HM_ContentCode : HM_Content
return;
}
#if UNITY_ANDROID //&& !UNITY_EDITOR
private bool keyboardOpen = false;
#endif
private void Update()
{
#if UNITY_ANDROID //&& !UNITY_EDITOR
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment