Merge remote-tracking branch 'origin/master'

.vscode/tasks.json

@@ -0,0 +1,41 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "build",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "build",
+                "${workspaceFolder}/Assembly-CSharp.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "publish",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "publish",
+                "${workspaceFolder}/Assembly-CSharp.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "watch",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "watch",
+                "run",
+                "--project",
+                "${workspaceFolder}/Assembly-CSharp.csproj"
+            ],
+            "problemMatcher": "$msCompile"
+        }
+    ]
+}

Assembly-CSharp-Editor.csproj

@@ -41,8 +41,9 @@
     <ImplicitlyExpandDesignTimeFacades>false</ImplicitlyExpandDesignTimeFacades>
   </PropertyGroup>
   <ItemGroup>
-     <Compile Include="Assets/TutorialInfo/Scripts/Editor/ReadmeEditor.cs" />
      <Compile Include="Assets/Editor/BatchGenerateBoxColliders.cs" />
+     <Compile Include="Assets/TutorialInfo/Scripts/Editor/ReadmeEditor.cs" />
+     <Compile Include="Assets/Editor/DropdownDrawer.cs" />
      <Folder Include="Assets/TutorialInfo/Scripts/Editor" />
      <Folder Include="Assets/Editor" />
      <Folder Include="Assets/Editor/com.unity.mobile.notifications" />
@@ -316,6 +317,9 @@
      <Reference Include="Unity.VisualScripting.YamlDotNet">
      <HintPath>/Users/heyixian/code/cock/cockClient2/Library/PackageCache/com.unity.visualscripting@1.8.0/Editor/VisualScripting.Core/Dependencies/YamlDotNet/Unity.VisualScripting.YamlDotNet.dll</HintPath>
      </Reference>
+     <Reference Include="DOTweenEditor">
+     <HintPath>/Users/heyixian/code/cock/cockClient2/Assets/Plugins/Demigiant/DOTween/Editor/DOTweenEditor.dll</HintPath>
+     </Reference>
      <Reference Include="Unity.Burst.Cecil.Mdb">
      <HintPath>/Users/heyixian/code/cock/cockClient2/Library/PackageCache/com.unity.burst@1.8.2/Unity.Burst.CodeGen/Unity.Burst.Cecil.Mdb.dll</HintPath>
      </Reference>
@@ -340,18 +344,15 @@
      <Reference Include="Unity.Burst.Cecil.Rocks">
      <HintPath>/Users/heyixian/code/cock/cockClient2/Library/PackageCache/com.unity.burst@1.8.2/Unity.Burst.CodeGen/Unity.Burst.Cecil.Rocks.dll</HintPath>
      </Reference>
+     <Reference Include="DOTween">
+     <HintPath>/Users/heyixian/code/cock/cockClient2/Assets/Plugins/Demigiant/DOTween/DOTween.dll</HintPath>
+     </Reference>
      <Reference Include="Unity.VisualScripting.Antlr3.Runtime">
      <HintPath>/Users/heyixian/code/cock/cockClient2/Library/PackageCache/com.unity.visualscripting@1.8.0/Runtime/VisualScripting.Flow/Dependencies/NCalc/Unity.VisualScripting.Antlr3.Runtime.dll</HintPath>
      </Reference>
      <Reference Include="Newtonsoft.Json">
      <HintPath>/Users/heyixian/code/cock/cockClient2/Library/PackageCache/com.unity.nuget.newtonsoft-json@3.0.2/Runtime/Newtonsoft.Json.dll</HintPath>
      </Reference>
-     <Reference Include="DOTweenEditor">
-     <HintPath>/Users/heyixian/code/cock/cockClient2/Assets/Plugins/Demigiant/DOTween/Editor/DOTweenEditor.dll</HintPath>
-     </Reference>
-     <Reference Include="DOTween">
-     <HintPath>/Users/heyixian/code/cock/cockClient2/Assets/Plugins/Demigiant/DOTween/DOTween.dll</HintPath>
-     </Reference>
      <Reference Include="nunit.framework">
      <HintPath>/Users/heyixian/code/cock/cockClient2/Library/PackageCache/com.unity.ext.nunit@1.0.6/net35/unity-custom/nunit.framework.dll</HintPath>
      </Reference>

