Merge branch 'master' of git.moenext.com:sherry_chaos/mdpro3

Assets/AddressableAssetsData/AddressableAssetSettings.asset

@@ -15,7 +15,7 @@ MonoBehaviour:
   m_DefaultGroup: ca8b8e6916019834fb0ec5578fa0be37
   m_currentHash:
     serializedVersion: 2
-    Hash: a7787d5667f17613de3b1b0e88584bac
+    Hash: 00000000000000000000000000000000
   m_OptimizeCatalogSize: 0
   m_BuildRemoteCatalog: 0
   m_CatalogRequestsTimeout: 0

Assets/DefaultVolumeProfile.asset

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d7fd9488000d3734a9e00ee676215985, type: 3}
+  m_Name: DefaultVolumeProfile
+  m_EditorClassIdentifier: 
+  components: []

Assets/DefaultVolumeProfile.asset.meta

+fileFormatVersion: 2
+guid: 408925b80137a284f8f37fb36e5f996e
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scenes/ABRobber.unity

@@ -536,6 +536,10 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   text: {fileID: 1398959084}
   input: {fileID: 1775272994}
+  mode_Window: 0
+  mode_Android: 0
+  mode_IOS: 1
+  fullCopy: 0
 --- !u!114 &916768208
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Scripts/MDPro3/Program.cs

@@ -95,10 +95,11 @@ namespace MDPro3
         public static Program instance;
         public static Items items;
 
-        List<Manager> managers = new List<Manager>();
-        List<Servant.Servant> servants = new List<Servant.Servant>();
+        private readonly List<Manager> managers = new();
+        private readonly List<Servant.Servant> servants = new();
+        public static bool exitOnReturn = false;
 
-        void Initialize()
+        private void Initialize()
         {
             if (!Directory.Exists(PATH_DATA))
                 Directory.CreateDirectory(PATH_DATA);
@@ -125,7 +126,6 @@ namespace MDPro3
             BanlistManager.Initialize();
             InitializeAllManagers();
             InitializeAllServants();
-            ReadParams();
 
             var handle = Addressables.InstantiateAsync("Prefab/CardRenderer.prefab");
             handle.Completed += (result) =>
@@ -135,31 +135,30 @@ namespace MDPro3
             };
         }
 
-        public static bool exitOnReturn = false;
-        void ReadParams()
+        public void ReadParams()
         {
             var args = Environment.GetCommandLineArgs();
-            //args = new string[2]
+            //args = new string[11]
             //{
-            //    //"-r",
-            //    //"TURN023"
+                //"-r",
+                //"TURN023"
 
-            //    //"-s",
-            //    //"6ace for win!"
+                //"-s",
+                //"6ace for win!"
 
             //    "-d",
             //    "LL铁兽",
 
-            //    //"-n",
-            //    //"赤子奈落",
+            //    "-n",
+            //    "赤子奈落",
 
-            //    //"-h",
-            //    //"mygo.superpre.pro",
-            //    //"-p",
-            //    //"888",
-            //    //"-w",
-            //    //"M#1008611",
-            //    //"-j"
+            //    "-h",
+            //    "mygo.superpre.pro",
+            //    "-p",
+            //    "888",
+            //    "-w",
+            //    "M#1008611",
+            //    "-j"
             //};
 
             string nick = null;
@@ -245,6 +244,7 @@ namespace MDPro3
             foreach (Manager manager in managers)
                 manager.Initialize();
         }
+
         private void InitializeAllServants()
         {
             servants.Add(setting);
@@ -280,7 +280,7 @@ namespace MDPro3
         public const string PATH_TEMP_FOLDER = "TempFolder/";
         public static string root = PATH_ROOT_WINDOWS64;
 
-        void Awake()
+        private void Awake()
         {
 #if UNITY_ANDROID
             root = PATH_ROOT_ANDROID;
@@ -311,12 +311,12 @@ namespace MDPro3
                 Time.timeScale = value;
             }
         }
-        float m_TimeScale = 1f;
+        private float m_TimeScale = 1f;
 #if UNITY_EDITOR
         public float timeScaleForEditor = 1;
 #endif
 
-        void Update()
+        private void Update()
         {
             TcpHelper.PerFrameFunction();
             foreach (Manager manager in managers) 
@@ -337,8 +337,10 @@ namespace MDPro3
                 StartCoroutine(gc);
             }
         }
-        IEnumerator gc;
-        IEnumerator UnloadUnusedAssetsAsync()
+
+        private IEnumerator gc;
+
+        private IEnumerator UnloadUnusedAssetsAsync()
         {
             var unload = Resources.UnloadUnusedAssets();
             while (!unload.isDone)

Assets/Scripts/MDPro3/Servant/Appearance.cs

@@ -484,6 +484,9 @@ namespace MDPro3.Servant
             #endregion
 
             loaded = true;
+
+            if(Program.instance.currentServant == Program.instance.room)
+                Program.instance.room.Realize();
         }
 
 

Assets/Scripts/MDPro3/Servant/MainMenu.cs

+using MDPro3.Net;
+using MDPro3.UI;
+using MDPro3.UI.ServantUI;
 using System.Collections;
 using System.Collections.Generic;
+using System.IO;
 using UnityEngine;
 using UnityEngine.Networking;
-using System.IO;
-using MDPro3.Net;
-using MDPro3.UI;
-using UnityEngine.EventSystems;
-using MDPro3.UI.ServantUI;
 
 namespace MDPro3.Servant
 {
@@ -53,6 +52,8 @@ namespace MDPro3.Servant
             base.FirstLoadEvent();
             servantUI.ResetUI();
             StartCoroutine(LoadMyCardNewsAsync());
+
+            Program.instance.ReadParams();
         }
 
         protected override void ApplyShowArrangement(int preDepth)

Assets/Scripts/MDPro3/Servant/ReplaySelector.cs

@@ -66,7 +66,7 @@ namespace MDPro3.Servant
             if (servantUI == null)
             {
                 this.replayName = replayName;
-                LoadUI();
+                Program.instance.ShiftToServant(this);
             }
             else
                 GetUI<ReplaySelectorUI>().KF_Replay(replayName);

Assets/Scripts/MDPro3/Servant/RoomServant.cs

@@ -203,7 +203,7 @@ namespace MDPro3.Servant
             Program.instance.ShiftToServant(Program.instance.ocgcore);
         }
 
-        private void Realize()
+        public void Realize()
         {
             if (servantUI == null)
                 return;
@@ -304,7 +304,6 @@ namespace MDPro3.Servant
                             break;
                     }
                     tasks.Add(task);
-                    Debug.Log("add");
                     UIManager.ShowPopupConfirm(tasks);
                     break;
                 case 3:
@@ -410,6 +409,7 @@ namespace MDPro3.Servant
 
             for (int i = 0; i < 4; i++)
                 players[i] = null;
+
             Program.instance.ShiftToServant(Program.instance.room);
         }
 

Assets/Scripts/MDPro3/UI/ServantUI/RoomServantUI.cs

@@ -143,7 +143,11 @@ namespace MDPro3.UI.ServantUI
             TextRoomInfo.text = roomInfo;
 
             if (!Appearance.loaded)
+            {
+                foreach(var rp in roomPlayers)
+                    rp.gameObject.SetActive(false);
                 return;
+            }
 
             for (int i = 0; i < 4; i++)
             {

Assets/Scripts/Tools/AssetBundleRobber.cs

@@ -18,6 +18,12 @@ public class AssetBundleRobber : MonoBehaviour
     private static Text sText;
     public TMP_InputField input;
 
+    public bool mode_Window = true;
+    public bool mode_Android = false;
+    public bool mode_IOS = false;
+
+    public bool fullCopy;
+
     private string pathAB;
     private string pathStore;
 
@@ -37,7 +43,6 @@ public class AssetBundleRobber : MonoBehaviour
     private int count = 0;
     private AssetStudio.AssetsManager assetManager;
 
-    private bool fullCopy;
     private readonly int threads = 32;
     private AssetType copyAssetType = AssetType.All;
 
@@ -65,17 +70,21 @@ public class AssetBundleRobber : MonoBehaviour
 
         Application.targetFrameRate = 0;
 
-        pathAB = PATH_AB_WINDOWS;
-        pathStore = PATH_STORE_WINDOWS;
-
+        if (mode_Android)
+        {
             pathAB = PATH_AB_ANDROID;
             pathStore = PATH_STORE_ANDROID;
-
-        //pathAB = PATH_AB_IOS;
-        //pathStore = PATH_STORE_IOS;
-
-        //fullCopy = true;
-        fullCopy = false;
+        }
+        else if (mode_IOS)
+        {
+            pathAB = PATH_AB_IOS;
+            pathStore = PATH_STORE_IOS;
+        }
+        else
+        {
+            pathAB = PATH_AB_WINDOWS;
+            pathStore = PATH_STORE_WINDOWS;
+        }
 
         copyAssetType = AssetType.All;
 

Assets/Tools/AssetStudio/AssetStudio.csproj.meta

+fileFormatVersion: 2
+guid: 138cc67ebafd7a74face7773ba172dbc
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/UniversalRenderPipelineGlobalSettings.asset.meta

+fileFormatVersion: 2
+guid: 0f8e2b9e397a0484d80e2a712e82b4ab
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ProjectSettings/GraphicsSettings.asset

@@ -58,7 +58,7 @@ GraphicsSettings:
   m_FogKeepExp2: 1
   m_AlbedoSwatchInfos: []
   m_RenderPipelineGlobalSettingsMap:
-    UnityEngine.Rendering.Universal.UniversalRenderPipeline: {fileID: 11400000, guid: 69e955d6c02fa954ea8deabaf466ae56, type: 2}
+    UnityEngine.Rendering.Universal.UniversalRenderPipeline: {fileID: 11400000, guid: 0f8e2b9e397a0484d80e2a712e82b4ab, type: 2}
   m_LightsUseLinearIntensity: 0
   m_LightsUseColorTemperature: 1
   m_LogWhenShaderIsCompiled: 0