Merge pull request #171 from finol-digital/develop

Develop
finol-digital · Jan 23, 2025 · cf10cfe · cf10cfe
2 parents 51e47b2 + f2ca2e1
commit cf10cfe
Show file tree

Hide file tree

Showing 73 changed files with 2,105 additions and 218 deletions.
diff --git a/Assets/Plugins/FinolDigital.Cgs.CardGameDef.dll b/Assets/Plugins/FinolDigital.Cgs.CardGameDef.dll
diff --git a/Assets/Plugins/FinolDigital.Cgs.CardGameDef.dll.meta b/Assets/Plugins/FinolDigital.Cgs.CardGameDef.dll.meta
diff --git a/Assets/Plugins/FinolDigital.Cgs.Json.dll b/Assets/Plugins/FinolDigital.Cgs.Json.dll
diff --git a/Assets/Plugins/FinolDigital.Cgs.Json.dll.meta b/Assets/Plugins/FinolDigital.Cgs.Json.dll.meta
diff --git a/Assets/Scripts/Cgs/AotTypeEnforcer.cs b/Assets/Scripts/Cgs/AotTypeEnforcer.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
-using FinolDigital.Cgs.CardGameDef;
-using FinolDigital.Cgs.CardGameDef.Unity;
+using FinolDigital.Cgs.Json;
+using FinolDigital.Cgs.Json.Unity;
 using Newtonsoft.Json.Converters;
 using Newtonsoft.Json.Utilities;
 using UnityEngine;

diff --git a/Assets/Scripts/Cgs/CardGameManager.cs b/Assets/Scripts/Cgs/CardGameManager.cs
@@ -10,8 +10,8 @@
 using System.Runtime.CompilerServices;
 using System.Web;
 using Cgs.Menu;
-using FinolDigital.Cgs.CardGameDef;
-using FinolDigital.Cgs.CardGameDef.Unity;
+using FinolDigital.Cgs.Json;
+using FinolDigital.Cgs.Json.Unity;
 using JetBrains.Annotations;
 using UnityEngine;
 using UnityEngine.Events;
@@ -44,8 +44,6 @@ public class CardGameManager : MonoBehaviour
 
         public const string CardsLoadedMessage = "{0} cards loaded!";
         public const string CardsLoadingMessage = "{0} cards loading...";
-        public const string SetCardsLoadedMessage = "{0} set cards loaded!";
-        public const string SetCardsLoadingMessage = "{0} set cards loading...";
         public const string DeleteErrorMessage = "Error deleting game!: ";
         public const string DeleteWarningMessage = "Please download additional card games before deleting.";
 

diff --git a/Assets/Scripts/Cgs/CardGameView/Multiplayer/CardModel.cs b/Assets/Scripts/Cgs/CardGameView/Multiplayer/CardModel.cs
@@ -8,7 +8,7 @@
 using Cgs.Menu;
 using Cgs.Play;
 using Cgs.Play.Multiplayer;
-using FinolDigital.Cgs.CardGameDef.Unity;
+using FinolDigital.Cgs.Json.Unity;
 using JetBrains.Annotations;
 using Unity.Netcode;
 using UnityEngine;

diff --git a/Assets/Scripts/Cgs/CardGameView/Multiplayer/CardStack.cs b/Assets/Scripts/Cgs/CardGameView/Multiplayer/CardStack.cs
@@ -11,7 +11,7 @@
 using Cgs.Decks;
 using Cgs.Play;
 using Cgs.Play.Multiplayer;
-using FinolDigital.Cgs.CardGameDef.Unity;
+using FinolDigital.Cgs.Json.Unity;
 using JetBrains.Annotations;
 using Unity.Netcode;
 using UnityEngine;

diff --git a/Assets/Scripts/Cgs/CardGameView/Multiplayer/CardZone.cs b/Assets/Scripts/Cgs/CardGameView/Multiplayer/CardZone.cs
@@ -8,14 +8,14 @@
 using Cgs.Play;
 using Cgs.Play.Multiplayer;
 using Cgs.UI.ScrollRects;
-using FinolDigital.Cgs.CardGameDef;
+using FinolDigital.Cgs.Json;
 using Unity.Netcode;
 using UnityEngine;
 using UnityEngine.Events;
 using UnityEngine.EventSystems;
 using UnityEngine.UI;
 using UnityExtensionMethods;
