Skip to content

S
SSBookMinigames
Commit 4de72e48 authored by Yousef Sameh's avatar Yousef Sameh
Browse files
Options

ui bug fixes

parent 787ac1b9
Expand all Show whitespace changes
Inline Side-by-side
Showing with 907 additions and 125 deletions
My project/Assets/App/Infrastructure/Core/AppRouter.cs
View file @ 4de72e48
......@@ -39,7 +39,7 @@ public class AppRouter : MonoBehaviour
DontDestroyOnLoad(gameObject);
// Standard mobile optimizations
Application.targetFrameRate = Screen.currentResolution.refreshRate;
Application.targetFrameRate = 60;
Screen.orientation = ScreenOrientation.Portrait;
}
......
My project/Assets/App/Infrastructure/User/UserService.cs
View file @ 4de72e48
......@@ -176,7 +176,7 @@ public class UserService
Sex = sex,
Curriculum = curriculum,
Term = term,
Rank = "normal",
Rank = "Normal",
Points = 0
};
......
My project/Assets/App/UI/HomeController.cs
View file @ 4de72e48
......@@ -66,12 +66,12 @@ public class HomeController : MonoBehaviour
username.text = user.Username;
xp.text = user.Points.ToString();
rank.text = AppUtils.RankToArabic(user.Rank);
rank.text = user.Rank;
xpRankEnd.text = $"{user.Points} / {Rank.FromXP(user.Points).EndXP}";
nextRankProgressBar.Value = Rank.FromXP(user.Points).Progress(user.Points);
nextRankProgressBar.LeftText = Rank.FromXP(user.Points).StartXP.ToString() + " " + Rank.FromXP(user.Points).ArabicName;
nextRankProgressBar.RightText = Rank.FromXP(user.Points).Next?.StartXP.ToString() + " " + Rank.FromXP(user.Points).Next?.ArabicName;
nextRankProgressBar.LeftText = Rank.FromXP(user.Points).StartXP.ToString() + " " + Rank.FromXP(user.Points).Name;
nextRankProgressBar.RightText = Rank.FromXP(user.Points).Next?.StartXP.ToString() + " " + Rank.FromXP(user.Points).Next?.Name;
CheckQuestionAvailability(user);
}
......
My project/Assets/App/UI/LeaderboardController.cs
View file @ 4de72e48
......@@ -9,7 +9,7 @@ public class LeaderboardController : MonoBehaviour, IDisposable
{
[SerializeField] private UIDocument leaderboardDocument;
private ScrollView leaderboardScrollView;
private VisualElement allPlayersContainer;
private VisualElement root;
// Stores the active cancellation token
......@@ -18,7 +18,7 @@ public class LeaderboardController : MonoBehaviour, IDisposable
void Start()
{
root = leaderboardDocument.rootVisualElement;
leaderboardScrollView = root.Q<ScrollView>("Leaderboard");
allPlayersContainer = root.Q<VisualElement>("AllPlayerContainer");
// Fixed Event Subscription: Use a named method to avoid memory leaks!
UserService.Instance.OnUserChanged += OnUserChanged;
......@@ -48,7 +48,7 @@ public class LeaderboardController : MonoBehaviour, IDisposable
var token = _loadCts.Token;
// Clear existing entries
leaderboardScrollView.Clear();
allPlayersContainer.Clear();
try
{
......@@ -73,19 +73,19 @@ public class LeaderboardController : MonoBehaviour, IDisposable
var entry = new CustomLeaderboardSlot
{
PlayerName = player.UserName,
Rank = AppUtils.RankToArabic(player.Rank),
Rank = player.Rank,
XP = player.Points.ToString(),
Index = player.Position.ToString(),
IsOwner = player.Id == UserService.Instance.CurrentUser?.Id
};
leaderboardScrollView.Add(entry);
allPlayersContainer.Add(entry);
}
},
(string error) =>
{
var errorLabel = new Label($"Error loading leaderboard: {error}");
leaderboardScrollView.Add(errorLabel);
allPlayersContainer.Add(errorLabel);
}
);
}
......
My project/Assets/App/UI/ProfileController.cs
View file @ 4de72e48
......@@ -43,10 +43,9 @@ public class ProfileController : MonoBehaviour
musicSwitch.onValueChanged += (value) => SettingsCache.MusicEnabled = value;
sfxSwitch.onValueChanged += (value) => SettingsCache.SfxEnabled = value;
sure = root.Q<Button>("Sure");
sure = profileDocument.rootVisualElement.Q<Button>("Sure");
sure.clicked += DeleteAccount;
UserService.Instance.OnUserChanged += OnUserChange;
OnUserChange(UserService.Instance.CurrentUser);
}
......
My project/Assets/AppUI/NewAppUI/Mainmenu.uxml
View file @ 4de72e48
<ui:UXML xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" noNamespaceSchemaLocation="../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
<Style src="project://database/Assets/AppUI/NewAppUI/USS/NewStyle.uss?fileID=7433441132597879392&amp;guid=c81297485ce529246b88d7955e887342&amp;type=3"/>
<Style src="project://database/Assets/AppUI/NewAppUI/USS/NewStyle.uss?fileID=7433441132597879392&amp;guid=c81297485ce529246b88d7955e887342&amp;type=3#NewStyle"/>
<ui:VisualElement name="Root" style="flex-grow: 1; background-color: rgb(238, 240, 248); display: flex;">
<ui:VisualElement name="Body" style="flex-grow: 0; width: 300%; flex-direction: row; translate: -33.333% 0; height: 90%; transition-duration: 0.15s; transition-timing-function: ease;">
<ui:VisualElement name="Settings" style="flex-grow: 0; width: 100%;">
......@@ -284,8 +284,8 @@
</ui:VisualElement>
</ui:VisualElement>
<ui:ScrollView name="Leaderboard" horizontal-scroller-visibility="Hidden" vertical-scroller-visibility="Hidden" style="flex-grow: 1; background-color: rgb(238, 240, 248); border-top-left-radius: 100px; border-top-right-radius: 100px; padding-top: 50px; padding-bottom: 0;">
<ui:VisualElement name="Contant" class="padding" style="flex-grow: 1; padding-top: 75px; padding-right: 0; padding-bottom: 75px; padding-left: 0; margin-top: 0; margin-right: 0; margin-bottom: 0; margin-left: 0;">
<ui:VisualElement name="Top3" style="height: 621px; margin-bottom: 54px; flex-shrink: 0;">
<ui:VisualElement name="Content" class="padding" style="flex-grow: 1; padding-top: 75px; padding-right: 0; padding-bottom: 75px; padding-left: 0; margin-top: 0; margin-right: 0; margin-bottom: 0; margin-left: 0;">
<ui:VisualElement name="TopThree" style="height: 621px; margin-bottom: 54px; flex-shrink: 0;">
<ui:VisualElement name="Padding" class="padding" style="flex-grow: 1; padding-bottom: 0; overflow: visible; translate: 0% 0; padding-top: 0;">
<ui:VisualElement name="FilterRank" style="flex-grow: 0; justify-content: space-around; flex-direction: row-reverse; margin-bottom: 75px; display: none;">
<ui:ToggleButtonGroup label="">
......@@ -341,12 +341,14 @@
</ui:VisualElement>
</ui:VisualElement>
</ui:VisualElement>
<ui:VisualElement name="AllPlayerContainer" style="flex-grow: 1;">
<CustomLeaderboardSlot/>
<CustomLeaderboardSlot is-owner="true"/>
<CustomLeaderboardSlot/>
<CustomLeaderboardSlot/>
<CustomLeaderboardSlot/>
</ui:VisualElement>
</ui:VisualElement>
</ui:ScrollView>
<ui:VisualElement name="Fade" style="flex-grow: 0; background-image: url(&quot;project://database/Assets/AppUI/Image/Transp4.png?fileID=2800000&amp;guid=9046ff72a71cb9f42bd69f32d5cc9a45&amp;type=3#Transp4&quot;); position: absolute; bottom: auto; width: 98%; height: 150px; -unity-background-image-tint-color: rgb(238, 240, 248); rotate: 180deg; top: 30%; border-bottom-right-radius: 100px; border-bottom-left-radius: 100px; align-self: center;"/>
<ui:VisualElement name="Fade" style="flex-grow: 0; background-image: url(&quot;project://database/Assets/AppUI/Image/Transp4.png?fileID=2800000&amp;guid=9046ff72a71cb9f42bd69f32d5cc9a45&amp;type=3#Transp4&quot;); position: absolute; bottom: 0; width: 100%; height: 100px; -unity-background-image-tint-color: rgb(238, 240, 248);"/>
......
My project/Assets/AppUI/Scripts/MainmenuAnimation.cs
View file @ 4de72e48
......@@ -124,7 +124,6 @@ public class MainmenuAnimation : MonoBehaviour
}
_bodyPanel.style.translate = new Translate(new Length(xOffset, LengthUnit.Percent), 0);
buttonBackground.style.translate = new Translate(new Length(btnXOffset, LengthUnit.Percent), new Length(-8, LengthUnit.Percent));
}
#endregion
......
My project/Assets/Resources/PerformanceTestRunInfo.json
View file @ 4de72e48
{"TestSuite":"","Date":0,"Player":{"Development":false,"ScreenWidth":0,"ScreenHeight":0,"ScreenRefreshRate":0,"Fullscreen":false,"Vsync":0,"AntiAliasing":0,"Batchmode":false,"RenderThreadingMode":"MultiThreaded","MtRendering":false,"GraphicsJobs":false,"GpuSkinning":true,"Platform":"","ColorSpace":"","AnisotropicFiltering":"","BlendWeights":"","GraphicsApi":"","ScriptingBackend":"IL2CPP","AndroidTargetSdkVersion":"AndroidApiLevelAuto","AndroidBuildSystem":"Gradle","BuildTarget":"Android","StereoRenderingPath":"MultiPass"},"Hardware":{"OperatingSystem":"","DeviceModel":"","DeviceName":"","ProcessorType":"","ProcessorCount":0,"GraphicsDeviceName":"","SystemMemorySizeMB":0},"Editor":{"Version":"6000.3.9f1","Branch":"6000.3/staging","Changeset":"7a9955a4f2fa","Date":1770746648},"Dependencies":["com.cysharp.unitask@2.5.10","com.github-glitchenzo.nugetforunity@4.5.0","com.unity.2d.sprite@1.0.0","com.unity.ai.navigation@2.0.11","com.unity.cinemachine@3.1.6","com.unity.collab-proxy@2.11.4","com.unity.device-simulator.devices@1.0.1","com.unity.ide.rider@3.0.39","com.unity.ide.visualstudio@2.0.26","com.unity.inputsystem@1.19.0","com.unity.multiplayer.center@1.0.1","com.unity.nuget.newtonsoft-json@3.2.2","com.unity.postprocessing@3.5.4","com.unity.recorder@5.1.6","com.unity.render-pipelines.universal@17.3.0","com.unity.shadergraph@17.3.0","com.unity.test-framework@1.6.0","com.unity.timeline@1.8.11","com.unity.ugui@2.0.0","com.unity.visualeffectgraph@17.3.0","com.unity.visualscripting@1.9.11","media.lightside.unitext@1.0.0","com.unity.modules.accessibility@1.0.0","com.unity.modules.adaptiveperformance@1.0.0","com.unity.modules.ai@1.0.0","com.unity.modules.androidjni@1.0.0","com.unity.modules.animation@1.0.0","com.unity.modules.assetbundle@1.0.0","com.unity.modules.audio@1.0.0","com.unity.modules.cloth@1.0.0","com.unity.modules.director@1.0.0","com.unity.modules.imageconversion@1.0.0","com.unity.modules.imgui@1.0.0","com.unity.modules.jsonserialize@1.0.0","com.unity.modules.particlesystem@1.0.0","com.unity.modules.physics@1.0.0","com.unity.modules.physics2d@1.0.0","com.unity.modules.screencapture@1.0.0","com.unity.modules.terrain@1.0.0","com.unity.modules.terrainphysics@1.0.0","com.unity.modules.tilemap@1.0.0","com.unity.modules.ui@1.0.0","com.unity.modules.uielements@1.0.0","com.unity.modules.umbra@1.0.0","com.unity.modules.unityanalytics@1.0.0","com.unity.modules.unitywebrequest@1.0.0","com.unity.modules.unitywebrequestassetbundle@1.0.0","com.unity.modules.unitywebrequestaudio@1.0.0","com.unity.modules.unitywebrequesttexture@1.0.0","com.unity.modules.unitywebrequestwww@1.0.0","com.unity.modules.vectorgraphics@1.0.0","com.unity.modules.vehicles@1.0.0","com.unity.modules.video@1.0.0","com.unity.modules.vr@1.0.0","com.unity.modules.wind@1.0.0","com.unity.modules.xr@1.0.0","com.unity.modules.subsystems@1.0.0","com.unity.modules.hierarchycore@1.0.0","com.unity.render-pipelines.core@17.3.0","com.unity.ext.nunit@2.0.5","com.unity.searcher@4.9.4","com.unity.render-pipelines.universal-config@17.0.3","com.unity.collections@2.6.2","com.unity.bindings.openimageio@1.0.2","com.unity.splines@2.8.2","com.unity.burst@1.8.28","com.unity.mathematics@1.3.3","com.unity.nuget.mono-cecil@1.11.6","com.unity.test-framework.performance@3.2.0","com.unity.settings-manager@2.1.1"],"Results":[]}
\ No newline at end of file
{"TestSuite":"","Date":0,"Player":{"Development":false,"ScreenWidth":0,"ScreenHeight":0,"ScreenRefreshRate":0,"Fullscreen":false,"Vsync":0,"AntiAliasing":0,"Batchmode":false,"RenderThreadingMode":"MultiThreaded","MtRendering":false,"GraphicsJobs":false,"GpuSkinning":true,"Platform":"","ColorSpace":"","AnisotropicFiltering":"","BlendWeights":"","GraphicsApi":"","ScriptingBackend":"IL2CPP","AndroidTargetSdkVersion":"AndroidApiLevelAuto","AndroidBuildSystem":"Gradle","BuildTarget":"Android","StereoRenderingPath":"MultiPass"},"Hardware":{"OperatingSystem":"","DeviceModel":"","DeviceName":"","ProcessorType":"","ProcessorCount":0,"GraphicsDeviceName":"","SystemMemorySizeMB":0},"Editor":{"Version":"6000.3.12f1","Branch":"6000.3/staging","Changeset":"fca03ac9b0d5","Date":1773805432},"Dependencies":["com.cysharp.unitask@2.5.10","com.github-glitchenzo.nugetforunity@4.5.0","com.unity.2d.sprite@1.0.0","com.unity.ai.navigation@2.0.11","com.unity.cinemachine@3.1.6","com.unity.collab-proxy@2.11.4","com.unity.device-simulator.devices@1.0.1","com.unity.ide.rider@3.0.39","com.unity.ide.visualstudio@2.0.26","com.unity.inputsystem@1.19.0","com.unity.multiplayer.center@1.0.1","com.unity.nuget.newtonsoft-json@3.2.2","com.unity.postprocessing@3.5.4","com.unity.recorder@5.1.6","com.unity.render-pipelines.universal@17.3.0","com.unity.shadergraph@17.3.0","com.unity.test-framework@1.6.0","com.unity.timeline@1.8.11","com.unity.ugui@2.0.0","com.unity.visualeffectgraph@17.3.0","com.unity.visualscripting@1.9.11","media.lightside.unitext@1.0.0","com.unity.modules.accessibility@1.0.0","com.unity.modules.adaptiveperformance@1.0.0","com.unity.modules.ai@1.0.0","com.unity.modules.androidjni@1.0.0","com.unity.modules.animation@1.0.0","com.unity.modules.assetbundle@1.0.0","com.unity.modules.audio@1.0.0","com.unity.modules.cloth@1.0.0","com.unity.modules.director@1.0.0","com.unity.modules.imageconversion@1.0.0","com.unity.modules.imgui@1.0.0","com.unity.modules.jsonserialize@1.0.0","com.unity.modules.particlesystem@1.0.0","com.unity.modules.physics@1.0.0","com.unity.modules.physics2d@1.0.0","com.unity.modules.screencapture@1.0.0","com.unity.modules.terrain@1.0.0","com.unity.modules.terrainphysics@1.0.0","com.unity.modules.tilemap@1.0.0","com.unity.modules.ui@1.0.0","com.unity.modules.uielements@1.0.0","com.unity.modules.umbra@1.0.0","com.unity.modules.unityanalytics@1.0.0","com.unity.modules.unitywebrequest@1.0.0","com.unity.modules.unitywebrequestassetbundle@1.0.0","com.unity.modules.unitywebrequestaudio@1.0.0","com.unity.modules.unitywebrequesttexture@1.0.0","com.unity.modules.unitywebrequestwww@1.0.0","com.unity.modules.vectorgraphics@1.0.0","com.unity.modules.vehicles@1.0.0","com.unity.modules.video@1.0.0","com.unity.modules.vr@1.0.0","com.unity.modules.wind@1.0.0","com.unity.modules.xr@1.0.0","com.unity.modules.subsystems@1.0.0","com.unity.modules.hierarchycore@1.0.0","com.unity.render-pipelines.core@17.3.0","com.unity.ext.nunit@2.0.5","com.unity.searcher@4.9.4","com.unity.render-pipelines.universal-config@17.0.3","com.unity.collections@2.6.5","com.unity.bindings.openimageio@1.0.2","com.unity.splines@2.8.4","com.unity.burst@1.8.28","com.unity.mathematics@1.3.3","com.unity.nuget.mono-cecil@1.11.6","com.unity.test-framework.performance@3.2.0","com.unity.settings-manager@2.1.1"],"Results":[]}
\ No newline at end of file
My project/Assets/ScienceStreet/MCQ/Scripts/McqPrefabBuilder.cs
View file @ 4de72e48
......@@ -124,7 +124,6 @@ namespace com.al_arcade.mcq
private void Start()
{
Application.targetFrameRate = 60;
Instance = this;
if (arabicFont != null) SSFontManager.Font = arabicFont;
StartCoroutine(BuildEverything());
......
My project/Assets/Settings/PC_RPAsset.asset
View file @ 4de72e48
......@@ -106,19 +106,19 @@ MonoBehaviour:
m_PrefilterXRKeywords: 1
m_PrefilteringModeForwardPlus: 2
m_PrefilteringModeDeferredRendering: 0
m_PrefilteringModeScreenSpaceOcclusion: 2
m_PrefilteringModeScreenSpaceOcclusion: 0
m_PrefilterDebugKeywords: 1
m_PrefilterWriteRenderingLayers: 1
m_PrefilterHDROutput: 1
m_PrefilterAlphaOutput: 1
m_PrefilterSSAODepthNormals: 0
m_PrefilterSSAODepthNormals: 1
m_PrefilterSSAOSourceDepthLow: 1
m_PrefilterSSAOSourceDepthMedium: 1
m_PrefilterSSAOSourceDepthHigh: 1
m_PrefilterSSAOInterleaved: 1
m_PrefilterSSAOBlueNoise: 0
m_PrefilterSSAOBlueNoise: 1
m_PrefilterSSAOSampleCountLow: 1
m_PrefilterSSAOSampleCountMedium: 0
m_PrefilterSSAOSampleCountMedium: 1
m_PrefilterSSAOSampleCountHigh: 1
m_PrefilterDBufferMRT1: 1
m_PrefilterDBufferMRT2: 1
......
My project/ProjectSettings/ProjectSettings.asset
View file @ 4de72e48
......@@ -116,6 +116,7 @@ PlayerSettings:
xboxEnableGuest: 0
xboxEnablePIXSampling: 0
metalFramebufferOnly: 0
metalUseMetalDisplayLink: 0
xboxOneResolution: 0
xboxOneSResolution: 0
xboxOneXResolution: 3
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment