浏览代码

Fixed Glyph game bugs caused by updated packages.

/main/staging/2021_Upgrade
当前提交
838efe8b
共有 10 个文件被更改,包括 79 次插入44 次删除
  1. 52
      Assets/Scenes/mainScene.unity
  2. 1
      Assets/Scripts/GameLobby/Infrastructure/LogHandlerSettings.cs
  3. 4
      Assets/Scripts/GameLobby/NGO/InGameRunner.cs
  4. 3
      Assets/Scripts/GameLobby/NGO/SetupInGame.cs
  5. 14
      Assets/Scripts/GameLobby/NGO/SymbolContainer.cs
  6. 9
      ProjectSettings/GraphicsSettings.asset
  7. 3
      ProjectSettings/QualitySettings.asset
  8. 2
      ProjectSettings/RiderScriptEditorPersistedState.asset
  9. 27
      Assets/UniversalRenderPipelineGlobalSettings.asset
  10. 8
      Assets/UniversalRenderPipelineGlobalSettings.asset.meta

52
Assets/Scenes/mainScene.unity


propertyPath: m_popUp
value:
objectReference: {fileID: 2637199315837045700}
- target: {fileID: 8425041362224744845, guid: 35249394896e31643ba0641c2a6f8e8d, type: 3}
propertyPath: m_editorLogVerbosity
value: 2
objectReference: {fileID: 0}
- target: {fileID: 8425041362224744849, guid: 35249394896e31643ba0641c2a6f8e8d, type: 3}
propertyPath: m_Pivot.x
value: 0