Assembly-CSharp.csproj

@@ -41,134 +41,199 @@
     <ImplicitlyExpandDesignTimeFacades>false</ImplicitlyExpandDesignTimeFacades>
   </PropertyGroup>
   <ItemGroup>
-     <Compile Include="Assets/Scripts/UI/CockUIItemComp.cs" />
+     <Compile Include="Assets/Scripts/UI/Hall/CockUIItemComp.cs" />
+     <Compile Include="Assets/Scripts/UI/Hall/MarketPageComp.cs" />
+     <Compile Include="Assets/Scripts/Game/GameState.cs" />
      <Compile Include="Assets/Scripts/Game/ICockController.cs" />
      <Compile Include="Assets/TextMesh Pro/Examples &amp; Extras/Scripts/SkewTextExample.cs" />
      <Compile Include="Assets/TextMesh Pro/Examples &amp; Extras/Scripts/SimpleScript.cs" />
      <Compile Include="Assets/Scripts/HttpApi/SendMsgObj.cs" />
+     <Compile Include="Assets/Scripts/UI/Common/StarComp.cs" />
+     <Compile Include="Assets/Scripts/Game/GameEndState.cs" />
+     <Compile Include="Assets/Scripts/Game/GameBattleState.cs" />
+     <Compile Include="Assets/Scripts/Game/AnimatorMasterController.cs" />
      <Compile Include="Assets/Scripts/Comp/CockActionComp.cs" />
      <Compile Include="Assets/Scripts/Game/AnimatorCockController.cs" />
      <Compile Include="Assets/TextMesh Pro/Examples &amp; Extras/Scripts/Benchmark01_UGUI.cs" />
+     <Compile Include="Assets/Scripts/UI/BattleRequest/BqItemComp.cs" />
      <Compile Include="Assets/Scripts/HttpApi/AbsMsgObj.cs" />
+     <Compile Include="Assets/Scripts/Comp/MasterActionComp.cs" />
      <Compile Include="Assets/TextMesh Pro/Examples &amp; Extras/Scripts/TMP_TextSelector_A.cs" />
+     <Compile Include="Assets/Scripts/UI/manager/UserManager.cs" />
      <Compile Include="Assets/Scripts/Comp/BattleMainComp.cs" />
      <Compile Include="Assets/TextMesh Pro/Examples &amp; Extras/Scripts/VertexShakeA.cs" />
+     <Compile Include="Assets/Scripts/Message/MessageTypes.cs" />
      <Compile Include="Assets/TextMesh Pro/Examples &amp; Extras/Scripts/Benchmark04.cs" />
      <Compile Include="Assets/Scripts/Game/AppCore.cs" />
+     <Compile Include="Assets/Scripts/Api/ModelApiResponse.cs" />
      <Compile Include="Assets/TextMesh Pro/Examples &amp; Extras/Scripts/ChatController.cs" />
      <Compile Include="Assets/TextMesh Pro/Examples &amp; Extras/Scripts/TextMeshProFloatingText.cs" />
      <Compile Include="Assets/Scripts/HttpApi/Api.cs" />
+     <Compile Include="Assets/Scripts/UI/Common/TipsComp.cs" />
      <Compile Include="Assets/TextMesh Pro/Examples &amp; Extras/Scripts/VertexShakeB.cs" />
+     <Compile Include="Assets/Scripts/Api/Constants.cs" />
      <Compile Include="Assets/TextMesh Pro/Examples &amp; Extras/Scripts/EnvMapAnimator.cs" />
      <Compile Include="Assets/TextMesh Pro/Examples &amp; Extras/Scripts/TMP_UiFrameRateCounter.cs" />
+     <Compile Include="Assets/Scripts/Sound/SoundCtrl.cs" />
+     <Compile Include="Assets/Scripts/Comp/MissText.cs" />
      <Compile Include="Assets/TextMesh Pro/Examples &amp; Extras/Scripts/CameraController.cs" />
      <Compile Include="Assets/Scripts/HttpApi/CommonResponseObj.cs" />
      <Compile Include="Assets/Scripts/HttpApi/AbsSessionObj.cs" />
