Skip to content

Commit

Permalink
bump Unity to 2022-3-46f1 (#17)
Browse files Browse the repository at this point in the history
* bump Unity to 2022-3-46f1

* bump Unity to 2022-3-46f1 (#18)
  • Loading branch information
bruno-garcia authored Oct 13, 2024
1 parent 01a1e30 commit b9a5b39
Show file tree
Hide file tree
Showing 49 changed files with 447 additions and 192 deletions.
3 changes: 2 additions & 1 deletion game/.idea/.idea.game/.idea/projectSettingsUpdater.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion game/Assets/Plugins/Sentry/SentryCliOptions.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions game/Assets/Resources/Sentry/SentryOptions.asset
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ MonoBehaviour:
<AutoSessionTrackingInterval>k__BackingField: 30000
<ReleaseOverride>k__BackingField:
<EnvironmentOverride>k__BackingField:
<AttachStacktrace>k__BackingField: 0
<AttachStacktrace>k__BackingField: 1
<AttachScreenshot>k__BackingField: 1
<ScreenshotQuality>k__BackingField: 2
<ScreenshotCompression>k__BackingField: 75
Expand All @@ -43,7 +43,7 @@ MonoBehaviour:
<IsEnvironmentUser>k__BackingField: 0
<EnableOfflineCaching>k__BackingField: 1
<MaxCacheItems>k__BackingField: 30
<InitCacheFlushTimeout>k__BackingField: 0
<InitCacheFlushTimeout>k__BackingField: 2000
<SampleRate>k__BackingField: 1
<ShutdownTimeout>k__BackingField: 2000
<MaxQueueItems>k__BackingField: 30
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public void SetUser()
{
SentrySdk.ConfigureScope(s =>
{
s.User = new User
s.User = new SentryUser
{
Email = "[email protected]",
Username = "ant",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public override void Configure(SentryUnityOptions options)
Debug.Log(nameof(RuntimeConfiguration) + "::Configure() called");

// BeforeSend is only relevant at runtime. It wouldn't hurt to be set at build time, just wouldn't do anything.
options.BeforeSend = sentryEvent =>
options.SetBeforeSend((sentryEvent, hint) =>
{
if (sentryEvent.Tags.ContainsKey("SomeTag"))
{
Expand All @@ -25,7 +25,7 @@ public override void Configure(SentryUnityOptions options)
}

return sentryEvent;
};
});

Debug.Log(nameof(RuntimeConfiguration) + "::Configure() finished");
}
Expand Down
4 changes: 2 additions & 2 deletions game/Assets/Scripts/Game/GameStateFighting.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public class GameStateFighting : GameState
private int _slowFrames = 0;
private int _frozenFrames = 0;
private int _totalFrames = 0;
private ITransaction _roundStartTransaction = null;
private ITransactionTracer _roundStartTransaction = null;

private float _startSpawnDelay = 3;
private float _spawnDelay = 3;
Expand Down Expand Up @@ -149,4 +149,4 @@ public override void Tick()
// return;
// }
}
}
}
4 changes: 2 additions & 2 deletions game/Assets/Scripts/SentryRuntimeConfiguration.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ public override void Configure(SentryUnityOptions options)
// Take a look at `SentryBuildTimeOptionsConfiguration` instead.
// TODO implement

options.BeforeBreadcrumb += breadcrumb =>
options.SetBeforeBreadcrumb((breadcrumb, hint) =>
{
if (breadcrumb.Category == "http")
{
return null;
}

return breadcrumb;
};
});
}
}
4 changes: 2 additions & 2 deletions game/Assets/Scripts/Utility/StateMachine/State.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public abstract class State<TStateType> where TStateType : Enum
private readonly StateMachine<TStateType> _stateMachine;

private static string PreviousState = null;
private static ITransaction PreviousTransaction = null;
private static ITransactionTracer PreviousTransaction = null;

protected State(StateMachine<TStateType> stateMachine)
{
Expand Down Expand Up @@ -57,4 +57,4 @@ public virtual void StateTransition(TStateType targetState)
_stateMachine.TransitionTo(targetState);
}
}
}
}
5 changes: 4 additions & 1 deletion game/Assets/Settings/2D Renderer Data.asset
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
debugShaders:
debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, type: 3}
hdrDebugViewPS: {fileID: 4800000, guid: 573620ae32aec764abd4d728906d2587, type: 3}
m_RendererFeatures: []
m_RendererFeatureMap:
m_UseNativeRenderPass: 0
Expand Down Expand Up @@ -44,7 +45,9 @@ MonoBehaviour:
m_ShapeLightVolumeShader: {fileID: 4800000, guid: 7e60080c8cd24a2468cb08b4bfee5606, type: 3}
m_PointLightShader: {fileID: 4800000, guid: e35a31e1679aeff489e202f5cc4853d5, type: 3}
m_PointLightVolumeShader: {fileID: 4800000, guid: c7d04ca57e5449d49ad9cee1c604bc26, type: 3}
m_BlitShader: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3}
m_CoreBlitShader: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3}
m_BlitHDROverlay: {fileID: 4800000, guid: a89bee29cffa951418fc1e2da94d1959, type: 3}
m_CoreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b, type: 3}
m_SamplingShader: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3}
m_ProjectedShadowShader: {fileID: 4800000, guid: ce09d4a80b88c5a4eb9768fab4f1ee00, type: 3}
m_SpriteShadowShader: {fileID: 4800000, guid: 44fc62292b65ab04eabcf310e799ccf6, type: 3}
Expand Down
15 changes: 11 additions & 4 deletions game/Assets/Sprites/Bug/Ant.png.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 11 additions & 4 deletions game/Assets/Sprites/Bug/AntShadow.png.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 11 additions & 4 deletions game/Assets/Sprites/Bug/Mantis.png.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit b9a5b39

Please sign in to comment.