Skip to content

Commit

Permalink
Mst 4.17.25
Browse files Browse the repository at this point in the history
Removed unsupported classes
Some fixes
  • Loading branch information
aevien committed Jul 22, 2024
1 parent 9f45fd7 commit f4f1083
Show file tree
Hide file tree
Showing 40 changed files with 184 additions and 595 deletions.
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
#if MIRROR
using kcp2k;
using MasterServerToolkit.Logging;
using MasterServerToolkit.MasterServer;
using MasterServerToolkit.Networking;
using Mirror;
using Mirror.SimpleWeb;
using System;
using UnityEngine;
using UnityEngine.SceneManagement;
Expand Down Expand Up @@ -156,17 +154,9 @@ public void SetAddress(string address)
public void SetPort(int port)
{
// Set room port
if (Transport.active is KcpTransport kcpTransport)
if (Transport.active is PortTransport portTransport)
{
kcpTransport.Port = (ushort)port;
}
else if (Transport.active is TelepathyTransport telepathyTransport)
{
telepathyTransport.port = (ushort)port;
}
else if (Transport.active is SimpleWebTransport swTransport)
{
swTransport.port = (ushort)port;
portTransport.Port = (ushort)port;
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,8 @@ public class ChatsView : UIView
/// </summary>
private string username;

protected override void Start()
protected void Start()
{
base.Start();

chanelItemsList = new List<ChatChannelItemUI>();

Mst.Client.Chat.OnMessageReceivedEvent += Chat_OnMessageReceivedEvent;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,8 @@ protected override void Awake()
});
}

protected override void Start()
protected void Start()
{
base.Start();
usernameInputField.text = SimpleNameGenerator.GenerateFirstName(Gender.Male);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,8 @@ public string ConfirmationCode
}
}

protected override void Start()
protected void Start()
{
base.Start();

// Listen to show/hide events
Mst.Events.AddListener(MstEventKeys.showEmailConfirmationView, OnShowEmailConfirmationEventHandler);
Mst.Events.AddListener(MstEventKeys.hideEmailConfirmationView, OnHideEmailConfirmationEventHandler);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,8 @@ protected override void Awake()
Mst.Events.AddListener(MstEventKeys.hideGamesListView, OnHideGamesListEventHandler);
}

