增加修饰，增加Battle的Debug模式

Assets/Resources/UICock/prefab_cock_1.prefab

@@ -1386,8 +1386,6 @@ GameObject:
   - component: {fileID: 5221786613589611655}
   - component: {fileID: 2204423604733202173}
   - component: {fileID: -1070774890500468579}
-  - component: {fileID: -8531684669894697885}
-  - component: {fileID: -8515057846496593830}
   - component: {fileID: 3261479113818730106}
   - component: {fileID: 301670950033994504}
   m_Layer: 3
@@ -1421,7 +1419,7 @@ Transform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &2204423604733202173
 Animator:
-  serializedVersion: 5
+  serializedVersion: 4
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -1438,7 +1436,7 @@ Animator:
   m_WarningMessage: 
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorStateOnDisable: 0
+  m_KeepAnimatorControllerStateOnDisable: 0
 --- !u!114 &-1070774890500468579
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1451,38 +1449,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 53ba5bbda83e41628281d34f7cdb84b3, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  PlayerId: 0
-  RightForward: 0
-  _animator: {fileID: 2204423604733202173}
---- !u!54 &-8531684669894697885
-Rigidbody:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4844839584457444925}
-  serializedVersion: 2
-  m_Mass: 1
-  m_Drag: 0
-  m_AngularDrag: 0.05
-  m_UseGravity: 0
-  m_IsKinematic: 0
-  m_Interpolate: 0
-  m_Constraints: 120
-  m_CollisionDetection: 0
---- !u!65 &-8515057846496593830
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4844839584457444925}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Size: {x: 0.94951147, y: 1.152797, z: 0.816932}
-  m_Center: {x: -0.00000023841858, y: 0.49474567, z: 0.09061438}
+  playerId: 0
+  cockId: 0
+  rightForward: 0
+  animator: {fileID: 0}
 --- !u!82 &3261479113818730106
 AudioSource:
   m_ObjectHideFlags: 0

Assets/Resources/UICock/prefab_cock_2.prefab

@@ -2192,8 +2192,6 @@ GameObject:
   - component: {fileID: 1388874454278630771}
   - component: {fileID: 5018814427917039369}
   - component: {fileID: 1048703513864576350}
-  - component: {fileID: 1019096996697689459}
-  - component: {fileID: -6714379342620964677}
   m_Layer: 3
   m_Name: prefab_cock_2
   m_TagString: cock
@@ -2255,36 +2253,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 53ba5bbda83e41628281d34f7cdb84b3, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  _animator: {fileID: 5018814427917039369}
---- !u!54 &1019096996697689459
-Rigidbody:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1733205644285327305}
-  serializedVersion: 2
-  m_Mass: 1
-  m_Drag: 0
-  m_AngularDrag: 0.05
-  m_UseGravity: 0
-  m_IsKinematic: 0
-  m_Interpolate: 0
-  m_Constraints: 4
-  m_CollisionDetection: 0
---- !u!65 &-6714379342620964677
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1733205644285327305}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Size: {x: 1, y: 1, z: 1}
-  m_Center: {x: 0, y: 0, z: 0}
+  playerId: 0
+  cockId: 0
+  rightForward: 0
+  animator: {fileID: 0}
 --- !u!1 &1806212097120086072
 GameObject:
   m_ObjectHideFlags: 0

Assets/Resources/UICock/prefab_cock_3.prefab

@@ -106,8 +106,6 @@ GameObject:
   - component: {fileID: 545428381933543563}
   - component: {fileID: 5868732295295105777}
   - component: {fileID: 4524834679850442458}
-  - component: {fileID: 2101789457622692313}
-  - component: {fileID: 438384718400260319}
   m_Layer: 3
   m_Name: prefab_cock_3
   m_TagString: cock
@@ -169,36 +167,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 53ba5bbda83e41628281d34f7cdb84b3, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  _animator: {fileID: 5868732295295105777}
---- !u!54 &2101789457622692313
-Rigidbody:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 926070908217522737}
-  serializedVersion: 2
-  m_Mass: 1
-  m_Drag: 0
-  m_AngularDrag: 0.05
-  m_UseGravity: 0
-  m_IsKinematic: 0
-  m_Interpolate: 0
-  m_Constraints: 4
-  m_CollisionDetection: 0
---- !u!65 &438384718400260319
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 926070908217522737}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Size: {x: 1, y: 1, z: 1}
-  m_Center: {x: 0, y: 0, z: 0}
+  playerId: 0
+  cockId: 0
+  rightForward: 0
+  animator: {fileID: 0}
 --- !u!1 &938917377748245698
 GameObject:
   m_ObjectHideFlags: 0