+     <Compile Include="Assets/Scripts/UI/GameStartJumper.cs" />
+     <Compile Include="Assets/Scripts/Api/ModelApiRequest.cs" />
      <Compile Include="Assets/Scripts/Ragdoll/RdAES.cs" />
      <Compile Include="Assets/Scripts/Ragdoll/RdHttpClient.cs" />
      <Compile Include="Assets/Scripts/Game/CockFactory.cs" />
+     <Compile Include="Assets/Scripts/Game/IMasterController.cs" />
      <Compile Include="Assets/TextMesh Pro/Examples &amp; Extras/Scripts/TMPro_InstructionOverlay.cs" />
+     <Compile Include="Assets/Scripts/UI/Hall/AvatarUtil.cs" />
      <Compile Include="Assets/TextMesh Pro/Examples &amp; Extras/Scripts/TMP_ExampleScript_01.cs" />
      <Compile Include="Assets/TextMesh Pro/Examples &amp; Extras/Scripts/TextConsoleSimulator.cs" />
+     <Compile Include="Assets/Scripts/Comp/CameraFollow.cs" />
      <Compile Include="Assets/TextMesh Pro/Examples &amp; Extras/Scripts/ObjectSpin.cs" />
+     <Compile Include="Assets/Scripts/UI/manager/BattleInviteManager.cs" />
      <Compile Include="Assets/TextMesh Pro/Examples &amp; Extras/Scripts/TMP_TextInfoDebugTool.cs" />
+     <Compile Include="Assets/Scripts/Sound/SoundCore.cs" />
+     <Compile Include="Assets/Scripts/UI/BattleRequest/BattleRequestReceivedComp.cs" />
      <Compile Include="Assets/TextMesh Pro/Examples &amp; Extras/Scripts/TMP_TextEventCheck.cs" />
+     <Compile Include="Assets/Scripts/UI/Hall/UserInfoComp.cs" />
+     <Compile Include="Assets/DonotDestoryComp.cs" />
+     <Compile Include="Assets/Scripts/Ragdoll/RdStateMachine.cs" />
      <Compile Include="Assets/TextMesh Pro/Examples &amp; Extras/Scripts/ShaderPropAnimator.cs" />
+     <Compile Include="Assets/Scripts/UI/Hall/UpdateInfoComp.cs" />
+     <Compile Include="Assets/Scripts/Ragdoll/RdResetAttribute.cs" />
      <Compile Include="Assets/Scripts/HttpApi/RdFakeSocket.cs" />
      <Compile Include="Assets/TextMesh Pro/Examples &amp; Extras/Scripts/WarpTextExample.cs" />
      <Compile Include="Assets/TextMesh Pro/Examples &amp; Extras/Scripts/TMP_DigitValidator.cs" />
      <Compile Include="Assets/Scripts/HttpApi/GetMsgObj.cs" />
+     <Compile Include="Assets/Scripts/Message/MessageComp.cs" />
      <Compile Include="Assets/TextMesh Pro/Examples &amp; Extras/Scripts/Benchmark02.cs" />
      <Compile Include="Assets/TextMesh Pro/Examples &amp; Extras/Scripts/TextMeshSpawner.cs" />
+     <Compile Include="Assets/Scripts/UI/manager/SettingManager.cs" />
      <Compile Include="Assets/TutorialInfo/Scripts/Readme.cs" />
      <Compile Include="Assets/Scripts/HttpApi/BattleDetailListObj.cs" />
      <Compile Include="Assets/Scripts/Game/GamePlayer.cs" />
      <Compile Include="Assets/TextMesh Pro/Examples &amp; Extras/Scripts/Benchmark03.cs" />