objectReference: {fileID: 0}
- target: {fileID: 2832906903618240629, guid: 9aae991127b410c45a001ecd7f75311d, type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
value: 0
value: 1
value: 0
value: 50
value: 0
value: 50
value: 0
value: 155.5
value: 0
value: -27.5
objectReference: {fileID: 0}
- target: {fileID: 2938110563166987729, guid: 9aae991127b410c45a001ecd7f75311d, type: 3}
propertyPath: m_AnchorMax.y

objectReference: {fileID: 0}
- target: {fileID: 6314503137265266719, guid: 9aae991127b410c45a001ecd7f75311d, type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
value: 0
value: 1
value: 0
value: 50
value: 0
value: 50
value: 0
value: 49.5
value: 0
value: -27.5
value: 0
value: 1
value: 0
value: 1
value: 0
value: 50
value: 0
value: 50
value: 0
value: 102.5
value: 0
value: -27.5
objectReference: {fileID: 0}
- target: {fileID: 6468178321825623330, guid: 9aae991127b410c45a001ecd7f75311d, type: 3}
propertyPath: m_AnchorMax.y

objectReference: {fileID: 0}
- target: {fileID: 7029771435095122102, guid: 9aae991127b410c45a001ecd7f75311d, type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
value: 0
value: 1
value: 0
value: 50
value: 0
value: 50
value: 0
value: 208.5
value: 0
value: -27.5
objectReference: {fileID: 0}
- target: {fileID: 7182908607506352373, guid: 9aae991127b410c45a001ecd7f75311d, type: 3}
propertyPath: m_AnchorMax.y

1
Assets/Scripts/GameLobby/Infrastructure/LogHandlerSettings.cs


private void Awake()
{
LogHandler.Get().mode = m_editorLogVerbosity;
Debug.Log($"Starting project with Log Level : {m_editorLogVerbosity.ToString()}");
Locator.Get.Messenger.Subscribe(this);
}
private void OnDestroy()

4
Assets/Scripts/GameLobby/NGO/InGameRunner.cs


public override void OnNetworkSpawn()
{
Debug.Log($"IsHost{IsHost} - NetworkSpawned");
if (IsHost)
FinishInitialize();
m_localUserData = new PlayerData(m_localUserData.name, NetworkManager.Singleton.LocalClientId);

private void FinishInitialize()
{
m_symbolContainerInstance = NetworkObject.Instantiate(m_symbolContainerPrefab).transform;
m_symbolContainerInstance.GetComponent<NetworkObject>().Spawn();
ResetPendingSymbolPositions();
m_killVolume.Initialize(OnSymbolDeactivated);
}

{
int index = SequenceSelector.k_symbolCount - m_pendingSymbolPositions.Count;
Vector3 pendingPos = m_pendingSymbolPositions.Dequeue();
var symbolObj = Instantiate(m_symbolObjectPrefab);
var symbolObj = Instantiate(m_symbolObjectPrefab, m_symbolContainerInstance);
symbolObj.NetworkObject.Spawn();
symbolObj.name = "Symbol" + index;
symbolObj.NetworkObject.TrySetParent(m_symbolContainerInstance, false);

3
Assets/Scripts/GameLobby/NGO/SetupInGame.cs


await Task.Delay(1);
m_inGameRunner = Instantiate(m_IngameRunnerPrefab).GetComponentInChildren<InGameRunner>();
m_inGameRunner.Initialize(OnConnectionVerified, m_lobby.PlayerCount, OnGameEnd, m_localUser);
m_inGameRunner.NetworkObject.Spawn();
}
private void OnConnectionVerified()

14
Assets/Scripts/GameLobby/NGO/SymbolContainer.cs


Locator.Get.Messenger.Subscribe(this);
}
public void Start()
{
if (!IsHost)
{
this.enabled = false; // Just disabling this script, not the whole GameObject.
return;
}
GetComponent<NetworkObject>().Spawn();
}
public override void OnNetworkSpawn()
{

transform.position = Vector3.up * 10;
}
else
{
this.enabled = false; // Just disabling this script, not the whole GameObject.
}
}

9
ProjectSettings/GraphicsSettings.asset


--- !u!30 &1
GraphicsSettings:
m_ObjectHideFlags: 0
serializedVersion: 13
serializedVersion: 14
m_Deferred:
m_Mode: 1
m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0}

- {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 10783, guid: 0000000000000000f000000000000000, type: 0}
m_PreloadedShaders: []
m_PreloadShadersBatchTimeLimit: -1
m_CustomRenderPipeline: {fileID: 0}
m_CustomRenderPipeline: {fileID: 11400000, guid: f54ab92f70892f44eba32f1c414f5b4a, type: 2}
m_TransparencySortMode: 0
m_TransparencySortAxis: {x: 0, y: 0, z: 1}
m_DefaultRenderingPath: 1

m_FogKeepExp2: 1
m_AlbedoSwatchInfos: []
m_LightsUseLinearIntensity: 0
m_LightsUseColorTemperature: 0
m_LightsUseColorTemperature: 1
m_SRPDefaultSettings:
UnityEngine.Rendering.Universal.UniversalRenderPipeline: {fileID: 11400000, guid: c96e53b1d712ac24eaccfd7f849c709d, type: 2}

3
ProjectSettings/QualitySettings.asset


shadowResolution: 2
shadowProjection: 1
shadowCascades: 4
shadowDistance: 150
shadowDistance: 160
shadowNearPlaneOffset: 3
shadowCascade2Split: 0.33333334
shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}

Lumin: 5
Nintendo Switch: 5
PS4: 5
Server: 0
Stadia: 5
Standalone: 5
WebGL: 3

2
ProjectSettings/RiderScriptEditorPersistedState.asset


m_Script: {fileID: 0}
m_Name:
m_EditorClassIdentifier: Unity.Rider.Editor:Packages.Rider.Editor:RiderScriptEditorPersistedState
lastWriteTicks: -8585486874935389899
lastWriteTicks: -8585486268141277427

27
Assets/UniversalRenderPipelineGlobalSettings.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: 2ec995e51a6e251468d2a3fd8a686257, type: 3}
m_Name: UniversalRenderPipelineGlobalSettings
m_EditorClassIdentifier:
k_AssetVersion: 2
lightLayerName0: Light Layer default
lightLayerName1: Light Layer 1
lightLayerName2: Light Layer 2
lightLayerName3: Light Layer 3
lightLayerName4: Light Layer 4
lightLayerName5: Light Layer 5
lightLayerName6: Light Layer 6
lightLayerName7: Light Layer 7
m_StripDebugVariants: 1
m_StripUnusedPostProcessingVariants: 0
m_StripUnusedVariants: 1
supportRuntimeDebugDisplay: 0

8
Assets/UniversalRenderPipelineGlobalSettings.asset.meta


fileFormatVersion: 2
guid: c96e53b1d712ac24eaccfd7f849c709d
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
正在加载...
取消
保存