Assets/Resources/UICock/prefab_cock_4.prefab

@@ -3504,8 +3504,6 @@ GameObject:
   - component: {fileID: 6485468391035607811}
   - component: {fileID: 928075737809699193}
   - component: {fileID: 508041240951830600}
-  - component: {fileID: -4371056599116344606}
-  - component: {fileID: 7618665393264415027}
   m_Layer: 3
   m_Name: prefab_cock_4
   m_TagString: cock
@@ -3567,36 +3565,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 53ba5bbda83e41628281d34f7cdb84b3, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  _animator: {fileID: 928075737809699193}
---- !u!54 &-4371056599116344606
-Rigidbody:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5857726878546379193}
-  serializedVersion: 2
-  m_Mass: 1
-  m_Drag: 0
-  m_AngularDrag: 0.05
-  m_UseGravity: 0
-  m_IsKinematic: 0
-  m_Interpolate: 0
-  m_Constraints: 4
-  m_CollisionDetection: 0
---- !u!65 &7618665393264415027
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5857726878546379193}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Size: {x: 1, y: 1, z: 1}
-  m_Center: {x: 0, y: 0, z: 0}
+  playerId: 0
+  cockId: 0
+  rightForward: 0
+  animator: {fileID: 0}
 --- !u!1 &6241142834900072803
 GameObject:
   m_ObjectHideFlags: 0

Assets/Resources/UICock/prefab_cock_5.prefab

@@ -2837,8 +2837,6 @@ GameObject:
   - component: {fileID: 4474035747106781579}
   - component: {fileID: 7563473530001499121}
   - component: {fileID: -6399738068700006801}
-  - component: {fileID: 1269509026950854537}
-  - component: {fileID: -2072100051616147653}
   m_Layer: 3
   m_Name: prefab_cock_5
   m_TagString: cock
@@ -2870,7 +2868,7 @@ Transform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &7563473530001499121
 Animator:
-  serializedVersion: 5
+  serializedVersion: 4
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -2887,7 +2885,7 @@ Animator:
   m_WarningMessage: 
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorStateOnDisable: 0
+  m_KeepAnimatorControllerStateOnDisable: 0
 --- !u!114 &-6399738068700006801
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2900,38 +2898,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 53ba5bbda83e41628281d34f7cdb84b3, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  PlayerId: 0
-  RightForward: 0
-  _animator: {fileID: 7563473530001499121}
---- !u!54 &1269509026950854537
-Rigidbody:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3845272959241593649}
-  serializedVersion: 2
-  m_Mass: 1
-  m_Drag: 0
-  m_AngularDrag: 0.05
-  m_UseGravity: 0
-  m_IsKinematic: 0
-  m_Interpolate: 0
-  m_Constraints: 120
-  m_CollisionDetection: 0
---- !u!65 &-2072100051616147653
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3845272959241593649}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Size: {x: 1, y: 1, z: 1}
-  m_Center: {x: 0, y: 0, z: 0}
+  playerId: 0
+  cockId: 0
+  rightForward: 0
+  animator: {fileID: 0}
 --- !u!1 &4179386359360511598
 GameObject:
   m_ObjectHideFlags: 0

Assets/Resources/UICock/prefab_cock_6.prefab

@@ -4000,8 +4000,6 @@ GameObject:
   - component: {fileID: 9176849270314626140}
   - component: {fileID: 3006886257983370790}
   - component: {fileID: 4699537409287631060}
-  - component: {fileID: 8703460154528551372}
-  - component: {fileID: 3776999008526660510}
   m_Layer: 3
   m_Name: prefab_cock_6
   m_TagString: cock
