|
|
@@ -631,28 +631,18 @@ public class OnlineDatabase : MonoBehaviour {
|
|
|
}
|
|
|
|
|
|
public List<UserName> GetUsersToInvite(string searchString) {
|
|
|
- string postUrl = "narkampen.nordh.xyz/narKampen/dbFiles/PlayerSearch.php?";
|
|
|
- postUrl += "search=" + UnityWebRequest.EscapeURL(searchString);
|
|
|
+ WWWForm form = new WWWForm();
|
|
|
+ form.AddField("searchString", UnityWebRequest.EscapeURL(searchString));
|
|
|
+ form.AddField("f", "PlayerSearch");
|
|
|
|
|
|
- UserNames uNames = new UserNames();
|
|
|
- UnityWebRequest www = UnityWebRequest.Get(postUrl);
|
|
|
- www.SendWebRequest();
|
|
|
+ String response = CallOnlineDatabaseWithResponse("PlayerSearch.php", form);
|
|
|
|
|
|
- if (www.isNetworkError || www.isHttpError) {
|
|
|
- Debug.Log(www.error);
|
|
|
- } else {
|
|
|
- while (!www.isDone) {
|
|
|
- }
|
|
|
- // Show result
|
|
|
- string jsonData = www.downloadHandler.text;
|
|
|
+ response = "{\"usernamesList\" : " + response + " }";
|
|
|
|
|
|
- if (!jsonData.Equals("")) {
|
|
|
- jsonData = "{\"usernamesList\" : " + jsonData + " }";
|
|
|
+ UserNames uNames = new UserNames();
|
|
|
+
|
|
|
+ JsonUtility.FromJsonOverwrite(response, uNames);
|
|
|
|
|
|
- JsonUtility.FromJsonOverwrite(jsonData, uNames);
|
|
|
- }
|
|
|
- }
|
|
|
- // TODO handle empty
|
|
|
return uNames.usernamesList;
|
|
|
}
|
|
|
|
|
|
@@ -703,16 +693,19 @@ public class OnlineDatabase : MonoBehaviour {
|
|
|
}
|
|
|
|
|
|
|
|
|
- internal List<string> FindRandomPlayer() {
|
|
|
+ internal List<UserName> FindRandomPlayer(int playerId) {
|
|
|
List<string> returnValue = new List<string>();
|
|
|
WWWForm form = new WWWForm();
|
|
|
- form.AddField("f", "FindRandomPlayer");
|
|
|
+ form.AddField("playerId", playerId);
|
|
|
+ form.AddField("f", "FindRandomPlayers");
|
|
|
|
|
|
- String response = CallOnlineDatabaseWithResponse("", form);
|
|
|
+ String response = CallOnlineDatabaseWithResponse("PlayerSearch.php", form);
|
|
|
|
|
|
- //TODO FIX ME
|
|
|
+ UserNames uNames = new UserNames();
|
|
|
|
|
|
- return returnValue;
|
|
|
+ JsonUtility.FromJsonOverwrite(response, uNames);
|
|
|
+
|
|
|
+ return uNames.usernamesList;
|
|
|
}
|
|
|
|
|
|
|