-     <Compile Include="Assets/Scripts/UI/LoginComp.cs" />
+     <Compile Include="Assets/Scripts/UI/Hall/LoginComp.cs" />
+     <Compile Include="Assets/Scripts/UI/Hall/PreparePageComp.cs" />
+     <Compile Include="Assets/Scripts/Game/GameCore.cs" />
+     <Compile Include="Assets/Scripts/UI/Items/OnlinePlayerItemComp.cs" />
+     <Compile Include="Assets/Scripts/UI/Common/SwitchButtonComp.cs" />
      <Compile Include="Assets/TextMesh Pro/Examples &amp; Extras/Scripts/TMP_FrameRateCounter.cs" />
+     <Compile Include="Assets/Scripts/Api/ConfigManager.cs" />
+     <Compile Include="Assets/Scripts/UI/Hall/DiamondChooseComp.cs" />
+     <Compile Include="Assets/Scripts/UI/Hall/LoadingComp.cs" />
      <Compile Include="Assets/TextMesh Pro/Examples &amp; Extras/Scripts/VertexJitter.cs" />
+     <Compile Include="Assets/Scripts/Api/AccountManager.cs" />
      <Compile Include="Assets/TextMesh Pro/Examples &amp; Extras/Scripts/TMP_TextEventHandler.cs" />
+     <Compile Include="Assets/Scripts/Api/ApiComp.cs" />
      <Compile Include="Assets/Scripts/Ragdoll/RdSingleton.cs" />
+     <Compile Include="Assets/Scripts/Game/GamePendingState.cs" />
      <Compile Include="Assets/TextMesh Pro/Examples &amp; Extras/Scripts/TMP_TextSelector_B.cs" />
+     <Compile Include="Assets/Scripts/Comp/LiftButtonComp.cs" />
+     <Compile Include="Assets/Scripts/Comp/BattleResultComp.cs" />
+     <Compile Include="Assets/Scripts/UI/Hall/HallComp.cs" />
+     <Compile Include="Assets/Scripts/Game/GameLiftState.cs" />
      <Compile Include="Assets/TextMesh Pro/Examples &amp; Extras/Scripts/DropdownSample.cs" />
      <Compile Include="Assets/TextMesh Pro/Examples &amp; Extras/Scripts/TMP_PhoneNumberValidator.cs" />
      <Compile Include="Assets/TextMesh Pro/Examples &amp; Extras/Scripts/VertexColorCycler.cs" />
      <Compile Include="Assets/Scripts/HttpApi/AuthObj.cs" />
      <Compile Include="Assets/TextMesh Pro/Examples &amp; Extras/Scripts/TeleType.cs" />
+     <Compile Include="Assets/Scripts/Sound/DropdownAttribute.cs" />
      <Compile Include="Assets/Scripts/HttpApi/ConsumeMsgObj.cs" />
      <Compile Include="Assets/TextMesh Pro/Examples &amp; Extras/Scripts/VertexZoom.cs" />
      <Compile Include="Assets/Scripts/HttpApi/PlayerOnlineStatusObj.cs" />
      <Compile Include="Assets/TextMesh Pro/Examples &amp; Extras/Scripts/Benchmark01.cs" />
-     <Compile Include="Assets/Scripts/Game/GameBattleState.cs" />
-     <Compile Include="Assets/Scripts/Ragdoll/RdStateMachine.cs" />
-     <Compile Include="Assets/Scripts/Game/GameCore.cs" />
-     <Compile Include="Assets/Scripts/Game/GameState.cs" />
-     <Compile Include="Assets/Scripts/Game/GamePendingState.cs" />
-     <Compile Include="Assets/Scripts/UI/BattleRequest/BqItemComp.cs" />
-     <Compile Include="Assets/Scripts/UI/HallComp.cs" />
-     <Compile Include="Assets/Scripts/Api/Constants.cs" />
-     <Compile Include="Assets/Scripts/UI/PreparePageComp.cs" />
-     <Compile Include="Assets/Scripts/Api/ApiComp.cs" />
-     <Compile Include="Assets/Scripts/Api/ModelApiResponse.cs" />
-     <Compile Include="Assets/Scripts/Message/MessageTypes.cs" />
-     <Compile Include="Assets/Scripts/Api/ModelApiRequest.cs" />
-     <Compile Include="Assets/Scripts/UI/BattleRequest/BattleRequestComp.cs" />
-     <Compile Include="Assets/Scripts/UI/Items/OnlinePlayerItemComp.cs" />
-     <Compile Include="Assets/Scripts/Message/MessageComp.cs" />
+     <Compile Include="Assets/Scripts/Comp/AudienceActionComp.cs" />
      <Folder Include="Assets" />
      <Folder Include="Assets/prefabs_S/cock/resources/txt" />
      <Folder Include="Assets/TextMesh Pro/Examples &amp; Extras" />
      <Folder Include="Assets/prefabs_S/static/fbx" />
      <Folder Include="Assets/Resources/Font" />
      <Folder Include="Assets/Scenes" />
+     <None Include="Assets/TextMesh Pro/Shaders/TMPro.cginc" />
      <Folder Include="Assets/prefabs_S/human/resources" />
+     <None Include="Assets/TextMesh Pro/Shaders/TMP_SDF-Mobile Overlay.shader" />
+     <Folder Include="Assets/TextMesh Pro/Sprites" />
      <Folder Include="Assets/Resources/Image/Cock" />
      <Folder Include="Assets/Scripts/UI/BattleRequest" />
+     <Folder Include="Assets/TextMesh Pro/Resources/Sprite Assets" />
      <Folder Include="Assets/Scripts/Comp" />
+     <None Include="Assets/TextMesh Pro/Shaders/TMP_Bitmap.shader" />
+     <Folder Include="Assets/Resources/Human" />
      <Folder Include="Assets/prefabs_S/human/resources/txt" />
+     <Folder Include="Assets/Scripts/UI/Common" />
+     <Folder Include="Assets/Resources/Image/Setting" />
      <Folder Include="Assets/TutorialInfo" />
      <Folder Include="Assets/Scripts" />
      <Folder Include="Assets/Resources/Pages" />
+     <None Include="Assets/TextMesh Pro/Shaders/TMPro_Mobile.cginc" />
+     <Folder Include="Assets/Resources/UICock" />
+     <None Include="Assets/TextMesh Pro/Shaders/TMP_SDF SSD.shader" />
      <Folder Include="Assets/TextMesh Pro/Examples &amp; Extras/Scripts" />
      <Folder Include="Assets/prefabs_S/static/resources" />
      <Folder Include="Assets/Scripts/UI/Items" />
      <Folder Include="Assets/Scripts/Message" />
+     <None Include="Assets/TextMesh Pro/Shaders/TMP_SDF-Surface-Mobile.shader" />
      <Folder Include="Assets/Resources/Image" />
      <Folder Include="Assets/Scripts/Game" />
      <Folder Include="Assets/TextMesh Pro/Resources" />
      <Folder Include="Assets/Scripts/UI" />
+     <Folder Include="Assets/Scripts/UI/manager" />
      <Folder Include="Assets/Resources/Image/Common" />
      <Folder Include="Assets/prefabs_S/human/prefab" />
      <Folder Include="Assets/Resources/Image/Prepare" />
      <Folder Include="Assets/prefabs_S/static/resources/sky" />
      <Folder Include="Assets/prefabs_S/static" />
+     <Folder Include="Assets/Scripts/Sound" />
+     <Folder Include="Assets/Resources/Prefab" />
      <Folder Include="Assets/prefabs_S/static/prefab" />
+     <None Include="Assets/TextMesh Pro/Shaders/TMP_SDF-Surface.shader" />
      <Folder Include="Assets/prefabs_S/cock/resources" />
      <Folder Include="Assets/prefabs_S/cock/fbx" />
+     <None Include="Assets/TextMesh Pro/Sprites/EmojiOne Attribution.txt" />
+     <None Include="Assets/TextMesh Pro/Shaders/TMP_Bitmap-Custom-Atlas.shader" />
+     <None Include="Assets/TextMesh Pro/Shaders/TMP_SDF.shader" />
      <Folder Include="Assets/prefabs_S/human/fbx" />
