Skip to content

S
SSBookMinigames
Commit 5fcacb0c authored by Abdulrahman Mohammed's avatar Abdulrahman Mohammed
Browse files
Options

Fix some issues

parent 03c246e2
Hide whitespace changes
Inline Side-by-side
Showing with 63 additions and 44 deletions
My project/.utmp/RelWithDebInfo/5i191b1l/arm64-v8a/configure_fingerprint.bin
View file @ 5fcacb0c
......@@ -2,30 +2,30 @@ C/C++ Structured Logq
o
mD:\Work Games\ssbookminigames\My project\.utmp\RelWithDebInfo\5i191b1l\arm64-v8a\additional_project_files.txtC
A
?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  Ą3 ֡3n
?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ي3 ֡3n
l
jD:\Work Games\ssbookminigames\My project\.utmp\RelWithDebInfo\5i191b1l\arm64-v8a\android_gradle_build.json  Ą3 ֡3s
jD:\Work Games\ssbookminigames\My project\.utmp\RelWithDebInfo\5i191b1l\arm64-v8a\android_gradle_build.json  ي3 ֡3s
q
oD:\Work Games\ssbookminigames\My project\.utmp\RelWithDebInfo\5i191b1l\arm64-v8a\android_gradle_build_mini.json  Ą3
oD:\Work Games\ssbookminigames\My project\.utmp\RelWithDebInfo\5i191b1l\arm64-v8a\android_gradle_build_mini.json  ي3
֡3`
^
\D:\Work Games\ssbookminigames\My project\.utmp\RelWithDebInfo\5i191b1l\arm64-v8a\build.ninja  Ą3 ֡3d
\D:\Work Games\ssbookminigames\My project\.utmp\RelWithDebInfo\5i191b1l\arm64-v8a\build.ninja  ي3 ֡3d
b
`D:\Work Games\ssbookminigames\My project\.utmp\RelWithDebInfo\5i191b1l\arm64-v8a\build.ninja.txt  Ą3i
`D:\Work Games\ssbookminigames\My project\.utmp\RelWithDebInfo\5i191b1l\arm64-v8a\build.ninja.txt  ي3i
g
eD:\Work Games\ssbookminigames\My project\.utmp\RelWithDebInfo\5i191b1l\arm64-v8a\build_file_index.txt  Ą3 ֡3j
eD:\Work Games\ssbookminigames\My project\.utmp\RelWithDebInfo\5i191b1l\arm64-v8a\build_file_index.txt  ي3 ֡3j
h
fD:\Work Games\ssbookminigames\My project\.utmp\RelWithDebInfo\5i191b1l\arm64-v8a\compile_commands.json  Ą3 ֡3n
fD:\Work Games\ssbookminigames\My project\.utmp\RelWithDebInfo\5i191b1l\arm64-v8a\compile_commands.json  ي3 ֡3n
l
jD:\Work Games\ssbookminigames\My project\.utmp\RelWithDebInfo\5i191b1l\arm64-v8a\compile_commands.json.bin  Ą3  ֡3t
jD:\Work Games\ssbookminigames\My project\.utmp\RelWithDebInfo\5i191b1l\arm64-v8a\compile_commands.json.bin  ي3  ֡3t
r
pD:\Work Games\ssbookminigames\My project\.utmp\RelWithDebInfo\5i191b1l\arm64-v8a\metadata_generation_command.txt  Ą3
pD:\Work Games\ssbookminigames\My project\.utmp\RelWithDebInfo\5i191b1l\arm64-v8a\metadata_generation_command.txt  ي3
 ֡3g
e
cD:\Work Games\ssbookminigames\My project\.utmp\RelWithDebInfo\5i191b1l\arm64-v8a\prefab_config.json  Ą3  ֡3l
cD:\Work Games\ssbookminigames\My project\.utmp\RelWithDebInfo\5i191b1l\arm64-v8a\prefab_config.json  ي3  ֡3l
j
hD:\Work Games\ssbookminigames\My project\.utmp\RelWithDebInfo\5i191b1l\arm64-v8a\symbol_folder_index.txt  Ą3  ֡3{
hD:\Work Games\ssbookminigames\My project\.utmp\RelWithDebInfo\5i191b1l\arm64-v8a\symbol_folder_index.txt  ي3  ֡3{
y
wD:\Work Games\ssbookminigames\My project\Library\Bee\Android\Prj\IL2CPP\Gradle\unityLibrary\src\main\cpp\CMakeLists.txt  Ą3  V ա3
wD:\Work Games\ssbookminigames\My project\Library\Bee\Android\Prj\IL2CPP\Gradle\unityLibrary\src\main\cpp\CMakeLists.txt  ي3  V ա3

D:\Work Games\ssbookminigames\My project\Library\Bee\Android\Prj\IL2CPP\Gradle\unityLibrary\src\main\cpp\FramePacing\CMakeLists.txt  Ą3 ա3
\ No newline at end of file
D:\Work Games\ssbookminigames\My project\Library\Bee\Android\Prj\IL2CPP\Gradle\unityLibrary\src\main\cpp\FramePacing\CMakeLists.txt  ي3 ա3
\ No newline at end of file
......
My project/.utmp/RelWithDebInfo/5i191b1l/armeabi-v7a/configure_fingerprint.bin
View file @ 5fcacb0c
......@@ -2,30 +2,30 @@ C/C++ Structured Logs
q
oD:\Work Games\ssbookminigames\My project\.utmp\RelWithDebInfo\5i191b1l\armeabi-v7a\additional_project_files.txtC
A
?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  Ą3 ֡3p
?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ي3 ֡3p
n
lD:\Work Games\ssbookminigames\My project\.utmp\RelWithDebInfo\5i191b1l\armeabi-v7a\android_gradle_build.json  Ą3 ֡3u
lD:\Work Games\ssbookminigames\My project\.utmp\RelWithDebInfo\5i191b1l\armeabi-v7a\android_gradle_build.json  ي3 ֡3u
s
qD:\Work Games\ssbookminigames\My project\.utmp\RelWithDebInfo\5i191b1l\armeabi-v7a\android_gradle_build_mini.json  Ą3
qD:\Work Games\ssbookminigames\My project\.utmp\RelWithDebInfo\5i191b1l\armeabi-v7a\android_gradle_build_mini.json  ي3
֡3b
`
^D:\Work Games\ssbookminigames\My project\.utmp\RelWithDebInfo\5i191b1l\armeabi-v7a\build.ninja  Ą3 ֡3f
^D:\Work Games\ssbookminigames\My project\.utmp\RelWithDebInfo\5i191b1l\armeabi-v7a\build.ninja  ي3 ֡3f
d
bD:\Work Games\ssbookminigames\My project\.utmp\RelWithDebInfo\5i191b1l\armeabi-v7a\build.ninja.txt  Ą3k
bD:\Work Games\ssbookminigames\My project\.utmp\RelWithDebInfo\5i191b1l\armeabi-v7a\build.ninja.txt  ي3k
i
gD:\Work Games\ssbookminigames\My project\.utmp\RelWithDebInfo\5i191b1l\armeabi-v7a\build_file_index.txt  Ą3 ֡3l
gD:\Work Games\ssbookminigames\My project\.utmp\RelWithDebInfo\5i191b1l\armeabi-v7a\build_file_index.txt  ي3 ֡3l
j
hD:\Work Games\ssbookminigames\My project\.utmp\RelWithDebInfo\5i191b1l\armeabi-v7a\compile_commands.json  Ą3 ֡3p
hD:\Work Games\ssbookminigames\My project\.utmp\RelWithDebInfo\5i191b1l\armeabi-v7a\compile_commands.json  ي3 ֡3p
n
lD:\Work Games\ssbookminigames\My project\.utmp\RelWithDebInfo\5i191b1l\armeabi-v7a\compile_commands.json.bin  Ą3  ֡3v
lD:\Work Games\ssbookminigames\My project\.utmp\RelWithDebInfo\5i191b1l\armeabi-v7a\compile_commands.json.bin  ي3  ֡3v
t
rD:\Work Games\ssbookminigames\My project\.utmp\RelWithDebInfo\5i191b1l\armeabi-v7a\metadata_generation_command.txt  Ą3
rD:\Work Games\ssbookminigames\My project\.utmp\RelWithDebInfo\5i191b1l\armeabi-v7a\metadata_generation_command.txt  ي3
 ֡3i
