Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump Unity to 2022-3-46f1 #18

Merged
merged 1 commit into from
Oct 13, 2024
Merged

bump Unity to 2022-3-46f1 #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion game/.idea/.idea.game/.idea/projectSettingsUpdater.xml
View file
Open in desktop

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

8 changes: 8 additions & 0 deletions game/Assets/Plugins/Sentry/SentryCliOptions.asset.meta
View file
Open in desktop

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
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion game/Assets/Samples/Sentry Unity/1.0.0/Unity of bugs/Scripts/AdditionalButtons.cs
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions game/Assets/Samples/Sentry Unity/1.0.0/Unity of bugs/Scripts/RuntimeConfiguration.cs
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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);
}
}
}
}
2 changes: 1 addition & 1 deletion game/Packages/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"com.unity.textmeshpro": "3.0.6",
"com.unity.timeline": "1.7.6",
"com.unity.ugui": "1.0.0",
"io.sentry.unity": "https://github.com/getsentry/unity.git#1.1.0",
"io.sentry.unity": "https://github.com/getsentry/unity.git#2.2.0",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",
"com.unity.modules.animation": "1.0.0",
Expand Down
4 changes: 2 additions & 2 deletions game/Packages/packages-lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,11 +174,11 @@
}
},
"io.sentry.unity": {
"version": "https://github.com/getsentry/unity.git#1.1.0",
"version": "https://github.com/getsentry/unity.git#2.2.0",
"depth": 0,
"source": "git",
"dependencies": {},
"hash": "3e83308f1f921c27a9c84473b072339195df08d8"
"hash": "45693349cd1e6315ce3d9b05c34e99ee14e4c922"
},
"com.unity.modules.ai": {
"version": "1.0.0",
Expand Down