Merge branch 'master' of http://8.134.150.210:3000/xgan/2025TapTapGameJam

Assets/Prefab/Gameplay/ConnectionLine.prefab

@@ -42,7 +42,11 @@ LineRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2140853775088731430}
   m_Enabled: 1
+<<<<<<< HEAD
+  m_CastShadows: 1
+=======
   m_CastShadows: 0
+>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
   m_ReceiveShadows: 1
   m_DynamicOccludee: 1
   m_StaticShadowCaster: 0
@@ -54,7 +58,11 @@ LineRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
+<<<<<<< HEAD
+  - {fileID: 2100000, guid: fd7b6ef1c8d01724683c1f9dc2114f9e, type: 2}
+=======
   - {fileID: 2100000, guid: e96f7d97b7194c548bcfc2a18e277891, type: 2}
+>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -85,8 +93,13 @@ LineRenderer:
       serializedVersion: 2
       m_Curve:
       - serializedVersion: 3
+<<<<<<< HEAD
+        time: 0.48411998
+        value: 0.018180847
+=======
         time: 0.6359602
         value: 0.052467346
+>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
         inSlope: 0
         outSlope: 0
         tangentMode: 0
@@ -132,7 +145,11 @@ LineRenderer:
     textureMode: 0
     textureScale: {x: 1, y: 1}
     shadowBias: 0.5
+<<<<<<< HEAD
+    generateLightingData: 0
+=======
     generateLightingData: 1
+>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
   m_MaskInteraction: 0
   m_UseWorldSpace: 1
   m_Loop: 0
@@ -149,5 +166,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 73c8f3d3a6144dc780b46b6c363b8ca6, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+<<<<<<< HEAD
+  monoSource: {fileID: 0}
+  monoTarget: {fileID: 0}
+=======
   monoPointA: {fileID: 0}
   monoPointB: {fileID: 0}
+>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138

Assets/Prefab/Gameplay/Player.prefab

@@ -239,8 +239,11 @@ MonoBehaviour:
   groundMask:
     serializedVersion: 2
     m_Bits: 64
+<<<<<<< HEAD
+=======
   fallDamageThreshold: 3
   pushPower: 0.5
+>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
 --- !u!114 &2963170313432786625
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Prefab/UI/PlayerDialogueViwer.prefab

@@ -74,8 +74,13 @@ MonoBehaviour:
   m_fontMaterials: []
   m_fontColor32:
     serializedVersion: 2
+<<<<<<< HEAD
+    rgba: 4294967295
+  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+=======
     rgba: 4278190080
   m_fontColor: {r: 0, g: 0, b: 0, a: 1}
+>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
   m_enableVertexGradient: 0
   m_colorMode: 3
   m_fontColorGradient:
@@ -163,8 +168,12 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
+<<<<<<< HEAD
+  m_Children: []
+=======
   m_Children:
   - {fileID: 6562215877067561314}
+>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
   m_Father: {fileID: 137519622818440187}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -263,6 +272,8 @@ MonoBehaviour:
   IsOpenOnFirstLoad: 0
   dialogueText: {fileID: 8851227466014393207}
   panel: {fileID: 4131091626654046850}
+<<<<<<< HEAD
+=======
 --- !u!1 &6242942909134640294
 GameObject:
   m_ObjectHideFlags: 0
@@ -397,3 +408,4 @@ MonoBehaviour:
   m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138

Assets/Scenes/Test.unity

@@ -216,6 +216,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 115d4e847c444833bc8dce4a03a78e55, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+<<<<<<< HEAD
+=======
 --- !u!1001 &346781470
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -284,6 +286,7 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: be07db3098b709a40a6965f50f8c9640, type: 3}
+>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
 --- !u!1 &410087039
 GameObject:
   m_ObjectHideFlags: 0
@@ -616,6 +619,8 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 85652dd0e36597644aa5b3bc9603797b, type: 3}
+<<<<<<< HEAD
+=======
 --- !u!1001 &761528196
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -764,6 +769,7 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: be07db3098b709a40a6965f50f8c9640, type: 3}
+>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
 --- !u!1001 &865274353
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -1426,6 +1432,8 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: b3e24e2df98d14e4ebc08cc68c071afa, type: 3}
+<<<<<<< HEAD
+=======
 --- !u!114 &1753046143 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 4936355834716623489, guid: be07db3098b709a40a6965f50f8c9640,
@@ -1438,6 +1446,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 6b9b9a895b0d40edb9a6d7213afbb256, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
 --- !u!1 &1859676917
 GameObject:
   m_ObjectHideFlags: 0
@@ -2281,6 +2290,8 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 17ad2833fef1bc044bcc25a227730d74, type: 3}
+<<<<<<< HEAD
+=======
 --- !u!1001 &4318083913684650404
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -2354,6 +2365,7 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: fff496640cf3cc748b6a608893c657ba, type: 3}
+>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
 --- !u!1001 &4550639332017178188
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -2639,6 +2651,14 @@ PrefabInstance:
       propertyPath: m_Name
       value: Player
       objectReference: {fileID: 0}