+     <None Include="Assets/TextMesh Pro/Shaders/TMP_SDF-Mobile SSD.shader" />
+     <None Include="Assets/TextMesh Pro/Resources/LineBreaking Leading Characters.txt" />
+     <Folder Include="Assets/Resources/Image/Battle" />
      <None Include="Assets/TextMesh Pro/Shaders/TMPro_Properties.cginc" />
      <Folder Include="Assets/prefabs_S/static/resources/cunzhuagn" />
+     <None Include="Assets/TextMesh Pro/Shaders/TMPro_Surface.cginc" />
+     <Folder Include="Assets/Resources/Image/Avatar" />
      <Folder Include="Assets/Resources/Image/Hall" />
      <Folder Include="Assets/prefabs_S" />
+     <Folder Include="Assets/TextMesh Pro/Resources/Style Sheets" />
      <Folder Include="Assets/TutorialInfo/Scripts" />
      <Folder Include="Assets/TextMesh Pro/Resources/Fonts &amp; Materials" />
      <Folder Include="Assets/prefabs_S/cock/prefab" />
      <Folder Include="Assets/TutorialInfo/Icons" />
      <Folder Include="Assets/TextMesh Pro" />
+     <None Include="Assets/TextMesh Pro/Resources/LineBreaking Following Characters.txt" />
      <Folder Include="Assets/Resources/Pages/Items" />
      <Folder Include="Assets/prefabs_S/human" />
      <Folder Include="Assets/Scripts/Ragdoll" />
      <Folder Include="Assets/TextMesh Pro/Fonts" />
      <Folder Include="Assets/Adaptive Performance/Settings" />
+     <Folder Include="Assets/Scripts/UI/Hall" />
      <Folder Include="Assets/Resources" />
+     <None Include="Assets/TextMesh Pro/Shaders/TMP_SDF-Mobile Masking.shader" />
      <Folder Include="Assets/prefabs_S/cock" />
      <Folder Include="Assets/Scripts/HttpApi" />
      <Folder Include="Assets/prefabs_S/static/resources/cj2" />
+     <Folder Include="Assets/Resources/Sound" />
+     <None Include="Assets/TextMesh Pro/Shaders/TMP_SDF Overlay.shader" />
+     <None Include="Assets/TextMesh Pro/Shaders/TMP_Bitmap-Mobile.shader" />
      <Folder Include="Assets/Resources/Cock" />
+     <None Include="Assets/TextMesh Pro/Fonts/LiberationSans - OFL.txt" />
+     <Folder Include="Assets/TextMesh Pro/Documentation" />
      <None Include="Assets/TextMesh Pro/Shaders/TMP_SDF-Mobile.shader" />
+     <None Include="Assets/TextMesh Pro/Sprites/EmojiOne.json" />
      <Folder Include="Assets/Adaptive Performance" />
      <Folder Include="Assets/TextMesh Pro/Examples &amp; Extras/Prefabs" />
      <Folder Include="Assets/TextMesh Pro/Shaders" />
+     <None Include="Assets/TextMesh Pro/Shaders/TMP_Sprite.shader" />
      <Folder Include="Assets/Scripts/Api" />
      <Reference Include="UnityEngine">
      <HintPath>/Applications/Unity/Hub/Editor/2021.3.19f1c1/Unity.app/Contents/Managed/UnityEngine/UnityEngine.dll</HintPath>
@@ -431,15 +496,15 @@
      <Reference Include="Unity.Burst.Cecil.Rocks">
      <HintPath>/Users/heyixian/code/cock/cockClient2/Library/PackageCache/com.unity.burst@1.8.2/Unity.Burst.CodeGen/Unity.Burst.Cecil.Rocks.dll</HintPath>
      </Reference>