-using CardAction = FinolDigital.Cgs.CardGameDef.CardAction;
+using CardAction = FinolDigital.Cgs.Json.CardAction;
 
 namespace Cgs.CardGameView.Multiplayer
 {

diff --git a/Assets/Scripts/Cgs/CardGameView/Viewer/CardActionPanel.cs b/Assets/Scripts/Cgs/CardGameView/Viewer/CardActionPanel.cs
@@ -16,17 +16,17 @@ namespace Cgs.CardGameView.Viewer
 
     public class CardActionPanel : MonoBehaviour
     {
-        public static IReadOnlyDictionary<FinolDigital.Cgs.CardGameDef.CardAction, CardAction> CardActionDictionary =>
-            _cardActionDictionary ??= new Dictionary<FinolDigital.Cgs.CardGameDef.CardAction, CardAction>
+        public static IReadOnlyDictionary<FinolDigital.Cgs.Json.CardAction, CardAction> CardActionDictionary =>
+            _cardActionDictionary ??= new Dictionary<FinolDigital.Cgs.Json.CardAction, CardAction>
             {
-                [FinolDigital.Cgs.CardGameDef.CardAction.Move] = Move,
-                [FinolDigital.Cgs.CardGameDef.CardAction.Rotate] = Rotate,
-                [FinolDigital.Cgs.CardGameDef.CardAction.Tap] = Tap,
-                [FinolDigital.Cgs.CardGameDef.CardAction.Flip] = Flip,
-                [FinolDigital.Cgs.CardGameDef.CardAction.Discard] = Discard
+                [FinolDigital.Cgs.Json.CardAction.Move] = Move,
+                [FinolDigital.Cgs.Json.CardAction.Rotate] = Rotate,
+                [FinolDigital.Cgs.Json.CardAction.Tap] = Tap,
+                [FinolDigital.Cgs.Json.CardAction.Flip] = Flip,
+                [FinolDigital.Cgs.Json.CardAction.Discard] = Discard
             };
 
-        private static Dictionary<FinolDigital.Cgs.CardGameDef.CardAction, CardAction> _cardActionDictionary;
+        private static Dictionary<FinolDigital.Cgs.Json.CardAction, CardAction> _cardActionDictionary;
 
         public Button moveButton;
         public Button rotateButton;

diff --git a/Assets/Scripts/Cgs/CardGameView/Viewer/CardViewer.cs b/Assets/Scripts/Cgs/CardGameView/Viewer/CardViewer.cs
@@ -5,8 +5,8 @@
 using System.Collections.Generic;
 using Cgs.CardGameView.Multiplayer;
 using Cgs.Play;
-using FinolDigital.Cgs.CardGameDef;
-using FinolDigital.Cgs.CardGameDef.Unity;
+using FinolDigital.Cgs.Json;
+using FinolDigital.Cgs.Json.Unity;
 using JetBrains.Annotations;
 using UnityEngine;
 using UnityEngine.EventSystems;

diff --git a/Assets/Scripts/Cgs/CardGameView/Viewer/StackViewer.cs b/Assets/Scripts/Cgs/CardGameView/Viewer/StackViewer.cs
@@ -7,7 +7,7 @@
 using Cgs.CardGameView.Multiplayer;
 using Cgs.Play;
 using Cgs.Play.Multiplayer;
-using FinolDigital.Cgs.CardGameDef.Unity;
+using FinolDigital.Cgs.Json.Unity;
 using JetBrains.Annotations;
 using UnityEngine;
 using UnityEngine.EventSystems;

diff --git a/Assets/Scripts/Cgs/Cards/CardDeletionManager.cs b/Assets/Scripts/Cgs/Cards/CardDeletionManager.cs
@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 using Cgs.CardGameView.Viewer;
-using FinolDigital.Cgs.CardGameDef;
+using FinolDigital.Cgs.Json;
 using JetBrains.Annotations;
 using UnityEngine;
 using UnityEngine.UI;

diff --git a/Assets/Scripts/Cgs/Cards/CardEditorMenu.cs b/Assets/Scripts/Cgs/Cards/CardEditorMenu.cs
@@ -8,8 +8,8 @@
 using System.IO;
 using System.Linq;
 using Cgs.Menu;
-using FinolDigital.Cgs.CardGameDef;
-using FinolDigital.Cgs.CardGameDef.Unity;
+using FinolDigital.Cgs.Json;
+using FinolDigital.Cgs.Json.Unity;
 using JetBrains.Annotations;
 using SFB;
 using TMPro;

diff --git a/Assets/Scripts/Cgs/Cards/CardSearchMenu.cs b/Assets/Scripts/Cgs/Cards/CardSearchMenu.cs
@@ -5,8 +5,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using Cgs.Menu;
-using FinolDigital.Cgs.CardGameDef;
-using FinolDigital.Cgs.CardGameDef.Unity;
+using FinolDigital.Cgs.Json;
+using FinolDigital.Cgs.Json.Unity;
 using JetBrains.Annotations;
 using UnityEngine;
 using UnityEngine.UI;

diff --git a/Assets/Scripts/Cgs/Cards/SearchResults.cs b/Assets/Scripts/Cgs/Cards/SearchResults.cs
@@ -5,7 +5,7 @@
 using System.Collections.Generic;
 using Cgs.CardGameView.Multiplayer;
 using Cgs.CardGameView.Viewer;
-using FinolDigital.Cgs.CardGameDef.Unity;
+using FinolDigital.Cgs.Json.Unity;
 using JetBrains.Annotations;
 using UnityEngine;
 using UnityEngine.UI;

diff --git a/Assets/Scripts/Cgs/Cards/SetImportMenu.cs b/Assets/Scripts/Cgs/Cards/SetImportMenu.cs
@@ -8,7 +8,7 @@
 using System.IO;
 using System.Linq;
 using Cgs.Menu;
-using FinolDigital.Cgs.CardGameDef.Unity;
+using FinolDigital.Cgs.Json.Unity;
 using JetBrains.Annotations;
 using SimpleFileBrowser;
 using TMPro;

diff --git a/Assets/Scripts/Cgs/Cgs.asmdef b/Assets/Scripts/Cgs/Cgs.asmdef
@@ -24,7 +24,7 @@
     "allowUnsafeCode": false,
     "overrideReferences": true,
     "precompiledReferences": [
-        "FinolDigital.Cgs.CardGameDef.dll",
+        "FinolDigital.Cgs.Json.dll",
         "Newtonsoft.Json.dll"
     ],
     "autoReferenced": false,

diff --git a/Assets/Scripts/Cgs/Decks/DeckEditor.cs b/Assets/Scripts/Cgs/Decks/DeckEditor.cs
@@ -11,8 +11,8 @@
 using Cgs.CardGameView.Viewer;
 using Cgs.Cards;
 using Cgs.Menu;
-using FinolDigital.Cgs.CardGameDef;
-using FinolDigital.Cgs.CardGameDef.Unity;
+using FinolDigital.Cgs.Json;
+using FinolDigital.Cgs.Json.Unity;
 using JetBrains.Annotations;
 using UnityEngine;
 using UnityEngine.EventSystems;

diff --git a/Assets/Scripts/Cgs/Decks/DeckLoadMenu.cs b/Assets/Scripts/Cgs/Decks/DeckLoadMenu.cs
@@ -9,8 +9,8 @@
 using System.Linq;
 using Cgs.Menu;
 using Cgs.UI;
-using FinolDigital.Cgs.CardGameDef;
-using FinolDigital.Cgs.CardGameDef.Unity;
+using FinolDigital.Cgs.Json;
+using FinolDigital.Cgs.Json.Unity;
 using JetBrains.Annotations;
 using TMPro;
 using UnityEngine;

diff --git a/Assets/Scripts/Cgs/Decks/DeckSaveMenu.cs b/Assets/Scripts/Cgs/Decks/DeckSaveMenu.cs
@@ -5,8 +5,8 @@
 using System;
 using System.IO;
 using Cgs.Menu;
-using FinolDigital.Cgs.CardGameDef;
-using FinolDigital.Cgs.CardGameDef.Unity;
+using FinolDigital.Cgs.Json;
+using FinolDigital.Cgs.Json.Unity;
 using JetBrains.Annotations;
 using TMPro;
 using UnityEngine;

diff --git a/Assets/Scripts/Cgs/Menu/CardGameEditorMenu.cs b/Assets/Scripts/Cgs/Menu/CardGameEditorMenu.cs
@@ -8,8 +8,8 @@
 using System.Globalization;
 using System.IO;
 using System.Linq;
-using FinolDigital.Cgs.CardGameDef;
-using FinolDigital.Cgs.CardGameDef.Unity;
+using FinolDigital.Cgs.Json;
+using FinolDigital.Cgs.Json.Unity;
 using JetBrains.Annotations;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;

diff --git a/Assets/Scripts/Cgs/Menu/CgsGamesBrowser.cs b/Assets/Scripts/Cgs/Menu/CgsGamesBrowser.cs
@@ -6,7 +6,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Cgs.UI;
-using FinolDigital.Cgs.CardGameDef.Unity;
+using FinolDigital.Cgs.Json.Unity;
 using JetBrains.Annotations;
 using Newtonsoft.Json;
 using UnityEngine;

diff --git a/Assets/Scripts/Cgs/Menu/ProgressBar.cs b/Assets/Scripts/Cgs/Menu/ProgressBar.cs
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-using FinolDigital.Cgs.CardGameDef.Unity;
+using FinolDigital.Cgs.Json.Unity;
 using UnityEngine;
 using UnityEngine.UI;
 

diff --git a/Assets/Scripts/Cgs/Play/Drawer/CardDrawer.cs b/Assets/Scripts/Cgs/Play/Drawer/CardDrawer.cs
@@ -8,7 +8,7 @@
 using Cgs.CardGameView.Multiplayer;
 using Cgs.CardGameView.Viewer;
 using Cgs.Play.Multiplayer;
-using FinolDigital.Cgs.CardGameDef.Unity;
+using FinolDigital.Cgs.Json.Unity;
 using JetBrains.Annotations;
 using UnityEngine;
 using UnityEngine.UI;

diff --git a/Assets/Scripts/Cgs/Play/Drawer/DrawerViewer.cs b/Assets/Scripts/Cgs/Play/Drawer/DrawerViewer.cs
@@ -7,7 +7,7 @@
 using Cgs.CardGameView.Multiplayer;
 using Cgs.CardGameView.Viewer;
 using Cgs.Play.Multiplayer;
-using FinolDigital.Cgs.CardGameDef.Unity;
+using FinolDigital.Cgs.Json.Unity;
 using UnityEngine;
 
 namespace Cgs.Play.Drawer

diff --git a/Assets/Scripts/Cgs/Play/Drawer/HandDealer.cs b/Assets/Scripts/Cgs/Play/Drawer/HandDealer.cs
@@ -4,7 +4,7 @@
 
 using Cgs.Menu;
 using Cgs.Play.Multiplayer;
-using FinolDigital.Cgs.CardGameDef;
+using FinolDigital.Cgs.Json;
 using JetBrains.Annotations;
 using UnityEngine.Events;
 using UnityEngine.UI;

diff --git a/Assets/Scripts/Cgs/Play/Multiplayer/CgsNetPlayer.cs b/Assets/Scripts/Cgs/Play/Multiplayer/CgsNetPlayer.cs
@@ -8,8 +8,8 @@
 using System.Linq;
 using Cgs.CardGameView.Multiplayer;
 using Cgs.Play.Drawer;
-using FinolDigital.Cgs.CardGameDef;
-using FinolDigital.Cgs.CardGameDef.Unity;
+using FinolDigital.Cgs.Json;
+using FinolDigital.Cgs.Json.Unity;
 using Unity.Netcode;
 using UnityEngine;
 

diff --git a/Assets/Scripts/Cgs/Play/PlayController.cs b/Assets/Scripts/Cgs/Play/PlayController.cs
@@ -17,15 +17,15 @@
 using Cgs.Play.Drawer;
 using Cgs.Play.Multiplayer;
 using Cgs.UI.ScrollRects;
-using FinolDigital.Cgs.CardGameDef;
-using FinolDigital.Cgs.CardGameDef.Unity;
+using FinolDigital.Cgs.Json;
+using FinolDigital.Cgs.Json.Unity;
 using JetBrains.Annotations;
 using Unity.Netcode;
 using UnityEngine;
 using UnityEngine.SceneManagement;
 using UnityEngine.UI;
 using UnityExtensionMethods;
-using CardAction = FinolDigital.Cgs.CardGameDef.CardAction;
+using CardAction = FinolDigital.Cgs.Json.CardAction;
 
 namespace Cgs.Play
 {

diff --git a/...s/FinolDigital.Cgs.CardGameDef.Unity.meta → .../Scripts/FinolDigital.Cgs.Json.Unity.meta b/...s/FinolDigital.Cgs.CardGameDef.Unity.meta → .../Scripts/FinolDigital.Cgs.Json.Unity.meta
diff --git a/...lDigital.Cgs.CardGameDef.Unity/CgsGame.cs → ...ts/FinolDigital.Cgs.Json.Unity/CgsGame.cs b/...lDigital.Cgs.CardGameDef.Unity/CgsGame.cs → ...ts/FinolDigital.Cgs.Json.Unity/CgsGame.cs
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-namespace FinolDigital.Cgs.CardGameDef.Unity
+namespace FinolDigital.Cgs.Json.Unity
 {
     public struct CgsGame
     {

diff --git a/...tal.Cgs.CardGameDef.Unity/CgsGame.cs.meta → ...nolDigital.Cgs.Json.Unity/CgsGame.cs.meta b/...tal.Cgs.CardGameDef.Unity/CgsGame.cs.meta → ...nolDigital.Cgs.Json.Unity/CgsGame.cs.meta
diff --git a/...FinolDigital.Cgs.CardGameDef.Unity.asmdef → ....Unity/FinolDigital.Cgs.Json.Unity.asmdef b/...FinolDigital.Cgs.CardGameDef.Unity.asmdef → ....Unity/FinolDigital.Cgs.Json.Unity.asmdef
@@ -1,5 +1,5 @@
 {
-    "name": "FinolDigital.Cgs.CardGameDef.Unity",
+    "name": "FinolDigital.Cgs.Json.Unity",
     "rootNamespace": "",
     "references": [
         "GUID:d7528a878641bff40a1fd2651047d55f",
@@ -10,7 +10,7 @@
     "allowUnsafeCode": false,
     "overrideReferences": false,
     "precompiledReferences": [
-        "FinolDigital.Cgs.CardGameDef.dll",
+        "FinolDigital.Cgs.Json.dll",
         "Newtonsoft.Json.dll"
     ],
     "autoReferenced": false,

diff --git a/...Digital.Cgs.CardGameDef.Unity.asmdef.meta → ...y/FinolDigital.Cgs.Json.Unity.asmdef.meta b/...Digital.Cgs.CardGameDef.Unity.asmdef.meta → ...y/FinolDigital.Cgs.Json.Unity.asmdef.meta
diff --git a/...tal.Cgs.CardGameDef.Unity/ICardDisplay.cs → ...nolDigital.Cgs.Json.Unity/ICardDisplay.cs b/...tal.Cgs.CardGameDef.Unity/ICardDisplay.cs → ...nolDigital.Cgs.Json.Unity/ICardDisplay.cs
@@ -4,7 +4,7 @@
 
 using UnityEngine;
 
-namespace FinolDigital.Cgs.CardGameDef.Unity
+namespace FinolDigital.Cgs.Json.Unity
 {
     public interface ICardDisplay
     {

diff --git a/...gs.CardGameDef.Unity/ICardDisplay.cs.meta → ...gital.Cgs.Json.Unity/ICardDisplay.cs.meta b/...gs.CardGameDef.Unity/ICardDisplay.cs.meta → ...gital.Cgs.Json.Unity/ICardDisplay.cs.meta
diff --git a/...gs.CardGameDef.Unity/ImageQueueService.cs → ...gital.Cgs.Json.Unity/ImageQueueService.cs b/...gs.CardGameDef.Unity/ImageQueueService.cs → ...gital.Cgs.Json.Unity/ImageQueueService.cs
@@ -8,7 +8,7 @@
 using UnityEngine;
 using UnityExtensionMethods;
 
-namespace FinolDigital.Cgs.CardGameDef.Unity
+namespace FinolDigital.Cgs.Json.Unity
 {
     public class ImageQueueService
     {

diff --git a/...rdGameDef.Unity/ImageQueueService.cs.meta → ....Cgs.Json.Unity/ImageQueueService.cs.meta b/...rdGameDef.Unity/ImageQueueService.cs.meta → ....Cgs.Json.Unity/ImageQueueService.cs.meta
diff --git a/...igital.Cgs.CardGameDef.Unity/UnityCard.cs → .../FinolDigital.Cgs.Json.Unity/UnityCard.cs b/...igital.Cgs.CardGameDef.Unity/UnityCard.cs → .../FinolDigital.Cgs.Json.Unity/UnityCard.cs
@@ -7,7 +7,7 @@
 using UnityExtensionMethods;
 using Object = UnityEngine.Object;
 
-namespace FinolDigital.Cgs.CardGameDef.Unity
+namespace FinolDigital.Cgs.Json.Unity
 {
     public class UnityCard : Card
     {

diff --git a/...l.Cgs.CardGameDef.Unity/UnityCard.cs.meta → ...lDigital.Cgs.Json.Unity/UnityCard.cs.meta b/...l.Cgs.CardGameDef.Unity/UnityCard.cs.meta → ...lDigital.Cgs.Json.Unity/UnityCard.cs.meta