oct

Assets/Script/CharacterSkin/CharacterSelection.cs

@@ -8,8 +8,8 @@ using UnityEngine.UI;
 public class CharacterSelection : MonoBehaviour
 {
 
-    public static string selectedCharJson = "";
-    public List<string> predefinedCharacterJsons;
+    [SerializeField] public static string selectedCharJson = "";
+    public List<CharacterDataSO> predefinedCharacterJsons;
     public List<Button> predefinedCharacterButtons;
 
     public static Action OnCharacterChanged;
@@ -28,13 +28,13 @@ public class CharacterSelection : MonoBehaviour
     public void LoadCharacterFromString(string characterData)
     {
         selectedCharJson = characterData;
-        OnCharacterChanged.Invoke();
+        OnCharacterChanged?.Invoke();
     }
 
     void OnPredefinedCharButtonPress(int i)
     {
-        selectedCharJson = predefinedCharacterJsons[i];
-        OnCharacterChanged.Invoke();
+        selectedCharJson = predefinedCharacterJsons[i].jsonCharData;
+        OnCharacterChanged?.Invoke();
         SaveCharacterSkinCloud();
     }
 
@@ -70,12 +70,12 @@ public class CharacterSelection : MonoBehaviour
         {
             LoadCharacterFromString(PlayerPrefs.GetString("skinData"));
         }
+
 #else
 
         FirebaseFirestore db = FirebaseFirestore.DefaultInstance;
         DocumentReference docRef = db.Collection("SkinData").Document(gplayAuth.userID);
-
-         docRef.GetSnapshotAsync().ContinueWithOnMainThread(task => {
+            docRef.GetSnapshotAsync().ContinueWithOnMainThread(task => {
                 DocumentSnapshot snapshot = task.Result;
                 if(snapshot.Exists){