This commit is contained in:
2025-10-09 11:54:18 +08:00
parent 2aeeaf7659
commit 34f977047d
33 changed files with 181 additions and 152 deletions

View File

@@ -10,7 +10,6 @@ public class AOTGenericReferences : UnityEngine.MonoBehaviour
"MyScripts.Runtime.dll",
"System.Core.dll",
"Unity.InputSystem.dll",
"Unity.RenderPipelines.Core.Runtime.dll",
"UnityEngine.CoreModule.dll",
"UnityEngine.JSONSerializeModule.dll",
"YooAsset.dll",
@@ -258,13 +257,23 @@ public class AOTGenericReferences : UnityEngine.MonoBehaviour
// System.Action<object>
// System.Collections.Generic.ArraySortHelper<object>
// System.Collections.Generic.Comparer<object>
// System.Collections.Generic.Dictionary.Enumerator<object,object>
// System.Collections.Generic.Dictionary.KeyCollection.Enumerator<object,object>
// System.Collections.Generic.Dictionary.KeyCollection<object,object>
// System.Collections.Generic.Dictionary.ValueCollection.Enumerator<object,object>
// System.Collections.Generic.Dictionary.ValueCollection<object,object>
// System.Collections.Generic.Dictionary<object,object>
// System.Collections.Generic.EqualityComparer<object>
// System.Collections.Generic.ICollection<System.Collections.Generic.KeyValuePair<object,object>>
// System.Collections.Generic.ICollection<object>
// System.Collections.Generic.IComparer<object>
// System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<object,object>>
// System.Collections.Generic.IEnumerable<object>
// System.Collections.Generic.IEnumerator<System.Collections.Generic.KeyValuePair<object,object>>
// System.Collections.Generic.IEnumerator<object>
// System.Collections.Generic.IEqualityComparer<object>
// System.Collections.Generic.IList<object>
// System.Collections.Generic.KeyValuePair<object,object>
// System.Collections.Generic.List.Enumerator<object>
// System.Collections.Generic.List<object>
// System.Collections.Generic.ObjectComparer<object>
@@ -389,8 +398,6 @@ public class AOTGenericReferences : UnityEngine.MonoBehaviour
// object UnityEngine.Object.Instantiate<object>(object)
// object UnityEngine.Object.Instantiate<object>(object,UnityEngine.Transform)
// object UnityEngine.Object.Instantiate<object>(object,UnityEngine.Transform,bool)
// bool UnityEngine.Rendering.VolumeProfile.TryGet<object>(System.Type,object&)
// bool UnityEngine.Rendering.VolumeProfile.TryGet<object>(object&)
// YooAsset.AssetHandle YooAsset.ResourcePackage.LoadAssetAsync<object>(string,uint)
// YooAsset.AssetHandle YooAsset.YooAssets.LoadAssetAsync<object>(string,uint)
}

View File

@@ -75,6 +75,7 @@
<type fullname="PatchManager" preserve="all" />
<type fullname="PatchOperation" preserve="all" />
<type fullname="PatchOperationData" preserve="all" />
<type fullname="SingletonMono`1" preserve="all" />
<type fullname="Singleton`1" preserve="all" />
</assembly>
<assembly fullname="System">
@@ -94,11 +95,9 @@
<type fullname="UnityEngine.InputSystem.InputControl" preserve="all" />
</assembly>
<assembly fullname="Unity.RenderPipelines.Core.Runtime">
<type fullname="UnityEngine.Rendering.VolumeComponent" preserve="all" />
<type fullname="UnityEngine.Rendering.VolumeProfile" preserve="all" />
</assembly>
<assembly fullname="Unity.RenderPipelines.Universal.Runtime">
<type fullname="UnityEngine.Rendering.Universal.Bloom" preserve="all" />
<type fullname="UnityEngine.Rendering.Universal.UniversalRenderPipelineAsset" preserve="all" />
</assembly>
<assembly fullname="Unity.TextMeshPro">
@@ -206,6 +205,7 @@
<type fullname="System.ArraySegment`1" preserve="all" />
<type fullname="System.Boolean" preserve="all" />
<type fullname="System.Byte" preserve="all" />
<type fullname="System.Collections.Generic.Dictionary`2" preserve="all" />
<type fullname="System.Collections.Generic.IEnumerable`1" preserve="all" />
<type fullname="System.Collections.Generic.IEnumerator`1" preserve="all" />
<type fullname="System.Collections.Generic.List`1" preserve="all" />

View File

@@ -5561,7 +5561,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Content: {fileID: 2682018696799193970}
m_Horizontal: 1
m_Horizontal: 0
m_Vertical: 1
m_MovementType: 1
m_Elasticity: 0.1

View File

@@ -4,6 +4,7 @@ using UnityEngine;
public class GameSystem : Singleton<GameSystem>
{
public NetWorkThirdCharacterController localPlayer;
public void Init()
{
UIManager.Inst.Init();
@@ -11,4 +12,11 @@ public class GameSystem : Singleton<GameSystem>
GraphicsManager.Inst.Init();
AudioManager.Inst.Init();
}
public void UpdateCursorState(bool value)
{
if (localPlayer != null)
{
localPlayer.UpdateCursorState(value);
}
}
}

View File