g
eD:\Work Games\ssbookminigames\My project\.utmp\RelWithDebInfo\5i191b1l\armeabi-v7a\prefab_config.json  Ą3  ֡3n
eD:\Work Games\ssbookminigames\My project\.utmp\RelWithDebInfo\5i191b1l\armeabi-v7a\prefab_config.json  ي3  ֡3n
l
jD:\Work Games\ssbookminigames\My project\.utmp\RelWithDebInfo\5i191b1l\armeabi-v7a\symbol_folder_index.txt  Ą3  ֡3{
jD:\Work Games\ssbookminigames\My project\.utmp\RelWithDebInfo\5i191b1l\armeabi-v7a\symbol_folder_index.txt  ي3  ֡3{
y
wD:\Work Games\ssbookminigames\My project\Library\Bee\Android\Prj\IL2CPP\Gradle\unityLibrary\src\main\cpp\CMakeLists.txt  Ą3  V ա3
wD:\Work Games\ssbookminigames\My project\Library\Bee\Android\Prj\IL2CPP\Gradle\unityLibrary\src\main\cpp\CMakeLists.txt  ي3  V ա3

D:\Work Games\ssbookminigames\My project\Library\Bee\Android\Prj\IL2CPP\Gradle\unityLibrary\src\main\cpp\FramePacing\CMakeLists.txt  Ą3 ա3
\ No newline at end of file
D:\Work Games\ssbookminigames\My project\Library\Bee\Android\Prj\IL2CPP\Gradle\unityLibrary\src\main\cpp\FramePacing\CMakeLists.txt  ي3 ա3
\ No newline at end of file
......
My project/Assets/App/Infrastructure/Core/AppRouter.cs
View file @ 5fcacb0c
using System;
using com.al_arcade.shared;
using Cysharp.Threading.Tasks;
using DG.Tweening;
using EasyTransition;
using Supabase.Gotrue;
using Supabase.Gotrue.Interfaces;
using System;
using TMPro;
using UnityEngine;
using UnityEngine.SceneManagement;
using TMPro;
using DG.Tweening;
using UnityEngine.UIElements;
using static UnityEngine.Rendering.DebugUI;
public class AppRouter : MonoBehaviour
{
......@@ -232,15 +234,16 @@ public class AppRouter : MonoBehaviour
public static void GoToHome()
{
PlayerPrefs.SetInt("Settings_MusicEnabled", 1);
PlayerPrefs.SetInt("Settings_SfxEnabled", 1);
PlayerPrefs.Save();
TransitionManager.Instance().Transition("MainMenu", _instance.transitionSettings, 0f);
UserService.Instance.StartListening();
}
public static async void Logout(UnityEngine.UIElements.Button logoutButton = null)
public static async void Logout()
{
logoutButton.SetEnabled(false);
CleanupSingletons();
await SupabaseAuthentication.Instance.LogOut();
......
My project/Assets/App/UI/ProfileController.cs
View file @ 5fcacb0c
......@@ -24,10 +24,7 @@ public class ProfileController : MonoBehaviour
var root = profileDocument.rootVisualElement.Q("Settings");
name = root.Q<Label>("Username");
logoutButton = root.Q<Button>("LogoutButton");
logoutButton.clicked += () =>
{
AppRouter.Logout(logoutButton);
};
logoutButton.clicked += AppRouter.Logout;
updateProfileButton = root.Q<Button>("UpdateProfile");
updateProfileButton.clicked += () =>
......@@ -105,7 +102,7 @@ public class ProfileController : MonoBehaviour
private void OnDestroy()
{
UserService.Instance.OnUserChanged -= OnUserChange;
logoutButton.clicked -= () => { AppRouter.Logout(logoutButton); };
logoutButton.clicked -= AppRouter.Logout;
updateProfileButton.clicked -= UpdateProfile;
}
......
My project/Assets/AppUI/NewAppUI/Login.uxml
View file @ 5fcacb0c
......@@ -22,7 +22,7 @@
<ui:Label text="🔑" name="TextFieldLabel" language-direction="RTL" class="emoji" style="color: rgb(117, 117, 117); margin-bottom: 0; font-size: 40px; -unity-text-align: middle-right; margin-left: 5px;"/>
<ui:Label text="كلمة المرور" name="TextFieldLabel" language-direction="RTL" class="base-text-light" style="color: rgb(117, 117, 117); margin-bottom: 0; font-size: 35px; -unity-font-definition: url(&quot;project://database/Assets/ALArcade/Hakwaty%20Font/TSHakwaty-DemiBold.otf?fileID=12800000&amp;guid=566b773a07b3d064aa1f4c6ef7b6f6fa&amp;type=3#TSHakwaty-DemiBold&quot;);"/>
</ui:VisualElement>
<ui:TextField label="" placeholder-text="" name="Password" value="" language-direction="RTL" keyboard-type="EmailAddress" password="true" class="textField" style="flex-direction: row-reverse; color: rgb(0, 0, 0); -unity-font-definition: url(&quot;project://database/Assets/UI%20Toolkit/UnityThemes/UnityDefaultRuntimeTheme.tss?fileID=2230732570650464555&amp;guid=901fb73b2529c134f9cf372789759383&amp;type=3#NotInter-Regular&quot;); -unity-text-align: upper-right; -unity-text-generator: advanced; justify-content: space-between; align-content: flex-start; white-space: nowrap; text-overflow: clip; align-items: center; margin-bottom: 20px;">
<ui:TextField label="" placeholder-text="" name="Password" value="" language-direction="RTL" keyboard-type="Default" password="true" class="textField" style="flex-direction: row-reverse; color: rgb(0, 0, 0); -unity-font-definition: url(&quot;project://database/Assets/UI%20Toolkit/UnityThemes/UnityDefaultRuntimeTheme.tss?fileID=2230732570650464555&amp;guid=901fb73b2529c134f9cf372789759383&amp;type=3#NotInter-Regular&quot;); -unity-text-align: upper-right; -unity-text-generator: advanced; justify-content: space-between; align-content: flex-start; white-space: nowrap; text-overflow: clip; align-items: center; margin-bottom: 20px;">
<ui:Image source="project://database/Assets/Art/export/mail@3x.png?fileID=2800000&amp;guid=0d76662a81af3a7408ca3c2975f08b8f&amp;type=3#mail@3x" tint-color="rgb(158, 158, 158)" style="margin-left: 25px; width: 51px; display: none;"/>
<ui:Button text="" icon-image="" name="ShowPassword" class="show-password-button" style="background-image: url(&quot;project://database/Assets/Art/eye.png?fileID=2800000&amp;guid=b9a46d4f75f79394387c17a050946999&amp;type=3#eye&quot;); -unity-background-image-tint-color: rgb(48, 48, 208); width: 50px;"/>
</ui:TextField>
......@@ -84,7 +84,7 @@
<ui:Label text="🔑" name="TextFieldLabel" language-direction="RTL" class="emoji" style="color: rgb(117, 117, 117); margin-bottom: 0; font-size: 40px; -unity-text-align: middle-right; margin-left: 5px;"/>
<ui:Label text="كلمة المرور" name="TextFieldLabel" language-direction="RTL" class="base-text-light" style="color: rgb(117, 117, 117); margin-bottom: 0; font-size: 35px; -unity-font-definition: url(&quot;project://database/Assets/ALArcade/Hakwaty%20Font/TSHakwaty-DemiBold.otf?fileID=12800000&amp;guid=566b773a07b3d064aa1f4c6ef7b6f6fa&amp;type=3#TSHakwaty-DemiBold&quot;);"/>
</ui:VisualElement>
<ui:TextField label="" placeholder-text="" name="Password" value="" language-direction="RTL" keyboard-type="EmailAddress" password="true" class="textField" style="flex-direction: row-reverse; color: rgb(0, 0, 0); -unity-font-definition: url(&quot;project://database/Assets/UI%20Toolkit/UnityThemes/UnityDefaultRuntimeTheme.tss?fileID=2230732570650464555&amp;guid=901fb73b2529c134f9cf372789759383&amp;type=3#NotInter-Regular&quot;); -unity-text-align: upper-right; -unity-text-generator: advanced; justify-content: space-between; align-content: flex-start; white-space: nowrap; text-overflow: clip; align-items: center;">
<ui:TextField label="" placeholder-text="" name="Password" value="" language-direction="RTL" keyboard-type="Default" password="true" class="textField" style="flex-direction: row-reverse; color: rgb(0, 0, 0); -unity-font-definition: url(&quot;project://database/Assets/UI%20Toolkit/UnityThemes/UnityDefaultRuntimeTheme.tss?fileID=2230732570650464555&amp;guid=901fb73b2529c134f9cf372789759383&amp;type=3#NotInter-Regular&quot;); -unity-text-align: upper-right; -unity-text-generator: advanced; justify-content: space-between; align-content: flex-start; white-space: nowrap; text-overflow: clip; align-items: center;">
<ui:Image source="project://database/Assets/Art/export/mail@3x.png?fileID=2800000&amp;guid=0d76662a81af3a7408ca3c2975f08b8f&amp;type=3#mail@3x" tint-color="rgb(158, 158, 158)" style="margin-left: 25px; width: 51px; display: none;"/>
<ui:Button text="" icon-image="" name="ShowPassword" class="show-password-button" style="background-image: url(&quot;project://database/Assets/Art/eye.png?fileID=2800000&amp;guid=b9a46d4f75f79394387c17a050946999&amp;type=3#eye&quot;); -unity-background-image-tint-color: rgb(48, 48, 208); width: 50px;"/>
</ui:TextField>
......@@ -243,7 +243,7 @@
</ui:VisualElement>
<ui:VisualElement name="Buttons" style="flex-grow: 1; flex-direction: row-reverse; justify-content: space-around;">
<ui:VisualElement name="Button" style="width: 250px; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; justify-content: center;">
<ui:Button text="الغاء" name="CloseMessagePanelButton" language-direction="RTL" class="action-btn" style="background-color: rgb(245, 3, 45); color: rgb(255, 255, 255); -unity-font-definition: url(&quot;project://database/Assets/ALArcade/Hakwaty%20Font/TSHakwaty-ExtraBold.otf?fileID=12800000&amp;guid=9edc60294a97d7f4e87aee01d4e4d689&amp;type=3#TSHakwaty-ExtraBold&quot;); font-size: 55px; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; margin-top: 0; margin-right: 0; margin-bottom: 0; margin-left: 0; height: 140px; -unity-text-generator: advanced;"/>
<ui:Button text="تم" name="CloseMessagePanelButton" language-direction="RTL" class="action-btn" style="background-color: rgb(245, 3, 45); color: rgb(255, 255, 255); -unity-font-definition: url(&quot;project://database/Assets/ALArcade/Hakwaty%20Font/TSHakwaty-ExtraBold.otf?fileID=12800000&amp;guid=9edc60294a97d7f4e87aee01d4e4d689&amp;type=3#TSHakwaty-ExtraBold&quot;); font-size: 55px; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; margin-top: 0; margin-right: 0; margin-bottom: 0; margin-left: 0; height: 140px; -unity-text-generator: advanced;"/>
</ui:VisualElement>
</ui:VisualElement>
</ui:VisualElement>
......
My project/Assets/AppUI/NewAppUI/Mainmenu.uxml
View file @ 5fcacb0c
......@@ -453,7 +453,7 @@
</ui:VisualElement>
<ui:VisualElement name="Buttons" style="flex-grow: 1; flex-direction: row-reverse; justify-content: space-around;">
<ui:VisualElement name="Button" style="width: 250px; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; justify-content: center;">
<ui:Button text="الغاء" name="CloseMessagePanelButton" language-direction="RTL" class="action-btn" style="background-color: rgb(245, 3, 45); color: rgb(255, 255, 255); -unity-font-definition: url(&quot;project://database/Assets/ALArcade/Hakwaty%20Font/TSHakwaty-ExtraBold.otf?fileID=12800000&amp;guid=9edc60294a97d7f4e87aee01d4e4d689&amp;type=3#TSHakwaty-ExtraBold&quot;); font-size: 55px; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; margin-top: 0; margin-right: 0; margin-bottom: 0; margin-left: 0; height: 140px; -unity-text-generator: advanced;"/>
<ui:Button text="تم" name="CloseMessagePanelButton" language-direction="RTL" class="action-btn" style="background-color: rgb(245, 3, 45); color: rgb(255, 255, 255); -unity-font-definition: url(&quot;project://database/Assets/ALArcade/Hakwaty%20Font/TSHakwaty-ExtraBold.otf?fileID=12800000&amp;guid=9edc60294a97d7f4e87aee01d4e4d689&amp;type=3#TSHakwaty-ExtraBold&quot;); font-size: 55px; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; margin-top: 0; margin-right: 0; margin-bottom: 0; margin-left: 0; height: 140px; -unity-text-generator: advanced;"/>
</ui:VisualElement>
</ui:VisualElement>
</ui:VisualElement>
......
My project/Assets/AppUI/Scripts/LoginPageAnimation.cs
View file @ 5fcacb0c
......@@ -174,8 +174,6 @@ public class LoginPageAnimation : MonoBehaviour
registerButton.clicked += async () =>
{
registerButton.SetEnabled(false);
registerButton.text = "جاري التسجيل...";
var registerRoot = loginPage.rootVisualElement.Q<VisualElement>("Register");
......@@ -213,6 +211,12 @@ public class LoginPageAnimation : MonoBehaviour
return;
}
if(password != rePassword)
{
ShowUIMessage.Instance.ShowMessage("كلمة المرور غير متطابقة");
return;
}
var sex = registerRoot.Q<DropdownField>("Sex").value;
if (ShowErrorIfEmpty(sex, "النوع"))
{
......@@ -245,6 +249,9 @@ public class LoginPageAnimation : MonoBehaviour
return;
}
registerButton.SetEnabled(false);
registerButton.text = "جاري التسجيل...";
if (isComingFromGuestModel)
{
var convertedOrError = await SupabaseAuthentication.Instance.ConvertGuestToEmail(email.Trim(), password);
......
My project/Assets/AppUI/Scripts/MainmenuAnimation.cs
View file @ 5fcacb0c
......@@ -285,6 +285,11 @@ public class MainmenuAnimation : MonoBehaviour
Button openRemoveAccountPanel = mainMenu.rootVisualElement.Q<Button>("OpenRemoveAccountPanel");
Button closeRemoveAccountPanel = mainMenu.rootVisualElement.Q<Button>("CloseRemoveAccountPanel");
Button logoutButton = removeAccountPanel.Q<Button>("Sure");
logoutButton.clicked += () =>
{
logoutButton.SetEnabled(false);
};
openRemoveAccountPanel.clicked += () =>
{
......
My project/Assets/AppUI/Scripts/SelectImage.cs
View file @ 5fcacb0c
......@@ -59,6 +59,13 @@ public class SelectImage : MonoBehaviour
{
Index = 4;
}
else
{
Index = 0;
profileImage.currentSprite = profileImage.profileImages[Index];
Debug.Log("noo");
}
}
private async void SureImage_clicked()
......
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