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.

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

WebGL+P2Pでマルチプレイ/チャットできるようにする #11

Merged
merged 68 commits into from
Sep 15, 2023
Merged
Show file tree
Hide file tree
Changes from 47 commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
a54f203
Specify the version of the Docker images
kiyohome Jun 19, 2023
7975ecc
Add restart:always to docker-compose for grafana
kiyohome Jun 20, 2023
3d07f5f
Add NuGet importer for Unity
kiyohome Jun 20, 2023
dc53117
Add Socket.IO and Unity.WebRTC
kiyohome Jun 20, 2023
e7101f2
Change to Host/Client by deleting the multiplayer server while still …
kiyohome Jul 5, 2023
76c1745
Add signaling server for P2P
kiyohome Jul 7, 2023
67806d3
Change to use Unity.WebRTC for multiplayer transport
kiyohome Jul 9, 2023
f19e225
Fix timing of resetting multiplayer positions
kiyohome Jul 10, 2023
4388adb
Add description for source code
kiyohome Jul 10, 2023
4eb1472
Add timeout to peer config and Refactoring
kiyohome Jul 10, 2023
6edb073
Change to use Unity.WebRTC for text chat
kiyohome Jul 10, 2023
1b379eb
Fix a few things to make P2P multiplayer more stable
kiyohome Jul 11, 2023
d7cfbe6
Change to use Unity.WebRTC for voice chat and Remove Vivox
kiyohome Jul 11, 2023
fdacd7e
Change to aggregate one root
kiyohome Jul 12, 2023
8dcc429
Add error handling when unable to connect to P2P or disconnected
kiyohome Jul 12, 2023
05be765
Remove ScriptTemplates because of maintenance costs
kiyohome Jul 14, 2023
5198ac4
Move Servers directory to Assets
kiyohome Jul 14, 2023
6db5168
Add default WebGLTemplates
kiyohome Jul 14, 2023
0838722
Move Servers directory to Assets
kiyohome Jul 16, 2023
e723694
Add multiplayer and chat using WebGL
kiyohome Jul 17, 2023
b3abe3f
Move Servers directory
kiyohome Jul 26, 2023
7d6ef03
Change the initialize parameter of WebGLHelper
kiyohome Jul 26, 2023
ff2fd17
Extract common web and P2P features into Extreal modules
kiyohome Jul 27, 2023
3b33cdb
Add a handling of group update failures
kiyohome Jul 29, 2023
23f5db8
Extract common web and P2P features into Extreal modules
kiyohome Jul 29, 2023
1bcec74
Add a handling of group update failures
kiyohome Jul 29, 2023
19ed579
Refactoring
kiyohome Aug 2, 2023
5169496
Update extreal modules for WebGL/P2P
kiyohome Aug 3, 2023
ee60c86
Update extreal modules for WebGL/P2P (Native)
kiyohome Aug 3, 2023
d2da974
Remove code for mobile and Fix a few issues etc...
kiyohome Aug 4, 2023
2d6ea6e
Change windows platform and asset load path is locale
kiyohome Aug 4, 2023
9917bf0
Add playing on WebGL to readme
kiyohome Aug 4, 2023
33f0a6b
Changed to exclude only the contents of the build destination folder.
sasuke9410 Aug 24, 2023
f888dd4
Fixed folder path used for Deno.
sasuke9410 Aug 24, 2023
dc0c11b
Fixed duplicate log items.
sasuke9410 Aug 24, 2023
be0ecf2
Remove unused variables.
sasuke9410 Aug 24, 2023
a21365c
Add message subject.
sasuke9410 Aug 24, 2023
f939305
Remove variables used for unimplemented functions
sasuke9410 Aug 25, 2023
b9d2990
Remove unnecessary keyword
sasuke9410 Aug 25, 2023
c998678
Refactoring
sasuke9410 Aug 25, 2023
a4deaca
Refactoring
sasuke9410 Aug 25, 2023
b1ef551
Add Forget method
sasuke9410 Aug 25, 2023
5c19918
Remove unnecessary where clause
sasuke9410 Aug 25, 2023
4f68911
Refactoring
sasuke9410 Aug 28, 2023
0a3600d
Remove the files automatically generated when building the environment
sasuke9410 Aug 28, 2023
2076fcb
Change javascript files are not read in unity editor
sasuke9410 Aug 28, 2023
f3599c9
Remove unuse variables
sasuke9410 Aug 29, 2023
d06e64a
Added documentation for running webgl applications in a local environ…
sasuke9410 Sep 5, 2023
180c6ce
Fixed log message
sasuke9410 Sep 6, 2023
3e20404
Refactoring
sasuke9410 Sep 6, 2023
b6e9bc8
Fix Asynchronize update button
sasuke9410 Sep 8, 2023
4483c93
Remove javascript files from git management target
sasuke9410 Sep 8, 2023
874fb50
Add automatically generated meta file to the gitignore
sasuke9410 Sep 8, 2023
82ea200
Remove unnecessary file from gitignore
sasuke9410 Sep 8, 2023
954879d
Add clear methods
sasuke9410 Sep 8, 2023
7f7d42f
Remove unuse observable and subject
sasuke9410 Sep 8, 2023
1411548
Refactoring
sasuke9410 Sep 12, 2023
01703d6
Remove deleted file in .gitignore
sasuke9410 Sep 13, 2023
437e6fe
Update extreal modules
sasuke9410 Sep 14, 2023
122b4ba
Update extreal modules
sasuke9410 Sep 14, 2023
a4b2f54
delete IsSpace() for no use
mahaweilu Sep 15, 2023
e4a525f
delete unused code
mahaweilu Sep 15, 2023
c45a2a8
update vscode package
mahaweilu Sep 15, 2023
05619bd
delete unused code
mahaweilu Sep 15, 2023
282b4ef
add coverage comment
mahaweilu Sep 15, 2023
ac9f87c
delete unused code
mahaweilu Sep 15, 2023
6b84c9d
delete unused source
mahaweilu Sep 15, 2023
8e0e76d
delete unnecessary async symbol
mahaweilu Sep 15, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
20 changes: 14 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,6 @@ crashlytics-build.properties
# Idea
.idea

# Application config scriptable object
ChatConfig.asset*
MultiplayConfig.asset*
AppUsageConfig.asset*

# Addressables connection server config
SecretVariables.cs*
sus-taguchi-t marked this conversation as resolved.
Show resolved Hide resolved

Expand All @@ -85,5 +80,18 @@ Assets/Mixamo/*/tex/*
AvatarAmy.prefab*
AvatarMichelle.prefab*

# NuGet importer
/[Aa]ssets/[Pp]ackages.meta
/[Aa]ssets/[Pp]ackages/
/[Nn]u[Gg]et/
/[Pp]ackages/*/

# Docker data
Servers/VisualizationOfAppUsage/.data
Servers/AppUsage/.data

# WebGL
Assets/WebGLScripts/node_modules
Assets/WebGLScripts/node_modules.meta
WebGLBuild/Holiday/*
WebGLBuild/Data/*
Assets/WebGLTemplates/Holiday/index.js
6 changes: 6 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"recommendations": [
"denoland.vscode-deno",
"rome.rome"
]
}
129 changes: 70 additions & 59 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,61 +1,72 @@
{
"files.exclude":
{
"**/.DS_Store":true,
"**/.git":true,
"**/.gitmodules":true,
"**/*.booproj":true,
"**/*.pidb":true,
"**/*.suo":true,
"**/*.user":true,
"**/*.userprefs":true,
"**/*.unityproj":true,
"**/*.dll":true,
"**/*.exe":true,
"**/*.pdf":true,
"**/*.mid":true,
"**/*.midi":true,
"**/*.wav":true,
"**/*.gif":true,
"**/*.ico":true,
"**/*.jpg":true,
"**/*.jpeg":true,
"**/*.png":true,
"**/*.psd":true,
"**/*.tga":true,
"**/*.tif":true,
"**/*.tiff":true,
"**/*.3ds":true,
"**/*.3DS":true,
"**/*.fbx":true,
"**/*.FBX":true,
"**/*.lxo":true,
"**/*.LXO":true,
"**/*.ma":true,
"**/*.MA":true,
"**/*.obj":true,
"**/*.OBJ":true,
"**/*.asset":true,
"**/*.cubemap":true,
"**/*.flare":true,
"**/*.mat":true,
"**/*.meta":true,
"**/*.prefab":true,
"**/*.unity":true,
"build/":true,
"Build/":true,
"Library/":true,
"library/":true,
"obj/":true,
"Obj/":true,
"ProjectSettings/":true,
"temp/":true,
"Temp/":true,
},
"[csharp]": {
"editor.defaultFormatter": "ms-dotnettools.csharp",
"editor.formatOnSave": true,
"files.encoding": "utf8bom",
},
"omnisharp.enableRoslynAnalyzers": true,
"files.exclude": {
"**/.DS_Store": true,
"**/.git": true,
"**/.gitmodules": true,
"**/*.booproj": true,
"**/*.pidb": true,
"**/*.suo": true,
"**/*.user": true,
"**/*.userprefs": true,
"**/*.unityproj": true,
"**/*.dll": true,
"**/*.exe": true,
"**/*.pdf": true,
"**/*.mid": true,
"**/*.midi": true,
"**/*.wav": true,
"**/*.gif": true,
"**/*.ico": true,
"**/*.jpg": true,
"**/*.jpeg": true,
"**/*.png": true,
"**/*.psd": true,
"**/*.tga": true,
"**/*.tif": true,
"**/*.tiff": true,
"**/*.3ds": true,
"**/*.3DS": true,
"**/*.fbx": true,
"**/*.FBX": true,
"**/*.lxo": true,
"**/*.LXO": true,
"**/*.ma": true,
"**/*.MA": true,
"**/*.obj": true,
"**/*.OBJ": true,
"**/*.asset": true,
"**/*.cubemap": true,
"**/*.flare": true,
"**/*.mat": true,
"**/*.meta": true,
"**/*.prefab": true,
"**/*.unity": true,
"build/": true,
"Build/": true,
"Library/": true,
"library/": true,
"obj/": true,
"Obj/": true,
"ProjectSettings/": true,
"temp/": true,
"Temp/": true,
},
"[csharp]": {
"editor.defaultFormatter": "ms-dotnettools.csharp",
"editor.formatOnSave": true,
"files.encoding": "utf8bom",
},
"omnisharp.enableRoslynAnalyzers": true,
"deno.enable": true,
"deno.enablePaths": [
"./Servers/P2P",
"./WebGLBuild"
],
"editor.formatOnSave": true,
"[javascript]": {
"editor.defaultFormatter": "rome.rome"
},
"[typescript]": {
"editor.defaultFormatter": "rome.rome"
}
}
29 changes: 21 additions & 8 deletions Assets/AddressableAssetsData/AddressableAssetSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ MonoBehaviour:
m_CheckForContentUpdateRestrictionsOption: 0
m_MonoScriptBundleCustomNaming:
m_RemoteCatalogBuildPath:
m_Id: bfd6bf59170f8934dae7ab70a80c51a0
m_Id: 2ff51ae6a25533741a6db0e46a3dd5a4
m_RemoteCatalogLoadPath:
m_Id: b265ebd845b3b074c829603b1d1f6854
m_Id: 6cc7f50c87664584ba7690908e9d1bd0
m_ContentStateBuildPathProfileVariableName: <default settings path>
m_CustomContentStateBuildPath:
m_ContentStateBuildPath:
Expand Down Expand Up @@ -96,7 +96,21 @@ MonoBehaviour:
- m_Id: bfd6bf59170f8934dae7ab70a80c51a0
m_Value: ServerData/[UnityEngine.Application.version]/[BuildTarget]
- m_Id: b265ebd845b3b074c829603b1d1f6854
m_Value: '[Extreal.SampleApp.Holiday.App.AssetWorkflow.Custom.SecretVariables.ServerAddress]/[UnityEngine.Application.version]/[BuildTarget]'
m_Value: '[Extreal.SampleApp.Holiday.App.Config.AssetConfig.DownloadUrl]/[UnityEngine.Application.version]/[BuildTarget]'
- m_InheritedParent:
m_Id: eb668be575b18784e9d3b51ad291e8e8
m_ProfileName: WebGL
m_Values:
- m_Id: 866e4ed709877a44ea8967ee81fffa21
m_Value: '[UnityEditor.EditorUserBuildSettings.activeBuildTarget]'
- m_Id: 2ff51ae6a25533741a6db0e46a3dd5a4
m_Value: '[UnityEngine.AddressableAssets.Addressables.BuildPath]/[BuildTarget]'
- m_Id: 6cc7f50c87664584ba7690908e9d1bd0
m_Value: '{UnityEngine.AddressableAssets.Addressables.RuntimePath}/[BuildTarget]'
- m_Id: bfd6bf59170f8934dae7ab70a80c51a0
m_Value: WebGLBuild/Data/assets/[UnityEngine.Application.version]/[BuildTarget]
- m_Id: b265ebd845b3b074c829603b1d1f6854
m_Value: http://localhost:3333/assets/[UnityEngine.Application.version]/[BuildTarget]
m_ProfileEntryNames:
- m_Id: 866e4ed709877a44ea8967ee81fffa21
m_Name: BuildTarget
Expand Down Expand Up @@ -124,14 +138,13 @@ MonoBehaviour:
m_CertificateHandlerType:
m_AssemblyName:
m_ClassName:
m_ActivePlayerDataBuilderIndex: 4
m_ActivePlayerDataBuilderIndex: 3
m_DataBuilders:
- {fileID: 11400000, guid: db0bd59aadf036a41bf0aca98cfcea30, type: 2}
- {fileID: 11400000, guid: 84a2cd675ce005b4c9066c20bff6af79, type: 2}
- {fileID: 11400000, guid: 6297d17b6b94106439bceeb97db9cf1a, type: 2}
- {fileID: 11400000, guid: 08331fb23997c7a4d8ae67fc5b6cf12a, type: 2}
- {fileID: 11400000, guid: 01da6b5da8765ca428e681cb95d76213, type: 2}
m_ActiveProfileId: 4f014b7c1b6ae4f4cb27b832046bb0bb
m_ActiveProfileId: eb668be575b18784e9d3b51ad291e8e8
m_HostingServicesManager:
m_HostingServiceInfos:
- classRef: UnityEditor.AddressableAssets.HostingServices.HttpHostingService,
Expand All @@ -140,15 +153,15 @@ MonoBehaviour:
m_SerializedData:
- m_AssemblyName: mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
m_ClassName: System.Int32
m_Data: 55051
m_Data: 49179
m_Key: HostingServicePort
- m_AssemblyName: mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
m_ClassName: System.Int32
m_Data: 0
m_Key: HostingServiceUploadSpeed
- m_AssemblyName: mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
m_ClassName: System.String
m_Data: ServerData/0.1.0/StandaloneWindows64
m_Data: WebGLBuild/Data/assets/0.1.0/StandaloneWindows64
m_Key: ContentRoot
- m_AssemblyName: mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
m_ClassName: System.Boolean
Expand Down
18 changes: 18 additions & 0 deletions Assets/AddressableAssetsData/AssetGroups/AppCommon.asset
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,32 @@ MonoBehaviour:
m_Address: AvatarArmature
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 5dd0a9896b950494ca1303948d70b252
m_Address: MessageConfig
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: c9621e13487611747aedb2e10c7c4aa5
m_Address: AvatarConfig
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 60f62b0f283062a4092d1ab18c497448
m_Address: MultiplayConfig
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 3ce9f7a676c41ca45aeddd2fcf78e28a
m_Address: P2PConfig
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: abe9dfda252ecb44bada33ddee4fce9f
m_Address: ChatConfig
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
m_ReadOnly: 0
m_Settings: {fileID: 11400000, guid: 70324997c374a0844916ed3e0c6c273b, type: 2}
m_SchemaSet:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Group: {fileID: 11400000, guid: a103d381e22f4cb4c8c8ee4801c6ebaf, type: 2}
m_InternalBundleIdMode: 1
m_Compression: 2
m_Compression: 1
m_IncludeAddressInCatalog: 1
m_IncludeGUIDInCatalog: 1
m_IncludeLabelsInCatalog: 1
Expand All @@ -34,13 +34,12 @@ MonoBehaviour:
m_RedirectLimit: -1
m_RetryCount: 0
m_BuildPath:
m_Id: bfd6bf59170f8934dae7ab70a80c51a0
m_Id: 2ff51ae6a25533741a6db0e46a3dd5a4
m_LoadPath:
m_Id: b265ebd845b3b074c829603b1d1f6854
m_Id: 6cc7f50c87664584ba7690908e9d1bd0
m_BundleMode: 0
m_AssetBundleProviderType:
m_AssemblyName: Extreal.SampleApp.Holiday, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
m_ClassName: Extreal.SampleApp.Holiday.App.AssetWorkflow.Custom.CryptoAssetBundleProvider
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider
m_BundleNaming: 0
m_AssetLoadMode: 0
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Group: {fileID: 11400000, guid: 7b2ad813c3811e540927b4ed7827ba8b, type: 2}
m_InternalBundleIdMode: 1
m_Compression: 2
m_Compression: 1
m_IncludeAddressInCatalog: 1
m_IncludeGUIDInCatalog: 1
m_IncludeLabelsInCatalog: 1
Expand All @@ -34,13 +34,12 @@ MonoBehaviour:
m_RedirectLimit: -1
m_RetryCount: 0
m_BuildPath:
m_Id: bfd6bf59170f8934dae7ab70a80c51a0
m_Id: 2ff51ae6a25533741a6db0e46a3dd5a4
m_LoadPath:
m_Id: b265ebd845b3b074c829603b1d1f6854
m_Id: 6cc7f50c87664584ba7690908e9d1bd0
m_BundleMode: 0
m_AssetBundleProviderType:
m_AssemblyName: Extreal.SampleApp.Holiday, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
m_ClassName: Extreal.SampleApp.Holiday.App.AssetWorkflow.Custom.CryptoAssetBundleProvider
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider
m_BundleNaming: 0
m_AssetLoadMode: 0
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Group: {fileID: 11400000, guid: 5ed5c3f447c830a4eb4cf3b808b10549, type: 2}
m_InternalBundleIdMode: 1
m_Compression: 2
m_Compression: 1
m_IncludeAddressInCatalog: 1
m_IncludeGUIDInCatalog: 1
m_IncludeLabelsInCatalog: 1
Expand All @@ -34,13 +34,12 @@ MonoBehaviour:
m_RedirectLimit: -1
m_RetryCount: 0
m_BuildPath:
m_Id: bfd6bf59170f8934dae7ab70a80c51a0
m_Id: 2ff51ae6a25533741a6db0e46a3dd5a4
m_LoadPath:
m_Id: b265ebd845b3b074c829603b1d1f6854
m_Id: 6cc7f50c87664584ba7690908e9d1bd0
m_BundleMode: 0
m_AssetBundleProviderType:
m_AssemblyName: Extreal.SampleApp.Holiday, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
m_ClassName: Extreal.SampleApp.Holiday.App.AssetWorkflow.Custom.CryptoAssetBundleProvider
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider
m_BundleNaming: 0
m_AssetLoadMode: 0
Binary file not shown.

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

Binary file not shown.

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

Binary file modified Assets/AddressableAssetsData/Windows/addressables_content_state.bin
Binary file not shown.
3 changes: 0 additions & 3 deletions Assets/Holiday.Common/Config/LoggingConfig.cs.meta

This file was deleted.