@@ -29,6 +29,7 @@ public class NetWorkThirdCharacterController : NetworkBehaviour
private Vector3 verticalVelocity;
private Vector2 moveInput;
private bool isGrounded;
[SerializeField]
private bool isCursorLocked = true;
void Awake()
@@ -45,6 +46,12 @@ public class NetWorkThirdCharacterController : NetworkBehaviour
RotateModel();
UpdateAnimator();
}
public void UpdateCursorState(bool value)
{
if (!isLocalPlayer) return;
isCursorLocked = value;
UpdateCursorState();
}
private void UpdateCursorState()
{
if (!isLocalPlayer) return;
@@ -119,8 +126,6 @@ public class NetWorkThirdCharacterController : NetworkBehaviour
if (!isLocalPlayer) return;
if (context.performed)
{
isCursorLocked = !isCursorLocked;
UpdateCursorState();
if (UIManager.Inst.CheckShow(nameof(SettingsWindow)))
{
UIManager.Inst.HideWindow(nameof(SettingsWindow));
@@ -195,6 +200,7 @@ public class NetWorkThirdCharacterController : NetworkBehaviour
public override void OnStartLocalPlayer()
{
Debug.Log("OnStartLocalPlayer");
GameSystem.Inst.localPlayer = this;
vCam.Priority = 15;
UpdateCursorState();
}

View File

@@ -48,6 +48,12 @@ public class ThirdCharacterController : MonoBehaviour
RotateModel();
UpdateAnimator();
}
public void UpdateCursorState(bool value)
{
if (!isLocalPlayer) return;
isCursorLocked = value;
UpdateCursorState();
}
private void UpdateCursorState()
{
if (!isLocalPlayer) return;
@@ -113,8 +119,6 @@ public class ThirdCharacterController : MonoBehaviour
if (!isLocalPlayer) return;
if (context.performed)
{
isCursorLocked = !isCursorLocked;
UpdateCursorState();
if (UIManager.Inst.CheckShow(nameof(SettingsWindow)))
{
UIManager.Inst.HideWindow(nameof(SettingsWindow));

View File

@@ -79,7 +79,7 @@ public class GraphicsSetting
public float renderScale = 1.0f;
public bool isCustom = false;
public int resolutionIndex = 0;
public int resolutionIndex = Screen.resolutions.Length - 1;
public bool fullscreen = true;
public bool borderless = false;
public int displayIndex = 0;

View File

@@ -37,8 +37,12 @@ public class SettingsWindow : UIBaseWindow
}
SwitchPanel(generalPanel);
base.OnShow();
GameSystem.Inst.UpdateCursorState(false);
}
protected override void OnHide()
{
GameSystem.Inst.UpdateCursorState(true);
}
private void SwitchPanel(UIBasePanel newPanel)
{
if (currentPanel != null)

View File

@@ -1,23 +1,23 @@
{
"FileVersion": "1.0.0",
"PackageName": "Preload",
"PackageVersion": "2025-09-22-640",
"PackageVersion": "2025-10-09-554",
"Wrappers": [
{
"BundleGUID": "5c45d5d7c6e6ebb6f60de2012a1c7246",
"FileName": "preload_assets_res_preload_hotupdatedll_5c45d5d7c6e6ebb6f60de2012a1c7246.bundle"
"BundleGUID": "fa4a44515183a01f3ab367e78b06c4bf",
"FileName": "preload_assets_res_preload_hotupdatedll_fa4a44515183a01f3ab367e78b06c4bf.bundle"
},
{
"BundleGUID": "df78f44a334e4d20f2fdbf50e349402e",
"FileName": "preload_assets_res_preload_uipanel_df78f44a334e4d20f2fdbf50e349402e.bundle"
"BundleGUID": "3af8985a0950e33249e822a39aa0ccc6",
"FileName": "preload_assets_res_preload_uipanel_3af8985a0950e33249e822a39aa0ccc6.bundle"
},
{
"BundleGUID": "f1cb6e8982352f1930694c45f971c27e",
"FileName": "preload_share_assets_res_preload_uipanelart_f1cb6e8982352f1930694c45f971c27e.bundle"
"BundleGUID": "219ff435ccd8a01117a1abb146297be0",
"FileName": "preload_share_assets_res_preload_uipanelart_219ff435ccd8a01117a1abb146297be0.bundle"
},
{
"BundleGUID": "6b7786486d6709e770ada5979e84a4fc",
"FileName": "preload_unityshaders_6b7786486d6709e770ada5979e84a4fc.bundle"
"BundleGUID": "4e1243970ec9c75cdb3d1f2552618719",
"FileName": "preload_unityshaders_4e1243970ec9c75cdb3d1f2552618719.bundle"
}
]
}

View File

@@ -1 +1 @@
2025-09-22-640
2025-10-09-554

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 111f22950bcdf8d429fb792fa6abb732
guid: 0eed98ff87cd99e4d9f4006580f636dc
DefaultImporter:
externalObjects: {}
userData:

View File

@@ -0,0 +1 @@
999dce39

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 9586cc28e4ee5fc4299a84a139ea0423
guid: bbef88cf5f7804147a516e01df75d1d9
DefaultImporter:
externalObjects: {}
userData:

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 04010696ec3cfe144b23692fcd62633d
guid: 2134e25b264154542817e0d0fa647c44
DefaultImporter:
externalObjects: {}
userData:

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 04fe4546b23221b4bab3b29a9db35c05
guid: 66ea3c090f5d3bb499958493f772d8a6
DefaultImporter:
externalObjects: {}
userData:

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: bd4c4686e96cbde4dbdd0fdc3b76c8f1
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: c908038fb03d4f440affd087c74a2322
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 2caec77def88e2f45aee1d5665c10ecf
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 6e5b0d7c0b0372145b2f4ed7e42985b9
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant: