charleslemaux/Mirror
1
0
Fork 0
mirror of https://github.com/MirrorNetworking/Mirror.git synced 2024-11-18 19:10:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
7,460 Commits 189 Branches 1,882 Tags 486 MiB
948defd3ec
Commit Graph

5363 Commits

Author SHA1 Message Date
MrGadget1024
d7d754884d Removed collider 2023-01-26 06:50:01 -05:00
MrGadget1024
2c556661a2 removed line from CmdSpawnNPC 2023-01-26 06:25:34 -05:00
MrGadget1024
f5d28334ee NPC Variant 2023-01-26 06:17:33 -05:00
MrGadget1024
010073b3a0 fixed scene assignments 2023-01-26 05:59:09 -05:00
vis2k
6f15f2f17a fix scene refs 2023-01-26 19:59:04 +09:00
vis2k
2af9dc106c add text mesh pro files :/ 2023-01-26 19:58:12 +09:00
MrGadget1024
d20bd1186a TestNT Example 2023-01-26 05:51:48 -05:00
MrGadget1024
505a8eca43 RemoteStats, NetworkStats minor changes 2023-01-26 03:29:28 -05:00
MrGadget1024
f16e1973c0 Additive Levels Offline Scene resaved 2023-01-26 03:28:29 -05:00
vis2k
5802fec712 SHA-1 comments 2023-01-26 01:41:34 +09:00
vis2k
01d0ae1a6b SimpleWebTransport: add SHA1 comments 2023-01-26 01:31:15 +09:00
MrGadget1024
debc78310d AdditiveLevels Example - Portal.cs typo 2023-01-24 15:16:46 -05:00
MrGadget1024
22ac763199 NetworkTransformBase - OnClientAuthorityChanged is Server Only 2023-01-20 19:32:06 -05:00
MrGadget1024
2239bb0245 NetworkTransformBase - syntax 2023-01-20 19:29:27 -05:00
MrGadget1024
dd5d7cab01 fix: NetworkTransform classes - methods in call order 2023-01-19 07:26:56 -05:00
MrGadget
af0bacf8ae
NetworkTransformBase - Reset when changing authority (#3357) 2023-01-19 12:04:14 +01:00
MrGadget1024
16b60e80f3 PlayerCamera - Added warnings for no MainCamera 2023-01-18 09:10:48 -05:00
MrGadget1024
a35c0dbd9a fix: ChangeOwner now adds/removes from owned hashset 
We do this in spawn and destroy already.
 2023-01-16 07:30:39 -05:00
MrGadget1024
3e7837cebd Revert "Added License, Notice, Version files" 
This reverts commit 585be60d38.
 2023-01-14 11:01:42 -05:00
MrGadget1024
585be60d38 Added License, Notice, Version files 2023-01-14 11:01:14 -05:00
MrGadget
a024753a42
fix: Fixes #3317 - NetworkTransformReliable: don't send last snapshot (#3355) 2023-01-14 11:34:28 +01:00
MrGadget
875b34540a
fix: #3351 - Reset Statics in NS, NC, and NC_TimeInterpolation (#3353) 
* fix: Fix #3351 - NetworkClient_TimeInterpolation reset statics
- Fixes #3351

* NetworkServer - reset actualTickRate

* NetworkClient - reset lastSendTime

* NetworkClient_TimeInterpolation - reverted reset of bufferTimeMultiplier
- added comment as to why we're not resetting it.
 2023-01-13 22:11:43 +01:00
MrGadget1024
626180b2d3 Network Manager HUD - made it wider so it doesn't wrap as much 2023-01-12 22:09:15 -05:00
MrGadget1024
0cc27d2372 NetworkClient - added bufferTimeMultiplier to OnGUI 2023-01-12 22:08:38 -05:00
vis2k
027458db96 fix: #3344 NetworkServer.Shutdown sets active=false after destroying spawned objects. 
this way scene objects without owners can still modify SyncLists in OnStopServer without IsWriteable() throwing an exception about NetworkServer being inactive.
 2023-01-12 12:06:04 +01:00
vis2k
74e6b72239 fix: NetworkServer.DisconnectAll doesn't set inactive anymore. it should simply "disconnect all" connections. 
otherwise Shutdown may not be able to properly clean up all objects.
prepares to fix #3344
 2023-01-12 11:46:45 +01:00
vis2k
c04eeacba6 comment improved 2023-01-12 11:38:24 +01:00
vis2k
e16e55616b fix: #3354 SyncList callback for OP_SET index parameter fixed 2023-01-12 00:44:18 +01:00
MrGadget1024
3e8880db1c BasicAuthenticator - comment typo 2023-01-11 15:47:37 -05:00
MrGadget1024
655d0b0aa8 fix: NetworkClient - make OnGUI public 2023-01-09 19:24:49 -05:00
MrGadget1024
b642da6b2f fix: Fix #3349 - NetworkTransformReliable use correct value in OnSerialize 
- Fixes #3349
 2023-01-09 09:41:19 -05:00
vis2k
2c9f6c4960 fix: kcp2k V1.27. fixes #3337 2023-01-08 11:51:50 +01:00
MrGadget1024
c93935422e Check for no Camera.main in OnGUI 
- avoids NRE flood if no camera with MainCamera tag.
 2023-01-06 18:50:13 -05:00
mischa
3c85efa2d9
fix: #3330 #2422 SpawnObjects now activates, but does not spawn scene objects with inactive parents (#3347) 
* fix: #3330 #2422 SpawnObjects now activates, but does not spawn scene objects with inactive parents

* helper function

* remove old workaround.
identities which aren't active in hierarchy don't have Awake called forcefully anymore.
it's not necessary because the second pass won't spawn them anymore.

* add comments
 2023-01-06 18:21:03 +01:00
vis2k
c9dfd95bb7 add comment 2023-01-06 17:40:57 +01:00
vis2k
7b7ad85204 fix: #3340 SyncSet/Dictionary callbacks are only called once 2023-01-05 21:54:53 +01:00
vis2k
c5aa4746e1 fix: #3340 SyncList callbacks are only called once 2023-01-05 21:21:51 +01:00
vis2k
0d53f7c3a0 fix: #3343 allow modifying client synclists for unspawned objects like character previews 2023-01-04 01:32:11 +01:00
vis2k
8570afab94 fix: #3341 SyncLists can now be modified before spawning again 2023-01-04 01:10:53 +01:00
vis2k
02218bda13 fix: #3342 InitSyncObject IsWritable/IsRecording permissions fixed for host mode and other player's objects on client 2023-01-04 01:10:51 +01:00
vis2k
d645aad95c fix: forgot to remove SyncList OnSerializeAll log message 2023-01-04 01:02:47 +01:00
MrGadget1024
34f6df24a1 NetworkClient - moved RegisterMessageHandlers down 2023-01-03 15:41:01 -05:00
MrGadget
273f91088f
fix: #3326 NetworkIdentity doesn't reset SyncObjects anymore (#3339) 
* Fixes: #3326
- All callers to Reset are either unspawning (disabling) the object or have run a custom UnSpawnHandler
- Sync collections should retain their data in any case because the object may get respawned
- When it is respawned, OnDeserializeAll clears the internal collection and changes lists before adding back the entire payload.
- Users can always call the public Reset on the SyncObject themselves if they want it wiped.

* fixed comment
 2023-01-03 09:59:36 +01:00
MrGadget1024
30ec858551 NetworkClient - formatting 2023-01-02 12:50:41 -05:00
MrGadget1024
0189b7f45e NetworkServer - formatting 2023-01-02 12:49:53 -05:00
MrGadget1024
1f09c7f98d NetworkIdentity - formatting 2023-01-02 12:49:04 -05:00
MrGadget1024
ed102ffb23 NetworkIdentity - moved SetClientOwner down with AssignClientAuthority 
- AssignClientAuthority is the only caller in this class
 2023-01-02 12:28:58 -05:00
MrGadget1024
9405e9fef6 NetworkIdentity - moved ResetStatics up 2023-01-02 12:26:53 -05:00
MrGadget1024
bc28022552 NetworkIdentity - moved HandleRemoteCall up 
- Nothing in NetworkIdentity calls this, only external callers
 2023-01-02 12:24:20 -05:00
MrGadget1024
de421cdc1f NetworkIdentity - moved ClearDirtyBits methods up to their respective callers 2023-01-02 12:21:08 -05:00
MrGadget1024
c0e047b01a NetworkClient - moved NotifyAuthority and 2 related others down below Reset 2023-01-02 12:13:59 -05:00
MrGadget1024
d71c9e2a77 NetworkIdentity - moved ClearObservers down below Reset 2023-01-02 12:09:15 -05:00
MrGadget1024
82ff8fddf7 NetworkClient - moved DestroyObject down 2023-01-02 11:15:13 -05:00
MrGadget1024
3616ad818b NetworkServer - moved obsoletes 
- localClientActive to above active
- ActivateHostScene to bottom out of the way
 2023-01-02 09:53:01 -05:00
MrGadget1024
ce7706b5a0 NetworkServer - moved RemoveTransportHandlers up 2023-01-02 09:42:46 -05:00
MrGadget1024
ed8baffc6c NetworkServer - moved Listent and Shutdown up 2023-01-02 09:40:43 -05:00
MrGadget1024
2943aff578 NetworkServer - moved RebuildObserversCustom down 2023-01-02 09:33:52 -05:00
MrGadget1024
c4b919b7bc NetworkServer - moved AddAllReadyServerConnectionsToObservers down 2023-01-02 09:32:41 -05:00
MrGadget1024
5f455245ee NetworkServer - moved message handers up with RegisterMessageHandlers 2023-01-02 09:22:49 -05:00
MrGadget1024
ecfa4dd26e NetworkServer - Organized spawn methods to call order 2023-01-02 09:10:14 -05:00
MrGadget1024
a25502f82d NetworkServer - put AddPlayerForConnection methods in call order 
- moved RemovePlayerForConnection up
 2023-01-02 08:57:29 -05:00
MrGadget1024
051b63caee NetworkServer - put Destroy methods together in call order 2023-01-02 08:54:08 -05:00
MrGadget1024
1f87ebdf45 NetworkClient - Moved Destroy method down 
- put it with DestroyAllClientObjects
- preparing for consolidation
 2023-01-02 07:12:21 -05:00
MrGadget
77a4ad9674
breaking: Removed Old Obsoletes (#3335) 
- Also normalized Deprecatd comments for easier searching
 2023-01-01 18:37:49 +01:00
MrGadget
c364d194fe
fix: #3334 NetworkClient DestroyAllClientObjects Before ClearSpawners (#3336) 
* fix: NetworkClient DestroyAllClientObjects Before ClearSpawners
- DestroyAllClientObjects needs to be able to call Unspawn handlers
- Fixes: 3334

* Update Assets/Mirror/Core/NetworkClient.cs

Co-authored-by: mischa <16416509+vis2k@users.noreply.github.com>
 2023-01-01 18:22:02 +01:00
MrGadget1024
4deb179d62 PreprocessorDefine - fixed typo in comment 2022-12-31 10:32:41 -05:00
MrGadget1024
ff461331d4 PreprocessorDefine - added 12 months comment 2022-12-31 10:29:48 -05:00
MrGadget1024
97547a285c Culled compiler symbols to last 12 months 
- Going forward, we need to remove oldest when we add new one each month when we publish to the store, so we only keep them back 12 months.
 2022-12-31 10:19:16 -05:00
vis2k
642423aef8 MIRROR_71_0_OR_NEWER 2022-12-31 14:44:09 +01:00
vis2k
ca9f07d812 fix: #3329 NetworkTransform UpdateServer checks if .connectionToClient is null to support room demo / scene changes 2022-12-31 14:36:57 +01:00
vis2k
6581300ce0 remove unused imports 2022-12-31 14:34:28 +01:00
MrGadget
993caf3b36
NetworkClient - Use TryGetComponent (#3331) 
This eliminates allocations, at least in the editor, per Unity docs.
 2022-12-31 13:59:57 +01:00
MrGadget
82a7e752a8
Use TryGetComponent (#3332) 
This eliminates allocations, at least in the editor, per Unity docs.
 2022-12-31 13:59:42 +01:00
MrGadget
fe4aa931e1
feat: NetManHUD StopClient button for Host (#3333) 2022-12-31 13:59:12 +01:00
MrGadget1024
be5cd6472a fix: set offline mode before OnStopClient 
- Prevents StopClient from running more than once
- Fixes: #2080
 2022-12-30 22:03:53 -05:00
mischa
739ef7ccc0
fix: #2240 #3324 NetworkIdentity.OnDestroy removes from spawned if not removed yet. prevents null entries in .spawned. (#3327) 
* fix: #2240 #3324 NetworkIdentity.OnDestroy removes from spawned if not removed yet.
prevents null entries in .spawned.

* Update Assets/Mirror/Core/NetworkIdentity.cs

Co-authored-by: MrGadget <9826063+MrGadget1024@users.noreply.github.com>

Co-authored-by: MrGadget <9826063+MrGadget1024@users.noreply.github.com>
 2022-12-30 22:38:16 +01:00
mischa
e95c9ae9a7
fix: #3318 NetworkServer.SpawnObjects only spawns objects which haven't been spawned yet. (#3328) 
additive scene loading would call SpawnObjects again, which would attempt to spawn _all_ previously spawned objects _and_ the newly loaded ones.
 2022-12-30 21:45:51 +01:00
MrGadget1024
1746468bef Removed unnecessary check 2022-12-30 15:32:46 -05:00
vis2k
c4e0e1b3bd NetworkServer: explain 'already spawned' warning in comments 2022-12-30 21:24:01 +01:00
mischa
100847cc31
fix: #3308 scene change NetworkClient.owned null entry. NetworkIdentity.OnDestroy now removes from owned. (#3325) 2022-12-30 18:02:34 +01:00
MrGadget1024
17c5a6c956 comment added 2022-12-30 07:23:52 -05:00
MrGadget1024
205ced88aa fix: Use NetworkClient.Send 
- there is a null check in Send before attempting to use the connection
 2022-12-30 07:20:24 -05:00
MrGadget1024
321b68238d FPS - fixed namespace 2022-12-28 09:19:45 -05:00
vis2k
ac3d6b7699 NetworkTransformBase: expose lists for outside access 2022-12-28 09:29:40 +01:00
MrGadget1024
fdd7a32402 NetworkManager Template - moved Awake override up 2022-12-27 20:00:33 -05:00
MrGadget
3faec24681
NetworkTransformBase - make snapshot lists readonly (#3322) 
- code smell
 2022-12-27 22:42:22 +01:00
MrGadget1024
16d8c08a75 Network Manager Template - moved setting singleton to Awake 2022-12-27 15:23:08 -05:00
MrGadget1024
26e3c5a4fa TimeSampleTests- Bigger Within so it passes more reliably 2022-12-27 10:38:46 -05:00
mischa
6cf03d60a3
fix: #3315 ClientToServer SyncList support (#3320) 
* SyncDirection demo: add SyncList test

* resaved prefab

* update error message

* logs

* disable AddOperation ReadOnly checks for now

* logs

* IsRecording adjusted to client

* kcp: larger timeout for debugging

* WORKS but not very clean yet

* update comments

* IsReadOnly moved to SyncObject

* IsWriteable lambda

* better

* fix tests

* fix host mode

* tests

* tests

* throw if undefined behaviour

* fix test

* remove logs
 2022-12-26 10:39:55 +01:00
vis2k
19b712fac8 Weaver: Rpc hash collision warning improved. 2022-12-23 12:03:21 +01:00
vis2k
e1e6fb0098 NetworkBehaviour.OnSerialize/OnDeserialize: De/SerializeSyncObjects helper functions for cleaner code 2022-12-22 23:38:56 +01:00
vis2k
cd6e34f4b4 fix: kcp2k V1.26 [2022-12-22] 
- KcpPeer.RawInput: fix compile error in old Unity Mono versions
- fix: KcpServer sets up a new connection's OnError immediately.
  fixes KcpPeer throwing NullReferenceException when attempting to call OnError
  after authentication errors.
- improved log messages
 2022-12-22 22:59:42 +01:00
vis2k
13c349d27a SyncDirection example: increase spacing 2022-12-22 22:59:39 +01:00
vis2k
a8bb5e3647 syntax 2022-12-22 22:59:37 +01:00
MrGadget1024
4434ab1be3 NetworkServer - added gameobject param to debug logs 2022-12-22 16:23:17 -05:00
MrGadget1024
6c101c5c85 NetworkLerpRigidbody - syntax 2022-12-22 02:44:52 -05:00
MrGadget1024
6bb396ef5b NetworkRigidbody2D - syntax 2022-12-22 02:41:38 -05:00
MrGadget1024
bcd9621a89 NetworkRigidbody2D - HelpURL 2022-12-22 02:35:22 -05:00
MrGadget1024
faede54e14 NetworkRigidbody - syntax 2022-12-22 02:33:31 -05:00
MrGadget1024
274721b297 fix: AddComponentMenu hide example / obsolete components 
Added [AddComponentMenu("")] to:
- BenchmarkNetworkManager
- CCUNetworkManager
- NetworkTransformChild
 2022-12-22 02:22:23 -05:00
MrGadget1024
b662e367a9 NetworkRoomManager removed maxxConnections checks 
- NetworkServer cuts them off earlier.
 2022-12-21 09:59:27 -05:00
MrGadget1024
e468443a2e Merge branch 'master' of https://github.com/vis2k/Mirror 2022-12-21 09:57:30 -05:00
MrGadget1024
22fa56da70 Discovery Template - Changed to structs 2022-12-21 09:57:24 -05:00
vis2k
d4dc9a7585 fix broken tests 2022-12-21 10:36:22 +01:00
Tubeliar
74a24150f6
breaking: Reduce code duplication with common base class for NetworkTransform and NetworkTransformReliable (#3314) 
* Move Networktransform OnGUI and gizmos to a common baseclass

* Move networktransform teleportation and reset to common base class

* Move networktransform adding snapshots to common base class

* Move networktransform snapshot construction and application to common base class

* Move networktransform awake, onvalidate and IsClientWithAuthority to common base class
 2022-12-20 22:14:18 +01:00
TCROC
ebc087ad54
Fixed server and client connection attempt with AddPlayer before authentication completes (#3310) 
* Fixed server and client connection attempt before authentication completes

* Removed auth check on server

* Updated with suggestions from MrGadget
 2022-12-20 11:03:20 -05:00
vis2k
c50ea9cb55 script icons 2022-12-20 10:49:23 +01:00
MrGadget1024
48926e841a NetworkRoomManager - kick late joiner 
- OnServerConnect should do this, but for corner case of miraculous timing, do it here too.
 2022-12-18 20:31:35 -05:00
MrGadget1024
0b082530ba Restored [RequireComponent(typeof(NetworkTransform))] 
In these 4 examples, NT Unreliable is fine.
 2022-12-18 18:49:42 -05:00
MrGadget1024
2991598405 Merge branch 'master' of https://github.com/vis2k/Mirror 2022-12-14 23:51:44 -05:00
MrGadget1024
461ce27908 fix: Added clientStarted check to OnStopClient 
- fixes: #3245
 2022-12-14 23:51:08 -05:00
vis2k
fe3627f03b perf: fix: KcpTransport CongestionWindow force disabled. enabling this would cause a significant slowdown in throughput, with only 2-3 MTU sized messages being flushed per update. best to keep this disabled, as the feature may be broken in kcp. 2022-12-14 21:09:13 +01:00
vis2k
1a0a9a0cce KcpTransport: [Header] improved 2022-12-14 21:04:39 +01:00
vis2k
f14d423183 kcp2k V1.25 [2022-12-14] 
- breaking: removed where-allocation. use IL2CPP on servers instead.
- breaking: KcpConfig to simplify configuration
- high level cleanups
- perf: KcpPeer: StopWatch replaced with time parameters.
  all peers can now share the same stopwatch on servers.
 2022-12-14 21:04:28 +01:00
vis2k
69ac95e55e NetworkClient: improve 'found null entry' message to not sound the same as on the server 2022-12-14 18:30:16 +01:00
vis2k
3e3a1cbb44 fix: #3307 kcp2k V1.24 2022-12-14 01:04:16 +01:00
mischa
42a0c8ef67
fix: #3302 StartHost: user callbacks OnStartServer/OnStartHost aren't invoked until everything was set up in FinishStartHost. (#3304) 2022-12-13 13:17:53 +01:00
mischa
b58084583f
Welcome message moved out of NetworkManager into standalone Editor script, per-session instead of per-play. (#3306) 2022-12-13 13:16:59 +01:00
MrGadget1024
83581f0be1 syntax 2022-12-13 05:52:37 -05:00
MrGadget1024
da3f3e2f29 Merge branch 'master' of https://github.com/vis2k/Mirror 2022-12-13 05:27:14 -05:00
MrGadget1024
9c4774f14f SWT - fixed server logging showColor 2022-12-13 05:27:09 -05:00
vis2k
60948b13b3 NetworkManager.SetupServer: OnStartServer callback is now invoked manually by callers to prepare for host mode fix for #3302 2022-12-12 17:52:37 +01:00
vis2k
db8c54f913 NetworkServer.localConnection: strong typing 2022-12-12 16:35:54 +01:00
vis2k
0e9edbd0ad NetworkClient.activeHost to replace .isHostClient (consistent with NetworkServer.activeHost) 2022-12-12 15:50:45 +01:00
vis2k
a4f3872a01 NetworkServer.activeHost to replace .localClientActive 2022-12-12 15:50:41 +01:00
vis2k
6088591269 NetworkClient.RegisterSystemHandlers renamed to RegisterMessageHandlers for consistency with NetworkServer.RegisterMessageHandlers 2022-12-12 15:25:59 +01:00
vis2k
725fdc24f4 syntax for readability 2022-12-12 15:19:15 +01:00
vis2k
97b365c54f NetworkManager.IsSceneActive moved to Utils.IsSceneActive as it's a general purpose Unity function, unrelated to NetworkManager itself 2022-12-12 15:18:17 +01:00
vis2k
599519e163 NetworkManager.FinishStartHostClient merged with FinishStartHost, because the functions configures both server & client, just as FinishStartHost does. this is less confusing. 2022-12-12 14:29:42 +01:00
vis2k
636995e3f0 HostMode.ActivateHostScene to move ActivateHostScene out of NetworkServer.cs 2022-12-12 14:27:12 +01:00
vis2k
0a9fcdcf06 HostMode.InvokeOnConnected to move ConnectLocalServer out of NetworkClient 2022-12-12 14:23:48 +01:00
vis2k
def22c864d HostMode.cs - to move host mode connection setup out of NetworkClient 2022-12-12 14:13:31 +01:00
vis2k
ca3bfed93a TODO 2022-12-12 13:58:23 +01:00
vis2k
e0ffc66be8 NetworkClient.ConnectHost: local connection setup moved into a separate function 2022-12-12 13:56:13 +01:00
vis2k
1b7906c1ed NetworkManager.StartHostClient renamed to FinishStartHostClient to be more obvious 2022-12-12 13:48:11 +01:00
vis2k
d406a55e49 Utils.CreateLocalConnections for use from NetworkClient.ConnectHost & Tests 2022-12-12 13:40:50 +01:00
vis2k
8c5152dc65 revert: "Weaver: added missing HashSet<T> reader/writer generation after recent PR" - tests are still failing 2022-12-10 22:37:59 +01:00
vis2k
51eeb8a22d add comments 2022-12-10 22:36:27 +01:00
vis2k
5e6b647723 Tests: add missing attribute 2022-12-10 22:16:22 +01:00
vis2k
25794f2411 NetworkClient.InternalAddPlayer: improve error message 2022-12-10 02:47:09 +01:00
vis2k
6f98725247 MIRROR_70_0_OR_NEWER 2022-12-09 21:36:39 +01:00
vis2k
5509bb73bb fix: 2019 support 2022-12-09 21:36:36 +01:00
vis2k
8f480ad963 add comments 2022-12-09 20:47:50 +01:00
vis2k
c994bb41b7 syntax 2022-12-09 20:47:33 +01:00
Reuben Carolan
7b4e174d23 feature: Weaver HashSet<T> support (we already had List<T> support) for cases where we a struct may need to serialize a HashSet member for serialization etc. 2022-12-09 20:45:49 +01:00
MrGadget1024
c36e1f564d Added [Multiplexer] to logging 2022-12-09 09:23:53 -05:00
MrGadget1024
6ae165e308 SimpleWebTransport - Added UNITY_SERVER around Exception logging 
- don't need color tags on server
 2022-12-09 09:08:17 -05:00
MrGadget1024
33f1f95b8b WebSocketServer- added false for showColor to server side logging 2022-12-09 09:01:40 -05:00
MrGadget1024
1412c4606c Added [SimpleWebTransport] to logging in case using Multiplexer 2022-12-09 08:57:12 -05:00
MrGadget1024
1cf5e7f333 Added [KCP] to logging in case using Multiplexer 2022-12-09 08:42:07 -05:00