@@ -4063,36 +4061,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 53ba5bbda83e41628281d34f7cdb84b3, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  _animator: {fileID: 3006886257983370790}
---- !u!54 &8703460154528551372
-Rigidbody:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8363579674157627110}
-  serializedVersion: 2
-  m_Mass: 1
-  m_Drag: 0
-  m_AngularDrag: 0.05
-  m_UseGravity: 0
-  m_IsKinematic: 0
-  m_Interpolate: 0
-  m_Constraints: 4
-  m_CollisionDetection: 0
---- !u!65 &3776999008526660510
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8363579674157627110}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Size: {x: 1, y: 1, z: 1}
-  m_Center: {x: 0, y: 0, z: 0}
+  playerId: 0
+  cockId: 0
+  rightForward: 0
+  animator: {fileID: 0}
 --- !u!1 &8434123255892715799
 GameObject:
   m_ObjectHideFlags: 0

Assets/Resources/UICock/prefab_cock_7.prefab

@@ -4063,8 +4063,6 @@ GameObject:
   - component: {fileID: 8609686146805969040}
   - component: {fileID: 2421691109249215210}
   - component: {fileID: 8503715178697029996}
-  - component: {fileID: -4833879893874778636}
-  - component: {fileID: 3214435729273424759}
   m_Layer: 3
   m_Name: prefab_cock_7
   m_TagString: cock
@@ -4126,36 +4124,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 53ba5bbda83e41628281d34f7cdb84b3, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  _animator: {fileID: 2421691109249215210}
---- !u!54 &-4833879893874778636
-Rigidbody:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8948774796045904426}
-  serializedVersion: 2
-  m_Mass: 1
-  m_Drag: 0
-  m_AngularDrag: 0.05
-  m_UseGravity: 0
-  m_IsKinematic: 0
-  m_Interpolate: 0
-  m_Constraints: 4
-  m_CollisionDetection: 0
---- !u!65 &3214435729273424759
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8948774796045904426}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Size: {x: 1, y: 1, z: 1}
-  m_Center: {x: 0, y: 0, z: 0}
+  playerId: 0
+  cockId: 0
+  rightForward: 0
+  animator: {fileID: 0}
 --- !u!1 &9019881362077251035
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scenes/Battle.unity

@@ -1505,6 +1505,7 @@ GameObject:
   - component: {fileID: 963194228}
   - component: {fileID: 963194227}
   - component: {fileID: 963194229}
+  - component: {fileID: 963194230}
   m_Layer: 0
   m_Name: Main Camera
   m_TagString: MainCamera
@@ -1603,6 +1604,14 @@ MonoBehaviour:
   m_RequiresDepthTexture: 0
   m_RequiresColorTexture: 0
   m_Version: 2
+--- !u!81 &963194230
+AudioListener:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 963194225}
+  m_Enabled: 1
 --- !u!1001 &998224487
 PrefabInstance:
   m_ObjectHideFlags: 0

Assets/Scripts/Game/GameCore.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using Comp;
 using HttpApi;
 using JetBrains.Annotations;
-using Newtonsoft.Json;
 using Ragdoll;
 using UnityEngine;
 
@@ -19,11 +18,11 @@ namespace Game
 
         public GameState endState;
 
-        [CanBeNull] public GamePlayer localPlayer;
+        [RdReset(null)] public GamePlayer localPlayer;
 
-        [CanBeNull] public GamePlayer antiPlayer;
+        [RdReset(null)] public GamePlayer antiPlayer;
 
-        public int winPlayerId;
+        [RdReset("0")] public int winPlayerId;
 
         public int diamond;
 