+     <Reference Include="DOTween">
+     <HintPath>/Users/heyixian/code/cock/cockClient2/Assets/Plugins/Demigiant/DOTween/DOTween.dll</HintPath>
+     </Reference>
      <Reference Include="Unity.VisualScripting.Antlr3.Runtime">
      <HintPath>/Users/heyixian/code/cock/cockClient2/Library/PackageCache/com.unity.visualscripting@1.8.0/Runtime/VisualScripting.Flow/Dependencies/NCalc/Unity.VisualScripting.Antlr3.Runtime.dll</HintPath>
      </Reference>
      <Reference Include="Newtonsoft.Json">
      <HintPath>/Users/heyixian/code/cock/cockClient2/Library/PackageCache/com.unity.nuget.newtonsoft-json@3.0.2/Runtime/Newtonsoft.Json.dll</HintPath>
      </Reference>
-     <Reference Include="DOTween">
-     <HintPath>/Users/heyixian/code/cock/cockClient2/Assets/Plugins/Demigiant/DOTween/DOTween.dll</HintPath>
-     </Reference>
      <Reference Include="netstandard">
      <HintPath>/Applications/Unity/Hub/Editor/2021.3.19f1c1/Unity.app/Contents/NetStandard/ref/2.1.0/netstandard.dll</HintPath>
      </Reference>

Assets/Scripts/Api/ApiComp.cs

@@ -344,7 +344,7 @@ namespace Api
             ApiNotSession(path, req, success, errAction);
         }
 
-        public void GetBattleDetail(string battleSession,  Action<BattleDetailListObj> success,
+        public void GetBattleDetail(string battleSession, Action<BattleDetailListObj> success,
             Action<int, string> errAction)
         {
             var req = new ModelApiRequest
@@ -357,6 +357,18 @@ namespace Api
                 success(resp.battleInfo);
             }, errAction);
         }
-        
+
+
+        public void playerQuitGame(string battleSession, Action<ResponseSuccessData> success,
+            Action<int, string> errAction)
+        {
+            var req = new ModelApiRequest
+            {
+                api = "playerQuitGame",
+                battleSession = battleSession
+            };
+            Api(req, success, errAction);
+        }
+
     }
 }

Assets/Scripts/Message/MessageComp.cs

@@ -20,6 +20,7 @@ namespace Message
         public Action<int, MsgContent> OnBattlePlayerReady;
         public Action<int, MsgContent> OnBattleClientMsg;
 
+        public Action<int, MsgContent> OnBattlePlayerQuit;
 
         private bool end = false;
 
@@ -31,7 +32,7 @@ namespace Message
         private void OnDestroy()
         {
             OpenWhile = false;
-            Debug.Log("Meesage Comp Destroy");
+            Debug.Log("Message Comp Destroy");
         }
 
         public void ClearMessage()
@@ -74,11 +75,15 @@ namespace Message
                                     Debug.Log("zane client msg:" + msg);
                                     OnBattleClientMsg?.Invoke(msg.msgFromPlayer, msg.content);
                                 }
-
                                 else if (msg.type == MessageTypes.MsgPlayerReady.GetHashCode())
                                 {
                                     OnBattlePlayerReady?.Invoke(msg.msgFromPlayer, msg.content);
                                 }
+                                else if (msg.type == MessageTypes.PlayerQuitInBattle.GetHashCode())
+                                {
+                                    OnBattlePlayerQuit?.Invoke(msg.msgFromPlayer, msg.content);
+                                }
+
 
                                 ApiComp.Instance.EndMessage(msg.id);
                             }

Assets/Scripts/Message/MessageTypes.cs

@@ -11,6 +11,8 @@ namespace Message
         MsgPlayerReady = 3,
 
         MsgBattleStart = 4,
-        OnBattleClientMsg = 5
+        OnBattleClientMsg = 5,
+
+        PlayerQuitInBattle = 6,
     }
 }

Assets/Scripts/UI/GameStartJumper.cs

@@ -25,5 +25,18 @@ namespace UI
             PageManagerComp.singleton.DisplayUI();
             HallComp.Instance.BackToHallAndRefreshUI();
         }
+
+
+        public static void PlayerQuitGame()
+        {
+            ApiComp.Instance.playerQuitGame(GameCore.Instance.curBattleSession, data =>
+            {
+                Debug.Log("player quit game success");
+                BackToUI();
+            }, (code, msg) =>
+            {
+                Debug.Log("player quit game fail");
+            });
+        }
     }
 }