+<<<<<<< HEAD
+    - target: {fileID: 3748514579879403869, guid: 667aedb0d3f8c9d469819c9ff2b4472b,
+        type: 3}
+      propertyPath: m_RendererIndex
+      value: -1
+      objectReference: {fileID: 0}
+=======
+>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
     - target: {fileID: 7437893023972897012, guid: 667aedb0d3f8c9d469819c9ff2b4472b,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -2710,7 +2730,11 @@ PrefabInstance:
     - target: {fileID: 6919868315282518728, guid: e6007da0e1121fd4ab3b932c054f6256,
         type: 3}
       propertyPath: preConnectionLines.Array.size
+<<<<<<< HEAD
+      value: 1
+=======
       value: 2
+>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
       objectReference: {fileID: 0}
     - target: {fileID: 6919868315282518728, guid: e6007da0e1121fd4ab3b932c054f6256,
         type: 3}
@@ -2722,6 +2746,8 @@ PrefabInstance:
       propertyPath: preConnectionLines.Array.data[0].target
       value: 
       objectReference: {fileID: 183959152}
+<<<<<<< HEAD
+=======
     - target: {fileID: 6919868315282518728, guid: e6007da0e1121fd4ab3b932c054f6256,
         type: 3}
       propertyPath: preConnectionLines.Array.data[1].source
@@ -2737,6 +2763,7 @@ PrefabInstance:
       propertyPath: preConnectionLines.Array.data[1].PreConnectionID
       value: 0
       objectReference: {fileID: 0}
+>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
     - target: {fileID: 8209060139561151121, guid: e6007da0e1121fd4ab3b932c054f6256,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -3098,8 +3125,11 @@ SceneRoots:
   - {fileID: 4550639332017178188}
   - {fileID: 6865129841946316189}
   - {fileID: 2578337202726380610}
+<<<<<<< HEAD
+=======
   - {fileID: 4318083913684650404}
   - {fileID: 761528196}
+>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
   - {fileID: 1781028406820323425}
   - {fileID: 7779342506646282638}
   - {fileID: 8980111935536418165}
@@ -3110,8 +3140,11 @@ SceneRoots:
   - {fileID: 473911345}
   - {fileID: 865274353}
   - {fileID: 6350903300567888677}
+<<<<<<< HEAD
+=======
   - {fileID: 346781470}
   - {fileID: 817379214}
+>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
   - {fileID: 1549323716}
   - {fileID: 2110019781}
   - {fileID: 730184548946979397}

Assets/Script/Gameplay/Edit/RigidbodyEditableController.cs

@@ -34,7 +34,11 @@ namespace Script.Gameplay.Edit
         {
             _rigidbody = GetComponent<Rigidbody>();
             //应用序列化的初始状态
+<<<<<<< HEAD
+            _rigidbody.isKinematic = !IsEnableEdit;
+=======
             _rigidbody.isKinematic = !isOpenInEditor;
+>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
         }
 
 #if UNITY_EDITOR
@@ -43,7 +47,11 @@ namespace Script.Gameplay.Edit
             //在编辑器中即时生效
             _rigidbody = _rigidbody == null ? GetComponent<Rigidbody>() : _rigidbody;
             if (_rigidbody != null)
+<<<<<<< HEAD
+                _rigidbody.isKinematic = !IsEnableEdit;
+=======
                 _rigidbody.isKinematic = !isOpenInEditor;
+>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
         }
 #endif
     }

Assets/Script/Gameplay/Player/PlayerDialogueController.cs

@@ -19,9 +19,12 @@ namespace Script.Gameplay.Player
         public event Action OnPlayerEndDialogue;
         public event Action<GameObject> OnGazeEnterDialogue;
         public event Action<GameObject> OnGazeExitDialogue;
+<<<<<<< HEAD
+=======
         
         private InputManager inputManager;
         
+>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
         private Queue<string> dialogueQueue = new Queue<string>();
         private PlayerDialogueViewer playerDialogueViewer;
 
@@ -58,8 +61,12 @@ namespace Script.Gameplay.Player
             if (firstPersonRaycaster == null)
                 Debug.LogWarning("FirstPersonRaycaster not found! Please assign or add it to the player.");
 
+<<<<<<< HEAD
+            var input = InputManager.Instance.Input;
+=======
             inputManager = InputManager.Instance;
             var input = inputManager.Input;
+>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
             input.Player.Read.performed += ctx =>
             {
                 if (!isEnablePlayerDialogue) return;
@@ -99,8 +106,11 @@ namespace Script.Gameplay.Player
                 OnPlayerBeginDialogue?.Invoke();
                 CurrentDialogueTarget.OnBeginDialogue?.Invoke(true);
                 dialogueQueue = SplitDialogue(CurrentDialogueTarget.DialogueContent);
+<<<<<<< HEAD
+=======
                 inputManager.SetInputForLook(false);
                 inputManager.SetInputForMove(false);
+>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
                 PassNextDialogue();
             }
         }
@@ -130,8 +140,11 @@ namespace Script.Gameplay.Player
                 isReadingDialogue = false;
                 OnPlayerEndDialogue?.Invoke();
                 CurrentDialogueTarget.OnEndDialogue?.Invoke(true);
+<<<<<<< HEAD
+=======
                 inputManager.SetInputForLook(true);
                 inputManager.SetInputForMove(true);
+>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
                 if (playerDialogueViewer != null)
                 {
                     playerDialogueViewer.ClosePanel();