protected override void Start()
protected void Start()
{
base.Start();

if (listContainer)
{
foreach (Transform t in listContainer)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,8 @@ protected override void Awake()
messagesContainer.RemoveChildren();
}

protected override void Start()
protected void Start()
{
base.Start();

// Initialize all items for notice items
InitAllNotices();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,8 @@ protected override void Awake()
Mst.Events.AddListener(MstEventKeys.hidePlayersListView, OnHidePlayersListEventHandler);
}

protected override void Start()
protected void Start()
{
base.Start();

if (listContainer)
{
foreach (Transform t in listContainer)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ namespace MasterServerToolkit.Bridges.SqlSugar
{
public class AccountsDatabaseAccessorFactory : SqlSugarDatabaseAccessorFactory
{
#if (!UNITY_WEBGL && !UNITY_IOS) || UNITY_EDITOR
private AccountsDatabaseAccessor accessor;
#endif

private void OnDestroy()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ namespace MasterServerToolkit.Bridges.SqlSugar
{
public class ProfilesDatabaseAccessorFactory : SqlSugarDatabaseAccessorFactory
{
#if (!UNITY_WEBGL && !UNITY_IOS) || UNITY_EDITOR
private ProfilesDatabaseAccessor accessor;
#endif

private void OnDestroy()
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
using MasterServerToolkit.MasterServer;
using SqlSugar;
using UnityEngine;

#if (!UNITY_WEBGL && !UNITY_IOS) || UNITY_EDITOR
using SqlSugar;
#endif

namespace MasterServerToolkit.Bridges.SqlSugar
{
public class SqlSugarDatabaseAccessorFactory : DatabaseAccessorFactory
{
#region INSPECTOR

#if (!UNITY_WEBGL && !UNITY_IOS) || UNITY_EDITOR
[Header("Settings"), SerializeField]
protected string connectionString = "Server=localhost;Database=master_server_toolkit;Uid=root;Pwd=qazwsxedc123!@#;Port=3306;";
[SerializeField]
Expand All @@ -16,15 +20,19 @@ public class SqlSugarDatabaseAccessorFactory : DatabaseAccessorFactory
protected LanguageType language = LanguageType.English;
[SerializeField]
protected DbType dataProvider = DbType.MySql;
#endif

#endregion

#if (!UNITY_WEBGL && !UNITY_IOS) || UNITY_EDITOR
protected ConnectionConfig configuration;
#endif

protected override void Awake()
{
base.Awake();

#if (!UNITY_WEBGL && !UNITY_IOS) || UNITY_EDITOR
connectionString = Mst.Args.AsString(Mst.Args.Names.DatabaseConnectionString, connectionString);
autoCloseConnection = Mst.Args.AsBool(Mst.Args.Names.DatabaseAutoCloseConnection, autoCloseConnection);
language = Mst.Args.AsEnum(Mst.Args.Names.DatabaseLanguageType, language);
Expand All @@ -43,6 +51,7 @@ protected override void Awake()
//{
// logger.Info(sql);
//};
#endif
}

public override void CreateAccessors() { }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,8 @@ public class InventoryView : UIView

private readonly Dictionary<string, ItemUI> itemUis = new Dictionary<string, ItemUI>();

protected override void Start()
protected void Start()
{
base.Start();

DrawStoreOffers();
Mst.Client.Profiles.OnProfileLoadedEvent += Profiles_OnProfileLoadedEvent;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,8 @@ public class ProfileSettingsView : UIView

private DemoProfilesBehaviour profileBehaviour;

protected override void Start()
protected void Start()
{
base.Start();

profileBehaviour = FindObjectOfType<DemoProfilesBehaviour>();
profileBehaviour.OnProfileLoadedEvent.AddListener(OnProfileLoadedEventHandler);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,8 @@ public class ProfileView : UIView

private ProfileLoaderBehaviour profileLoader;

protected override void Start()
protected void Start()
{
base.Start();

profileLoader = FindObjectOfType<ProfileLoaderBehaviour>();
profileLoader.OnProfileLoadedEvent.AddListener(OnProfileLoadedEventHandler);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,51 +1,52 @@
keys;en;ru
;;
# Shared;;
unknownError;Unknown error. Please contact administrator;Неизвестная ошибка. Пожалуйста, свяжитесь с администратором
keys;ru;en;tr

# Shared
unknownError;Неизвестная ошибка. Пожалуйста, свяжитесь с администратором;Unknown error. Please contact the administrator;Bilinmeyen hata. Lütfen yöneticiyle iletişime geçin

# Scenes Manager
loadingScene;Loading scene... Please, wait;Загрузка сцены... Пожалуйста, подождите
;;
# User info;;
authStatusUnauthorized;Unauthorized;Не авторизован
;;
# Connection;;
connectionProgress;Connecting to master... Please wait.;Подключение с мастеру… Пожалуйста, подождите.
connectionLost;The connection to the server has been lost. Please try again or contact to the developers of the game or your internet provider.;Соединение с сервером было потеряно. Пожалуйста, попробуйте повторить его или обратитесь к администратору.
connectionStatusConnected;Client is connected to;Подключен к
connectionStatusConnecting;Client is connecting to;Подключение к
connectionStatusDisconnected;Client is offline;Нет подключения
;;
# Sign in;;
signInTokenExpired;The authentication token has expired;Срок действия токена входа в систему истек
signedInStatusOk;Already signed in;Вы уже вошли в систему
signedInStatusFail;You are not signed in yet;Вы еще не вошли в систему
signInProgress;Signing in... Please, wait.;Вход в систему. Пожалуйста, подождите
signInSuccessResult;You are successfully logged in as;Вы успешно вошли в систему
signInErrorResult;An error occurred while signing in:;Во время входа в систему произошла ошибка:
signInSecurityError;Failed to sign in due to security issues;Невозможно выполнить вход по соображениям безопасности
;;
# Sign up;;
signUpInProgress;Signing up is already in progress;Регистрация в процессе
signUpProgress;Signing up... Please wait.;Создание учетной записи. Пожалуйста, подождите
signUpSuccessResult;You have successfuly signed up. Now you may sign in;Вы успешно создали учетную запись, теперь можно войти в систему.
signUpErrorResult;An error occurred while signing up:;Во время создания учетной записи произошла ошибка:
signUpSecurityError;Failed to sign up due to security issues;Невозможно выполнить регистрацию по соображениям безопасности
;;
# Account confirmation;;
accountConfirmationProgress;Confirming your account... Please wait.;
accountConfirmationErrorResult;An error occurred while confirming yor account:;
confirmationCodeSendingProcess;Sending confirmation code... Please wait.;
confirmationCodeSendingSuccessResult;We have sent an email with confirmation code to your address.;
confirmationCodeSendingErrorResult;An error occurred while requesting confirmation code;
;;
# Account extra properties;;
accounSaveExtraSuccessResult;Account extra properties saved successfully;
accounSaveExtraErrorResult;Failed to save account properties;
;;
# Password reset;;
changePasswordProgress;Changing password... Please wait.;Смена пароля… Пожалуйста, подождите
changePasswordSuccessResult;You have successfuly changed your password. Now you can sign in.;
changePasswordErrorResult;An error occurred while changing password:;
changePasswordCodeProgress;Sending reset password code... Please wait.;
changePasswordCodeSuccessResult;We have sent an email with reset code to your address;
changePasswordCodeErrorResult;An error occurred while password reset code:;
loadingScene;Загрузка сцены... Пожалуйста, подождите;Loading scene... Please wait;Sahne yükleniyor... Lütfen bekleyin

# User info
authStatusUnauthorized;Не авторизован;Not authorized;Yetkili değil

# Connection
connectionProgress;Подключение с мастеру… Пожалуйста, подождите.;Connecting with the master... Please wait.;Master'a bağlanılıyor... Lütfen bekleyin.
connectionLost;Соединение с сервером было потеряно. Пожалуйста, попробуйте повторить его или обратитесь к администратору.;The connection to the server was lost. Please try again or contact your administrator.;Sunucuyla bağlantı kesildi. Lütfen tekrar deneyin veya yöneticinizle iletişime geçin.
connectionStatusConnected;Подключен к;Connected to;Bağlı
connectionStatusConnecting;Подключение к;Connecting to;Bağlantı
connectionStatusDisconnected;Нет подключения;No connection;Bağlantı yok

# Sign in
signInTokenExpired;Срок действия токена входа в систему истек;Login token has expired;Giriş jetonunun süresi doldu
signedInStatusOk;Вы уже вошли в систему;You are already logged in.;zaten giriş yaptınız
signedInStatusFail;Вы еще не вошли в систему;You are not logged in yet;Henüz giriş yapmadınız
signInProgress;Вход в систему. Пожалуйста, подождите;Login. Please wait;Giriş yapmak. Lütfen bekleyin
signInSuccessResult;Вы успешно вошли в систему;You have successfully logged in;Başarıyla giriş yaptınız
signInErrorResult;Во время входа в систему произошла ошибка:;An error occurred during login:;Oturum açma sırasında bir hata oluştu:
signInSecurityError;Невозможно выполнить вход по соображениям безопасности;Unable to sign in for security reasons;Güvenlik nedeniyle oturum açılamıyor

# Sign up
signUpInProgress;Регистрация в процессе;Registration in progress;Kayıt devam ediyor
signUpProgress;Создание учетной записи. Пожалуйста, подождите;Create an account. Please wait;Bir hesap oluşturun. Lütfen bekleyin
signUpSuccessResult;Вы успешно создали учетную запись, теперь можно войти в систему.;You have successfully created an account, you can now log in.;Başarıyla bir hesap oluşturdunuz, artık giriş yapabilirsiniz.
signUpErrorResult;Во время создания учетной записи произошла ошибка:;An error occurred during account creation:;Hesap oluşturma sırasında bir hata oluştu:
signUpSecurityError;Невозможно выполнить регистрацию по соображениям безопасности;Unable to register due to security reasons;Güvenlik nedeniyle kayıt yapılamıyor

# Account confirmation
accountConfirmationProgress;Подтверждение учетной записи… Пожалуйста, подождите.;Account confirmation... Please wait.;Hesap onayı... Lütfen bekleyin.
accountConfirmationErrorResult;Во время подтверждения учетной записи возникла ошибка:;An error occurred while confirming your account:;Hesabınız onaylanırken bir hata oluştu:
confirmationCodeSendingProcess;Отправляем код подтверждения… Пожалуйста, подождите.;We are sending a verification code... Please wait.;Doğrulama kodu gönderiyoruz... Lütfen bekleyin.
confirmationCodeSendingSuccessResult;Код подтверждения был отправлен на указанный вами адрес электронной почты;A verification code has been sent to the email address you provided.;Verdiğiniz e-posta adresine bir doğrulama kodu gönderildi.
confirmationCodeSendingErrorResult;Во время отправки кода подтверждения возникла ошибка:;An error occurred while sending the verification code:;Doğrulama kodu gönderilirken bir hata oluştu:

# Account extra properties
accounSaveExtraSuccessResult;Экстра свойства учетной записи были успешно сохранены;Extra account properties were successfully saved;Ekstra hesap özellikleri başarıyla kaydedildi
accounSaveExtraErrorResult;Невозможно сохранить свойства учетной записи;Unable to save account properties;Hesap özellikleri kaydedilemiyor

# Password reset
changePasswordProgress;Смена пароля… Пожалуйста, подождите;Changing password... Please wait;Şifre değiştiriliyor... Lütfen bekleyin
changePasswordSuccessResult;Вы успешно изменили свой пароль. Теперь вы можете войти в свою учетную запись;You have successfully changed your password. You can now log in to your account.;Şifrenizi başarıyla değiştirdiniz. Artık hesabınıza giriş yapabilirsiniz
changePasswordErrorResult;Во время смены пароля возникла ошибка:;An error occurred while changing the password:;Şifre değiştirilirken bir hata oluştu:
changePasswordCodeProgress;Отправляем код сброса пароля… Пожалуйста, подождите;We are sending a password reset code... Please wait;Şifre sıfırlama kodu gönderiyoruz... Lütfen bekleyin
changePasswordCodeSuccessResult;Код сброса пароля был отправлен на указанный вами адрес электронной почты;A password reset code has been sent to the email address you provided.;Belirttiğiniz e-posta adresine şifre sıfırlama kodu gönderildi.
changePasswordCodeErrorResult;Во время отправки кода сброса пароля возникла ошибка:;An error occurred while sending the password reset code:;Şifre sıfırlama kodu gönderilirken bir hata oluştu:
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
using System;

namespace MasterServerToolkit.MasterServer
namespace MasterServerToolkit.MasterServer
{
public class EventMessage : EventArgs
public class EventMessage
{
private object _data;
public static EventMessage Empty => new EventMessage();

public EventMessage() : this(new object()) { }

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public MstEventsChannel(string name, bool catchExceptions = false)
/// <returns></returns>
public bool Invoke(string eventName)
{
return Invoke(eventName, new EventMessage());
return Invoke(eventName, EventMessage.Empty);
}

/// <summary>
Expand Down
Loading

0 comments on commit f4f1083

Please sign in to comment.