@@ -56,6 +55,7 @@ namespace Game
         public void Exit()
         {
             currentState = null;
+            RdResetTool.ResetAttribute(this);
         }
 
         public void Init(GamePlayer localPlayer, GamePlayer antiPlayer, GameObject parent, GameObject camera,
@@ -78,7 +78,7 @@ namespace Game
             this.resultPanel = resultPanel;
 
             localPlayer.cockId = 2;
-            
+
             cockDict = new Dictionary<int, CockActionComp>();
             masterDict = new Dictionary<int, MasterActionComp>();
 

Assets/Scripts/Ragdoll/RdResetAttribute.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Reflection;
+using UnityEngine;
+
+namespace Ragdoll
+{
+    [AttributeUsage(AttributeTargets.Field)]
+    public class RdResetAttribute : Attribute
+    {
+        public string DefaultValue { get; set; }
+
+        public RdResetAttribute(string defaultValue)
+        {
+            DefaultValue = defaultValue;
+        }
+    }
+
+    public static class RdResetTool
+    {
+        public static void ResetAttribute(object obj)
+        {
+            var type = obj.GetType();
+            foreach (var member in type.GetMembers())
+            {
+                if (Attribute.GetCustomAttribute(member, typeof(RdResetAttribute)) is not
+                        RdResetAttribute
+                        attribute || member is not FieldInfo field) continue;
+                Debug.Log("重置 " + field.Name);
+                field.SetValue(obj, Convert.ChangeType(attribute.DefaultValue, field.FieldType));
+            }
+        }
+    }
+}

Assets/Scripts/Ragdoll/RdResetAttribute.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 77c3773f65c14e81ba477064c15870e1
+timeCreated: 1681283064

Assets/Scripts/UI/Hall/HallComp.cs

@@ -73,7 +73,7 @@ namespace UI
         private void TTT()
         {
             DefaultSelectOnlinePlayerTypeButton.onClick.Invoke();
-            GameStartJumper.JumpGameScene("100020VS100019:1680153980543:WNBIDVLNYT");
+            // GameStartJumper.JumpGameScene("100020VS100019:1680153980543:WNBIDVLNYT");
         }
 
         public void A__ClickUpdateInfo()

ProjectSettings/ProjectSettings.asset

@@ -8,7 +8,7 @@ PlayerSettings:
   AndroidProfiler: 0
   AndroidFilterTouchesWhenObscured: 0
   AndroidEnableSustainedPerformanceMode: 0
-  defaultScreenOrientation: 4
+  defaultScreenOrientation: 3
   targetDevice: 2
   useOnDemandResources: 0
   accelerometerFrequency: 60
@@ -165,7 +165,8 @@ PlayerSettings:
   resetResolutionOnWindowResize: 0
   androidSupportedAspectRatio: 1
   androidMaxAspectRatio: 2.1
-  applicationIdentifier: {}
+  applicationIdentifier:
+    Android: com.DefaultCompany.Cock
   buildNumber:
     Standalone: 0
     iPhone: 0
@@ -255,8 +256,8 @@ PlayerSettings:
   useCustomBaseGradleTemplate: 0
   useCustomGradlePropertiesTemplate: 0
   useCustomProguardFile: 0
-  AndroidTargetArchitectures: 1
-  AndroidTargetDevices: 0
+  AndroidTargetArchitectures: 3
+  AndroidTargetDevices: 1
   AndroidSplashScreenScale: 0
   androidSplashScreen: {fileID: 0}
   AndroidKeystoreName: 
@@ -381,36 +382,6 @@ PlayerSettings:
   - m_BuildTarget: Android
     m_Icons:
     - m_Textures: []
-      m_Width: 432
-      m_Height: 432
-      m_Kind: 2
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 324
-      m_Height: 324
-      m_Kind: 2
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 216
-      m_Height: 216
-      m_Kind: 2
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 162
-      m_Height: 162
-      m_Kind: 2
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 108
-      m_Height: 108
-      m_Kind: 2
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 81
-      m_Height: 81
-      m_Kind: 2
-      m_SubKind: 
-    - m_Textures: []
       m_Width: 192
       m_Height: 192
       m_Kind: 1
@@ -470,6 +441,36 @@ PlayerSettings:
       m_Height: 36
       m_Kind: 0
       m_SubKind: 
+    - m_Textures: []
+      m_Width: 432
+      m_Height: 432
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 324
+      m_Height: 324
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 216
+      m_Height: 216
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 162
+      m_Height: 162
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 108
+      m_Height: 108
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 81
+      m_Height: 81
+      m_Kind: 2
+      m_SubKind: 
   m_BuildTargetBatching:
   - m_BuildTarget: Standalone
     m_StaticBatching: 1
@@ -811,7 +812,8 @@ PlayerSettings:
   scriptingDefineSymbols: {}
   additionalCompilerArguments: {}
   platformArchitecture: {}
-  scriptingBackend: {}
+  scriptingBackend:
+    Android: 1
   il2cppCompilerConfiguration: {}
   managedStrippingLevel: {}
   incrementalIl2cppBuild: {}

ProjectSettings/UnityConnectSettings.asset

@@ -4,7 +4,7 @@
 UnityConnectSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 1
-  m_Enabled: 0
+  m_Enabled: 1
   m_TestMode: 0
   m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events
   m_EventUrl: https://cdp.cloud.unity3d.com/v1/events