diff --git a/Assets/Editor/Tutorials/Homepage.meta b/Assets/Editor/Tutorials/Homepage.meta new file mode 100644 index 000000000..7a2a3d121 --- /dev/null +++ b/Assets/Editor/Tutorials/Homepage.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ca9c27a0c42006f48a61dace60da1dae +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Editor/Tutorials/Homepage/0_TableOfContents.asset b/Assets/Editor/Tutorials/Homepage/0_TableOfContents.asset new file mode 100644 index 000000000..c5207dde3 --- /dev/null +++ b/Assets/Editor/Tutorials/Homepage/0_TableOfContents.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8548f60d916a56db3cfbef9db7f6e46a10bea6e7f4885bea060c05cf4e2b592c +size 3310 diff --git a/Assets/Editor/Tutorials/TableOfContents.asset.meta b/Assets/Editor/Tutorials/Homepage/0_TableOfContents.asset.meta similarity index 100% rename from Assets/Editor/Tutorials/TableOfContents.asset.meta rename to Assets/Editor/Tutorials/Homepage/0_TableOfContents.asset.meta diff --git a/Assets/Editor/Tutorials/Homepage/1_ConfigureUGS.asset b/Assets/Editor/Tutorials/Homepage/1_ConfigureUGS.asset new file mode 100644 index 000000000..e31c67c93 --- /dev/null +++ b/Assets/Editor/Tutorials/Homepage/1_ConfigureUGS.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c16f97958fbc897c0311d98cca161ed16d2cacb9c386127b9afbdc1c03041ad1 +size 1216 diff --git a/Assets/Editor/Tutorials/Homepage/1_ConfigureUGS.asset.meta b/Assets/Editor/Tutorials/Homepage/1_ConfigureUGS.asset.meta new file mode 100644 index 000000000..7b18318f8 --- /dev/null +++ b/Assets/Editor/Tutorials/Homepage/1_ConfigureUGS.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5d69a76b0f9609842aa1b9d5722fe73c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Editor/Tutorials/Images.meta b/Assets/Editor/Tutorials/Images.meta new file mode 100644 index 000000000..e81a14d5e --- /dev/null +++ b/Assets/Editor/Tutorials/Images.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3ddbd96be999570489a15892f46e591b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Editor/Tutorials/Images/Feature_Image_008.png b/Assets/Editor/Tutorials/Images/Feature_Image_008.png new file mode 100644 index 000000000..d276f28eb --- /dev/null +++ b/Assets/Editor/Tutorials/Images/Feature_Image_008.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f350b3e22fa4522e7ac217db0b810653f7d2cbf37e5a913e4229cc04efb041f2 +size 662808 diff --git a/Assets/Editor/Tutorials/Images/Feature_Image_008.png.meta b/Assets/Editor/Tutorials/Images/Feature_Image_008.png.meta new file mode 100644 index 000000000..7a759c292 --- /dev/null +++ b/Assets/Editor/Tutorials/Images/Feature_Image_008.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 0e9ea27979f7a4a5bb15caa2e6729425 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Editor/Tutorials/TableOfContents.asset b/Assets/Editor/Tutorials/TableOfContents.asset deleted file mode 100644 index 3064ca599..000000000 --- a/Assets/Editor/Tutorials/TableOfContents.asset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f0ac9451724cbceb81d118990dd202b7147fc162dfcc1f44e7ab07c751b26614 -size 3777 diff --git a/Assets/Editor/Tutorials/Tutorial Welcome Page.asset b/Assets/Editor/Tutorials/Tutorial Welcome Page.asset index 72ddcfc18..92e893860 100644 --- a/Assets/Editor/Tutorials/Tutorial Welcome Page.asset +++ b/Assets/Editor/Tutorials/Tutorial Welcome Page.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:31df35e528089f3ff6019906e0b5396cfeaeaee38f4fe210b199ecdf9e27bd4d -size 2404 +oid sha256:5324a2c2df7f4983887f5f31d8a7a934b43c6e0255e2fc9821fdaa3e52eb0d25 +size 3203 diff --git a/Assets/Editor/Tutorials/Tutorial0_SetupUGS.meta b/Assets/Editor/Tutorials/Tutorial0_SetupUGS.meta new file mode 100644 index 000000000..b0631a0e1 --- /dev/null +++ b/Assets/Editor/Tutorials/Tutorial0_SetupUGS.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 869e9875e764edd45a8c65d132e4ac4e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Editor/Tutorials/Tutorial0_SetupUGS/1-Verify And Setup UGS.asset b/Assets/Editor/Tutorials/Tutorial0_SetupUGS/1-Verify And Setup UGS.asset new file mode 100644 index 000000000..7614a7807 --- /dev/null +++ b/Assets/Editor/Tutorials/Tutorial0_SetupUGS/1-Verify And Setup UGS.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:906b96219e7c7d6e763a0654834197a27bb67bc3f93752c43fbbaa784a7b45a7 +size 3035 diff --git a/Assets/Editor/Tutorials/Tutorial0_SetupUGS/1-Verify And Setup UGS.asset.meta b/Assets/Editor/Tutorials/Tutorial0_SetupUGS/1-Verify And Setup UGS.asset.meta new file mode 100644 index 000000000..a5147ebbe --- /dev/null +++ b/Assets/Editor/Tutorials/Tutorial0_SetupUGS/1-Verify And Setup UGS.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f8f4819713a447b4d88780a1f232be55 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Editor/Tutorials/Tutorial0_SetupUGS/2-CheckServices.asset b/Assets/Editor/Tutorials/Tutorial0_SetupUGS/2-CheckServices.asset new file mode 100644 index 000000000..bf1df5d5b --- /dev/null +++ b/Assets/Editor/Tutorials/Tutorial0_SetupUGS/2-CheckServices.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cdf61b105a1e633877187ab063da4c4d6b8734eae95cc403ec05d1983f0e4d7f +size 6585 diff --git a/Assets/Editor/Tutorials/Tutorial0_SetupUGS/2-CheckServices.asset.meta b/Assets/Editor/Tutorials/Tutorial0_SetupUGS/2-CheckServices.asset.meta new file mode 100644 index 000000000..09c94f57d --- /dev/null +++ b/Assets/Editor/Tutorials/Tutorial0_SetupUGS/2-CheckServices.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0a25191a04226774497720a897023462 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Editor/Tutorials/Tutorial0_SetupUGS/8-Project Successfully Linked.asset b/Assets/Editor/Tutorials/Tutorial0_SetupUGS/8-Project Successfully Linked.asset new file mode 100644 index 000000000..746ad923d --- /dev/null +++ b/Assets/Editor/Tutorials/Tutorial0_SetupUGS/8-Project Successfully Linked.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ac721dec4e2a4370270b1e70b4383351ec621fab2f7f8af27bc34b89ed1e3a17 +size 3302 diff --git a/Assets/Editor/Tutorials/Tutorial0_SetupUGS/8-Project Successfully Linked.asset.meta b/Assets/Editor/Tutorials/Tutorial0_SetupUGS/8-Project Successfully Linked.asset.meta new file mode 100644 index 000000000..bded08ad1 --- /dev/null +++ b/Assets/Editor/Tutorials/Tutorial0_SetupUGS/8-Project Successfully Linked.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 20a34659981c32947b4437c2e0df9876 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Editor/Tutorials/Tutorial0_SetupUGS/Tutorial 0 - UGS Setup.asset b/Assets/Editor/Tutorials/Tutorial0_SetupUGS/Tutorial 0 - UGS Setup.asset new file mode 100644 index 000000000..b45ec29e1 --- /dev/null +++ b/Assets/Editor/Tutorials/Tutorial0_SetupUGS/Tutorial 0 - UGS Setup.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:54db6af02dc3be072fc11e511152d7d6a69b59256e114d2f566ae4c856d8b5cb +size 1795 diff --git a/Assets/Editor/Tutorials/Tutorial0_SetupUGS/Tutorial 0 - UGS Setup.asset.meta b/Assets/Editor/Tutorials/Tutorial0_SetupUGS/Tutorial 0 - UGS Setup.asset.meta new file mode 100644 index 000000000..2187d7cbb --- /dev/null +++ b/Assets/Editor/Tutorials/Tutorial0_SetupUGS/Tutorial 0 - UGS Setup.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6a5464225c4ee62499087728e8ee0a4d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Editor/Tutorials/TutorialCallbacks.cs b/Assets/Editor/Tutorials/TutorialCallbacks.cs index 7a33ac6e0..d360baa2c 100644 --- a/Assets/Editor/Tutorials/TutorialCallbacks.cs +++ b/Assets/Editor/Tutorials/TutorialCallbacks.cs @@ -4,19 +4,19 @@ namespace Unity.Netcode.Samples.BossRoom { - /// /// Implement your Tutorial callbacks here. /// - [CreateAssetMenu(fileName = DefaultFileName, menuName = "Tutorials/" + DefaultFileName + " Instance")] + [CreateAssetMenu(fileName = k_DefaultFileName, menuName = "Tutorials/" + k_DefaultFileName + " Instance")] public class TutorialCallbacks : ScriptableObject { - [SerializeField] SceneAsset m_StartupScene; + [SerializeField] + SceneAsset m_StartupScene; /// /// The default file name used to create asset of this class type. /// - public const string DefaultFileName = "TutorialCallbacks"; + const string k_DefaultFileName = "TutorialCallbacks"; /// /// Creates a TutorialCallbacks asset and shows it in the Project window. @@ -27,7 +27,7 @@ public class TutorialCallbacks : ScriptableObject /// The created asset public static ScriptableObject CreateAndShowAsset(string assetPath = null) { - assetPath = assetPath ?? $"{TutorialEditorUtils.GetActiveFolderPath()}/{DefaultFileName}.asset"; + assetPath = assetPath ?? $"{TutorialEditorUtils.GetActiveFolderPath()}/{k_DefaultFileName}.asset"; var asset = CreateInstance(); AssetDatabase.CreateAsset(asset, AssetDatabase.GenerateUniqueAssetPath(assetPath)); EditorUtility.FocusProjectWindow(); // needed in order to make the selection of newly created asset to really work @@ -40,35 +40,14 @@ public void StartTutorial(Tutorial tutorial) TutorialWindow.StartTutorial(tutorial); } - public void FocusGameView() - { - /* - * note: this solution is a bit weak, but it's the best we can do without accessing internal APIs. - * we'll need to check that it works for Unity 6 as well - */ - EditorApplication.ExecuteMenuItem("Window/General/Game"); - } - - public void FocusSceneView() - { - EditorApplication.ExecuteMenuItem("Window/General/Scene"); - } - - public bool IsRunningAsHost() - { - return NetworkManager.Singleton && NetworkManager.Singleton.IsHost; - } - - public bool IsRunningAsServerOnly() + public bool IsConnectedToUgs() { - return NetworkManager.Singleton && NetworkManager.Singleton.IsServer - && !NetworkManager.Singleton.IsClient; + return CloudProjectSettings.projectBound; } - public bool IsRunningAsClientOnly() + public void ShowServicesSettings() { - return NetworkManager.Singleton && !NetworkManager.Singleton.IsServer - && NetworkManager.Singleton.IsClient; + SettingsService.OpenProjectSettings("Project/Services"); } public void OpenURL(string url) diff --git a/Assets/InputSystem.meta b/Assets/InputSystem.meta new file mode 100644 index 000000000..c50391a0c --- /dev/null +++ b/Assets/InputSystem.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e851526f574e2428099024339b111519 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/InputSystem/PlayerActions.inputactions b/Assets/InputSystem/PlayerActions.inputactions new file mode 100644 index 000000000..93c760862 --- /dev/null +++ b/Assets/InputSystem/PlayerActions.inputactions @@ -0,0 +1,999 @@ +{ + "name": "PlayerActions", + "maps": [ + { + "name": "Player", + "id": "df70fa95-8a34-4494-b137-73ab6b9c7d37", + "actions": [ + { + "name": "Action1", + "type": "Button", + "id": "a253bfe9-3490-4b8a-a863-112a3d9ad51c", + "expectedControlType": "", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Action2", + "type": "Button", + "id": "5c29eb01-ef74-4b5c-9349-7f3ef300025c", + "expectedControlType": "", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Action3", + "type": "Button", + "id": "0557d847-afce-466f-a041-75907f18670b", + "expectedControlType": "", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Action4", + "type": "Button", + "id": "19b1aa91-cf31-4e9b-83d1-ccaae8ff518b", + "expectedControlType": "", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Action5", + "type": "Button", + "id": "2ef11149-91c6-4722-8570-5784583d8526", + "expectedControlType": "", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Action6", + "type": "Button", + "id": "d9939487-9a80-4f97-9733-9410b4f2e63b", + "expectedControlType": "", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Action7", + "type": "Button", + "id": "84095eb0-5936-45d3-8beb-2f79c3a8f68c", + "expectedControlType": "", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Action8", + "type": "Button", + "id": "e176e7b8-0bed-4bf8-931b-f5bcd8332d4b", + "expectedControlType": "", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "ToggleEmoteBar", + "type": "Button", + "id": "ced7334e-d2d0-49b9-8a34-2dcda513e275", + "expectedControlType": "", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "ToggleNetworkStats", + "type": "Button", + "id": "d1f96fd1-9fbb-4b2c-bb98-ddd1b1150dd0", + "expectedControlType": "", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "ToggleNetworkSimulator", + "type": "Button", + "id": "8b27e946-68af-4c4d-ba82-d2cb4a866217", + "expectedControlType": "", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "ToggleCheats", + "type": "Button", + "id": "d406d43c-a802-4adc-8a61-c7f0745ed4df", + "expectedControlType": "", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Target", + "type": "Button", + "id": "43b99b7b-ca7a-4ef6-9d13-2751c2d2b3aa", + "expectedControlType": "", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Skill1", + "type": "Button", + "id": "b97db0db-4f74-415d-99bf-8b754bfa6827", + "expectedControlType": "", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Point", + "type": "PassThrough", + "id": "577651e7-bedb-409c-bba8-513e74e03e3b", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "", + "initialStateCheck": true + }, + { + "name": "ScrollWheel", + "type": "Value", + "id": "a333c836-68b4-44ef-8f65-4c48bb3870c3", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "", + "initialStateCheck": true + } + ], + "bindings": [ + { + "name": "", + "id": "cc91faff-b1f5-41fc-a4da-4a7afdc60ddf", + "path": "/1", + "interactions": "", + "processors": "", + "groups": "", + "action": "Action1", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "8327da8e-1ef1-4fb8-ab26-0cf54c330c40", + "path": "/2", + "interactions": "Hold", + "processors": "", + "groups": "", + "action": "Action2", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "4b4f1a22-bbbb-4f4a-8216-2bf1b80a7d00", + "path": "/3", + "interactions": "", + "processors": "", + "groups": "", + "action": "Action3", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "08b6361c-4da4-40ae-8fa8-2d96fd65175c", + "path": "/4", + "interactions": "", + "processors": "", + "groups": "", + "action": "Action4", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "6367f1ca-20ca-41fe-8cba-b83c544ea439", + "path": "/5", + "interactions": "", + "processors": "", + "groups": "", + "action": "Action5", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "1d095f50-2ab8-4b1e-ab2c-0ac704915af4", + "path": "/6", + "interactions": "", + "processors": "", + "groups": "", + "action": "Action6", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "d6b8d96c-297b-4570-95d0-9f7d6e076a83", + "path": "/7", + "interactions": "", + "processors": "", + "groups": "", + "action": "Action7", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "ad7181df-7d35-438d-a75e-77def5068d9c", + "path": "/8", + "interactions": "", + "processors": "", + "groups": "", + "action": "Action8", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "0cc145f8-a4b0-432e-b0fd-850e0a63c265", + "path": "/4", + "interactions": "", + "processors": "", + "groups": "", + "action": "ToggleEmoteBar", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "5ee395b1-5245-4bc8-b716-c0f619a423c7", + "path": "/s", + "interactions": "", + "processors": "", + "groups": "", + "action": "ToggleNetworkStats", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "08019be4-0b1b-4c81-a805-111c875ad7c3", + "path": "/touch3/tap", + "interactions": "", + "processors": "", + "groups": ";Touch", + "action": "ToggleNetworkStats", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "a2f7fe81-4374-49f6-ac91-31f25ff7695f", + "path": "/tab", + "interactions": "", + "processors": "", + "groups": "", + "action": "ToggleNetworkSimulator", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "b1533cc3-511d-496b-ba9a-8d5606061c26", + "path": "/touch4/tap", + "interactions": "", + "processors": "", + "groups": ";Touch", + "action": "ToggleNetworkSimulator", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "9b456d39-4b33-4bed-b1aa-c4d648dd523c", + "path": "/slash", + "interactions": "", + "processors": "", + "groups": "", + "action": "ToggleCheats", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "571fb49b-094d-4788-b76c-68863ac01164", + "path": "/leftButton", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Target", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "dfdea74a-f685-40f7-856e-736492574188", + "path": "/touch*/press", + "interactions": "", + "processors": "", + "groups": "Touch", + "action": "Target", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "03468fd1-8d67-488b-ba05-2dd82ef9c830", + "path": "/rightButton", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Skill1", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "de7a02bc-5cc4-4d3e-b7f7-3b6ea4e56a69", + "path": "/position", + "interactions": "", + "processors": "", + "groups": "", + "action": "Point", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "897044fe-c81a-4245-ba4a-5bc7c717bedb", + "path": "/touch*/position", + "interactions": "", + "processors": "", + "groups": "Touch", + "action": "Point", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "0e6a3466-3efb-4405-8ff2-068eeff4b435", + "path": "/scroll", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "ScrollWheel", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "Two Modifiers", + "id": "a7d13156-4095-4d23-8e27-53b486aa0930", + "path": "TwoModifiers", + "interactions": "", + "processors": "", + "groups": "", + "action": "ScrollWheel", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "modifier1", + "id": "3c8e94d7-5fda-4b27-9a33-a912cb2fd103", + "path": "/touch0/press", + "interactions": "", + "processors": "", + "groups": ";Touch", + "action": "ScrollWheel", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "modifier2", + "id": "3b706b16-7840-4f02-9f8f-7453a22b1f47", + "path": "/touch1/press", + "interactions": "", + "processors": "", + "groups": ";Touch", + "action": "ScrollWheel", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "binding", + "id": "02294441-af70-4095-af64-d2ec6a4590dd", + "path": "/delta", + "interactions": "", + "processors": "InvertVector2", + "groups": ";Touch", + "action": "ScrollWheel", + "isComposite": false, + "isPartOfComposite": true + } + ] + }, + { + "name": "UI", + "id": "272f6d14-89ba-496f-b7ff-215263d3219f", + "actions": [ + { + "name": "Navigate", + "type": "PassThrough", + "id": "c95b2375-e6d9-4b88-9c4c-c5e76515df4b", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Submit", + "type": "Button", + "id": "7607c7b6-cd76-4816-beef-bd0341cfe950", + "expectedControlType": "", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Cancel", + "type": "Button", + "id": "15cef263-9014-4fd5-94d9-4e4a6234a6ef", + "expectedControlType": "", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Point", + "type": "PassThrough", + "id": "32b35790-4ed0-4e9a-aa41-69ac6d629449", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "", + "initialStateCheck": true + }, + { + "name": "Click", + "type": "PassThrough", + "id": "3c7022bf-7922-4f7c-a998-c437916075ad", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": true + }, + { + "name": "RightClick", + "type": "PassThrough", + "id": "44b200b1-1557-4083-816c-b22cbdf77ddf", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "MiddleClick", + "type": "PassThrough", + "id": "dad70c86-b58c-4b17-88ad-f5e53adf419e", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "ScrollWheel", + "type": "PassThrough", + "id": "0489e84a-4833-4c40-bfae-cea84b696689", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "TrackedDevicePosition", + "type": "PassThrough", + "id": "24908448-c609-4bc3-a128-ea258674378a", + "expectedControlType": "Vector3", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "TrackedDeviceOrientation", + "type": "PassThrough", + "id": "9caa3d8a-6b2f-4e8e-8bad-6ede561bd9be", + "expectedControlType": "Quaternion", + "processors": "", + "interactions": "", + "initialStateCheck": false + } + ], + "bindings": [ + { + "name": "Gamepad", + "id": "809f371f-c5e2-4e7a-83a1-d867598f40dd", + "path": "2DVector", + "interactions": "", + "processors": "", + "groups": "", + "action": "Navigate", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "up", + "id": "14a5d6e8-4aaf-4119-a9ef-34b8c2c548bf", + "path": "/leftStick/up", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "up", + "id": "9144cbe6-05e1-4687-a6d7-24f99d23dd81", + "path": "/rightStick/up", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "2db08d65-c5fb-421b-983f-c71163608d67", + "path": "/leftStick/down", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "58748904-2ea9-4a80-8579-b500e6a76df8", + "path": "/rightStick/down", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "8ba04515-75aa-45de-966d-393d9bbd1c14", + "path": "/leftStick/left", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "712e721c-bdfb-4b23-a86c-a0d9fcfea921", + "path": "/rightStick/left", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "fcd248ae-a788-4676-a12e-f4d81205600b", + "path": "/leftStick/right", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "1f04d9bc-c50b-41a1-bfcc-afb75475ec20", + "path": "/rightStick/right", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "", + "id": "fb8277d4-c5cd-4663-9dc7-ee3f0b506d90", + "path": "/dpad", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "Joystick", + "id": "e25d9774-381c-4a61-b47c-7b6b299ad9f9", + "path": "2DVector", + "interactions": "", + "processors": "", + "groups": "", + "action": "Navigate", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "up", + "id": "3db53b26-6601-41be-9887-63ac74e79d19", + "path": "/stick/up", + "interactions": "", + "processors": "", + "groups": "Joystick", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "0cb3e13e-3d90-4178-8ae6-d9c5501d653f", + "path": "/stick/down", + "interactions": "", + "processors": "", + "groups": "Joystick", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "0392d399-f6dd-4c82-8062-c1e9c0d34835", + "path": "/stick/left", + "interactions": "", + "processors": "", + "groups": "Joystick", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "942a66d9-d42f-43d6-8d70-ecb4ba5363bc", + "path": "/stick/right", + "interactions": "", + "processors": "", + "groups": "Joystick", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "Keyboard", + "id": "ff527021-f211-4c02-933e-5976594c46ed", + "path": "2DVector", + "interactions": "", + "processors": "", + "groups": "", + "action": "Navigate", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "up", + "id": "563fbfdd-0f09-408d-aa75-8642c4f08ef0", + "path": "/w", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "up", + "id": "eb480147-c587-4a33-85ed-eb0ab9942c43", + "path": "/upArrow", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "2bf42165-60bc-42ca-8072-8c13ab40239b", + "path": "/s", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "85d264ad-e0a0-4565-b7ff-1a37edde51ac", + "path": "/downArrow", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "74214943-c580-44e4-98eb-ad7eebe17902", + "path": "/a", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "cea9b045-a000-445b-95b8-0c171af70a3b", + "path": "/leftArrow", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "8607c725-d935-4808-84b1-8354e29bab63", + "path": "/d", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "4cda81dc-9edd-4e03-9d7c-a71a14345d0b", + "path": "/rightArrow", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "", + "id": "9e92bb26-7e3b-4ec4-b06b-3c8f8e498ddc", + "path": "*/{Submit}", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse;Gamepad;Touch;Joystick;XR", + "action": "Submit", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "82627dcc-3b13-4ba9-841d-e4b746d6553e", + "path": "*/{Cancel}", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse;Gamepad;Touch;Joystick;XR", + "action": "Cancel", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "c52c8e0b-8179-41d3-b8a1-d149033bbe86", + "path": "/position", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Point", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "e1394cbc-336e-44ce-9ea8-6007ed6193f7", + "path": "/position", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Point", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "5693e57a-238a-46ed-b5ae-e64e6e574302", + "path": "/touch*/position", + "interactions": "", + "processors": "", + "groups": "Touch", + "action": "Point", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "4faf7dc9-b979-4210-aa8c-e808e1ef89f5", + "path": "/leftButton", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Click", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "8d66d5ba-88d7-48e6-b1cd-198bbfef7ace", + "path": "/tip", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Click", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "47c2a644-3ebc-4dae-a106-589b7ca75b59", + "path": "/touch*/press", + "interactions": "", + "processors": "", + "groups": "Touch", + "action": "Click", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "bb9e6b34-44bf-4381-ac63-5aa15d19f677", + "path": "/trigger", + "interactions": "", + "processors": "", + "groups": "XR", + "action": "Click", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "38c99815-14ea-4617-8627-164d27641299", + "path": "/scroll", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "ScrollWheel", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "4c191405-5738-4d4b-a523-c6a301dbf754", + "path": "/rightButton", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "RightClick", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "24066f69-da47-44f3-a07e-0015fb02eb2e", + "path": "/middleButton", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "MiddleClick", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "7236c0d9-6ca3-47cf-a6ee-a97f5b59ea77", + "path": "/devicePosition", + "interactions": "", + "processors": "", + "groups": "XR", + "action": "TrackedDevicePosition", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "23e01e3a-f935-4948-8d8b-9bcac77714fb", + "path": "/deviceRotation", + "interactions": "", + "processors": "", + "groups": "XR", + "action": "TrackedDeviceOrientation", + "isComposite": false, + "isPartOfComposite": false + } + ] + } + ], + "controlSchemes": [ + { + "name": "Keyboard&Mouse", + "bindingGroup": "Keyboard&Mouse", + "devices": [ + { + "devicePath": "", + "isOptional": false, + "isOR": false + }, + { + "devicePath": "", + "isOptional": false, + "isOR": false + } + ] + }, + { + "name": "Gamepad", + "bindingGroup": "Gamepad", + "devices": [ + { + "devicePath": "", + "isOptional": false, + "isOR": false + } + ] + }, + { + "name": "Touch", + "bindingGroup": "Touch", + "devices": [ + { + "devicePath": "", + "isOptional": false, + "isOR": false + } + ] + }, + { + "name": "Joystick", + "bindingGroup": "Joystick", + "devices": [ + { + "devicePath": "", + "isOptional": false, + "isOR": false + } + ] + }, + { + "name": "XR", + "bindingGroup": "XR", + "devices": [ + { + "devicePath": "", + "isOptional": false, + "isOR": false + } + ] + } + ] +} \ No newline at end of file diff --git a/Assets/InputSystem/PlayerActions.inputactions.meta b/Assets/InputSystem/PlayerActions.inputactions.meta new file mode 100644 index 000000000..9c1de82e6 --- /dev/null +++ b/Assets/InputSystem/PlayerActions.inputactions.meta @@ -0,0 +1,14 @@ +fileFormatVersion: 2 +guid: add476edce0d24d26bcdaf1681449ecf +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 8404be70184654265930450def6a9037, type: 3} + generateWrapperCode: 0 + wrapperCodePath: + wrapperClassName: + wrapperCodeNamespace: diff --git a/Assets/Prefabs/Actions/ClientAoeInput.prefab b/Assets/Prefabs/Actions/ClientAoeInput.prefab index 3befcf157..94116fba6 100644 --- a/Assets/Prefabs/Actions/ClientAoeInput.prefab +++ b/Assets/Prefabs/Actions/ClientAoeInput.prefab @@ -24,14 +24,15 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2317072454108786653} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 519043390440476} - {fileID: 7786310081837396287} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &8447158110562487606 MonoBehaviour: @@ -47,6 +48,8 @@ MonoBehaviour: m_EditorClassIdentifier: m_InRangeVisualization: {fileID: 4372974839826446078} m_OutOfRangeVisualization: {fileID: 3023808054957408081} + m_PointAction: {fileID: -1959881153152325168, guid: add476edce0d24d26bcdaf1681449ecf, type: 3} + m_TargetAction: {fileID: -2762237389118783121, guid: add476edce0d24d26bcdaf1681449ecf, type: 3} --- !u!1 &3023808054957408081 GameObject: m_ObjectHideFlags: 0 @@ -72,12 +75,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3023808054957408081} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.025, z: 0} m_LocalScale: {x: 0.125, y: 0.125, z: 0.125} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6459207307567452869} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &2938808106645325272 MeshFilter: @@ -98,11 +102,15 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -153,12 +161,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4372974839826446078} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.025, z: 0} m_LocalScale: {x: 0.125, y: 0.125, z: 0.125} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6459207307567452869} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &5292373250812076600 MeshFilter: @@ -179,11 +188,15 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: diff --git a/Assets/Prefabs/Character/PlayerAvatar.prefab b/Assets/Prefabs/Character/PlayerAvatar.prefab index 9fd5c3245..ac931f2f0 100644 --- a/Assets/Prefabs/Character/PlayerAvatar.prefab +++ b/Assets/Prefabs/Character/PlayerAvatar.prefab @@ -35,7 +35,7 @@ Transform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &1829276847453002016 Animator: - serializedVersion: 5 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -49,6 +49,7 @@ Animator: m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 m_StabilizeFeet: 0 + m_AnimatePhysics: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 @@ -66,6 +67,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9520a47fc61d5ab4ca99cdac2d574909, type: 3} m_Name: m_EditorClassIdentifier: + ShowTopMostFoldoutHeaderGroup: 1 m_ClientVisualsAnimator: {fileID: 1829276847453002016} m_VisualizationConfiguration: {fileID: 11400000, guid: 9504973cdecd65749889771972fa0117, type: 2} --- !u!1001 &7831782662127126385 @@ -248,6 +250,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d99850df10e83c142b4b65527d7cea91, type: 3} m_Name: m_EditorClassIdentifier: + ShowTopMostFoldoutHeaderGroup: 1 --- !u!114 &3481187672596608374 MonoBehaviour: m_ObjectHideFlags: 0 @@ -260,6 +263,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e363085af981a41fd816ab952a0a07c7, type: 3} m_Name: m_EditorClassIdentifier: + ShowTopMostFoldoutHeaderGroup: 1 --- !u!114 &4354133789489545025 MonoBehaviour: m_ObjectHideFlags: 0 @@ -272,6 +276,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a46d628dbb19f12449867d14fa5268b0, type: 3} m_Name: m_EditorClassIdentifier: + ShowTopMostFoldoutHeaderGroup: 1 m_CachedServerCharacter: {fileID: 741733315856861890} --- !u!114 &4781465086743528409 MonoBehaviour: @@ -285,7 +290,18 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 331c67f15523ad7419792662b9768f44, type: 3} m_Name: m_EditorClassIdentifier: + ShowTopMostFoldoutHeaderGroup: 1 m_ServerCharacter: {fileID: 741733315856861890} + m_TargetAction: {fileID: -2762237389118783121, guid: add476edce0d24d26bcdaf1681449ecf, type: 3} + m_Skill1Action: {fileID: 2701198716142841280, guid: add476edce0d24d26bcdaf1681449ecf, type: 3} + m_PointAction: {fileID: -1959881153152325168, guid: add476edce0d24d26bcdaf1681449ecf, type: 3} + m_Action1: {fileID: 916937064669491580, guid: add476edce0d24d26bcdaf1681449ecf, type: 3} + m_Action2: {fileID: 2288820758043559878, guid: add476edce0d24d26bcdaf1681449ecf, type: 3} + m_Action3: {fileID: 6071755229503605740, guid: add476edce0d24d26bcdaf1681449ecf, type: 3} + m_Action5: {fileID: -1289729065238941167, guid: add476edce0d24d26bcdaf1681449ecf, type: 3} + m_Action6: {fileID: -1072022056946843674, guid: add476edce0d24d26bcdaf1681449ecf, type: 3} + m_Action7: {fileID: 5111210855846757706, guid: add476edce0d24d26bcdaf1681449ecf, type: 3} + m_Action8: {fileID: -5605585424277066684, guid: add476edce0d24d26bcdaf1681449ecf, type: 3} m_PhysicsWrapper: {fileID: 6116655102486013040} --- !u!114 &4887850889182527394 MonoBehaviour: @@ -299,6 +315,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b7ee3f8e8fb4491495b03f890258082e, type: 3} m_Name: m_EditorClassIdentifier: + ShowTopMostFoldoutHeaderGroup: 1 m_CharacterName: --- !u!114 &5043718152237111612 MonoBehaviour: @@ -312,6 +329,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b9cdcc3c2393a2745a733ffa279642ba, type: 3} m_Name: m_EditorClassIdentifier: + ShowTopMostFoldoutHeaderGroup: 1 m_PlayerAvatars: {fileID: 11400000, guid: 13c227b8a2f5f5f4a8c252835aaf648f, type: 2} --- !u!114 &4639653625902786935 MonoBehaviour: @@ -325,6 +343,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 99504426d7b854c33811fe398cf44a80, type: 3} m_Name: m_EditorClassIdentifier: + ShowTopMostFoldoutHeaderGroup: 1 TransitionStateInfoList: - IsCrossFadeExit: 0 Layer: 0 @@ -606,6 +625,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 119ee2e9b25694aa9b2f80b9a3d22c6e, type: 3} m_Name: m_EditorClassIdentifier: + ShowTopMostFoldoutHeaderGroup: 1 m_FeedbackPrefab: {fileID: 9137928905311479176, guid: 5d22c1d86e0e5604cbe14004bf924827, type: 3} --- !u!114 &2576537793715222015 MonoBehaviour: @@ -619,6 +639,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: cead4253912fb1241be383143c5f3b59, type: 3} m_Name: m_EditorClassIdentifier: + ShowTopMostFoldoutHeaderGroup: 1 m_DisplayHealth: 1 m_DisplayName: 1 m_UIStatePrefab: {fileID: -1943162842029199943, guid: 2b07482491a17964380023240087ce16, type: 3} @@ -630,7 +651,7 @@ MonoBehaviour: m_VerticalScreenOffset: 20 --- !u!95 &4727018541459492655 Animator: - serializedVersion: 5 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -644,6 +665,7 @@ Animator: m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 m_StabilizeFeet: 0 + m_AnimatePhysics: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 diff --git a/Assets/Prefabs/DebugCheatsManager.prefab b/Assets/Prefabs/DebugCheatsManager.prefab index 636a7db81..9f6a2cda6 100644 --- a/Assets/Prefabs/DebugCheatsManager.prefab +++ b/Assets/Prefabs/DebugCheatsManager.prefab @@ -45,13 +45,19 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3} m_Name: m_EditorClassIdentifier: - GlobalObjectIdHash: 951099334 + GlobalObjectIdHash: 3439787871 + InScenePlacedSourceGlobalObjectIdHash: 0 + DeferredDespawnTick: 0 + Ownership: 0 AlwaysReplicateAsRoot: 0 SynchronizeTransform: 0 ActiveSceneSynchronization: 0 SceneMigrationSynchronization: 1 + SpawnWithObservers: 1 DontDestroyWithOwner: 0 AutoObjectParentSync: 1 + SyncOwnerTransformWhenParented: 1 + AllowOwnerToParent: 0 --- !u!114 &7241368247586282332 MonoBehaviour: m_ObjectHideFlags: 0 @@ -64,7 +70,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab1e76745edfc434ab8154ad27efc5fd, type: 3} m_Name: m_EditorClassIdentifier: + ShowTopMostFoldoutHeaderGroup: 1 m_DebugCheatsPanel: {fileID: 0} m_EnemyPrefab: {fileID: 3713729372785093435, guid: 6cdd52f1fa2ed34469a487ae6477eded, type: 3} m_BossPrefab: {fileID: 3688950541947916326, guid: 365e94337fd10fe4ebde1906df413ac7, type: 3} - m_OpenWindowKeyCode: 47 + m_ToggleCheatsAction: {fileID: -3765159069520908634, guid: add476edce0d24d26bcdaf1681449ecf, type: 3} diff --git a/Assets/Prefabs/GameCam/CMCameraPrefab.prefab b/Assets/Prefabs/GameCam/CMCameraPrefab.prefab index f67f8dd0c..f311a615f 100644 --- a/Assets/Prefabs/GameCam/CMCameraPrefab.prefab +++ b/Assets/Prefabs/GameCam/CMCameraPrefab.prefab @@ -280,8 +280,8 @@ MonoBehaviour: Owner: {fileID: 2134312450369994339} Enabled: 1 Input: - LegacyInput: - LegacyGain: 300 + InputAction: {fileID: 0} + Gain: 1 CancelDeltaTime: 0 InputValue: 0 Driver: @@ -291,8 +291,8 @@ MonoBehaviour: Owner: {fileID: 2134312450369994339} Enabled: 1 Input: - LegacyInput: Mouse ScrollWheel - LegacyGain: -50 + InputAction: {fileID: -5536139033653354306, guid: add476edce0d24d26bcdaf1681449ecf, type: 3} + Gain: -50 CancelDeltaTime: 0 InputValue: 0 Driver: @@ -302,13 +302,15 @@ MonoBehaviour: Owner: {fileID: 2134312450369994339} Enabled: 1 Input: - LegacyInput: Mouse ScrollWheel - LegacyGain: 200 + InputAction: {fileID: 0} + Gain: 1 CancelDeltaTime: 0 InputValue: 0 Driver: AccelTime: 0 DecelTime: 0 + PlayerIndex: -1 + AutoEnableInputs: 1 --- !u!1 &2167489802469618434 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/UI/BossRoomHudCanvas.prefab b/Assets/Prefabs/UI/BossRoomHudCanvas.prefab index 7fdb8470a..e2bc24581 100644 --- a/Assets/Prefabs/UI/BossRoomHudCanvas.prefab +++ b/Assets/Prefabs/UI/BossRoomHudCanvas.prefab @@ -108,15 +108,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -317,15 +319,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -824,15 +828,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -958,15 +964,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -1092,15 +1100,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -1226,15 +1236,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -1899,15 +1911,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -2209,15 +2223,15 @@ PrefabInstance: value: 7 objectReference: {fileID: 0} - target: {fileID: 5291941401002571263, guid: df0d6828f44fdd64bb311a3f19236959, type: 3} - propertyPath: m_TextLabels.Array.data[4] + propertyPath: 'm_TextLabels.Array.data[4]' value: objectReference: {fileID: 0} - target: {fileID: 5291941401002571263, guid: df0d6828f44fdd64bb311a3f19236959, type: 3} - propertyPath: m_TextLabels.Array.data[5] + propertyPath: 'm_TextLabels.Array.data[5]' value: objectReference: {fileID: 0} - target: {fileID: 5291941401002571263, guid: df0d6828f44fdd64bb311a3f19236959, type: 3} - propertyPath: m_TextLabels.Array.data[6] + propertyPath: 'm_TextLabels.Array.data[6]' value: objectReference: {fileID: 0} - target: {fileID: 5371176185845101923, guid: df0d6828f44fdd64bb311a3f19236959, type: 3} @@ -2522,6 +2536,10 @@ PrefabInstance: propertyPath: m_EmotePanel value: objectReference: {fileID: 5277713031219212455} + - target: {fileID: 9059929381720061998, guid: 334e483163a0ba54bb764e318223c9ba, type: 3} + propertyPath: m_ToggleEmoteBarAction + value: + objectReference: {fileID: -248355375449215140, guid: add476edce0d24d26bcdaf1681449ecf, type: 3} - target: {fileID: 9059929381720062001, guid: 334e483163a0ba54bb764e318223c9ba, type: 3} propertyPath: m_Name value: Hero Action Bar @@ -2652,14 +2670,58 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 5277713031684110775} m_Modifications: + - target: {fileID: 277098652668227279, guid: 8a7264ba4f271fa4fa6de65ef54333a7, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 637141743512318501, guid: 8a7264ba4f271fa4fa6de65ef54333a7, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 649489175755438353, guid: 8a7264ba4f271fa4fa6de65ef54333a7, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 797167611908236020, guid: 8a7264ba4f271fa4fa6de65ef54333a7, type: 3} propertyPath: m_Canvas value: objectReference: {fileID: 5277713031684110774} + - target: {fileID: 2421897982836340649, guid: 8a7264ba4f271fa4fa6de65ef54333a7, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 2679791807507173189, guid: 8a7264ba4f271fa4fa6de65ef54333a7, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 2885098433089441387, guid: 8a7264ba4f271fa4fa6de65ef54333a7, type: 3} propertyPath: m_Name value: CheatsPopupPanel objectReference: {fileID: 0} + - target: {fileID: 3858202051794728086, guid: 8a7264ba4f271fa4fa6de65ef54333a7, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 3944910749074775886, guid: 8a7264ba4f271fa4fa6de65ef54333a7, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 6254780512969792798, guid: 8a7264ba4f271fa4fa6de65ef54333a7, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 6271467218402269198, guid: 8a7264ba4f271fa4fa6de65ef54333a7, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 6524984927320345533, guid: 8a7264ba4f271fa4fa6de65ef54333a7, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 6903512172989931432, guid: 8a7264ba4f271fa4fa6de65ef54333a7, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 7893676886333526174, guid: 8a7264ba4f271fa4fa6de65ef54333a7, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -2744,6 +2806,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8730681299727307797, guid: 8a7264ba4f271fa4fa6de65ef54333a7, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 8773562443087635893, guid: 8a7264ba4f271fa4fa6de65ef54333a7, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -2773,6 +2843,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 5277713031684110775} m_Modifications: + - target: {fileID: 250046666732236924, guid: 8b2306d4cfca3b642afa5534b0ba275a, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 5210474333085558483, guid: 8b2306d4cfca3b642afa5534b0ba275a, type: 3} propertyPath: m_HeroName value: diff --git a/Assets/Prefabs/UI/CharacterSelectCanvas.prefab b/Assets/Prefabs/UI/CharacterSelectCanvas.prefab index 037b9c120..9484dfc79 100644 --- a/Assets/Prefabs/UI/CharacterSelectCanvas.prefab +++ b/Assets/Prefabs/UI/CharacterSelectCanvas.prefab @@ -183,15 +183,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -317,15 +319,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 3 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -453,15 +457,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -592,15 +598,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -908,15 +916,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -1042,15 +1052,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -1385,15 +1397,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -1595,15 +1609,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 3 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -1729,15 +1745,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 3 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -1886,6 +1904,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 79e7ca3e19eb99c4f97ff06a95ef7dac, type: 3} m_Name: m_EditorClassIdentifier: + m_PointAction: {fileID: -1959881153152325168, guid: add476edce0d24d26bcdaf1681449ecf, type: 3} m_TooltipPopup: {fileID: 5940892342300009070} m_TooltipText: Ability 3 m_ActivateOnClick: 1 @@ -2192,15 +2211,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -2628,6 +2649,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 79e7ca3e19eb99c4f97ff06a95ef7dac, type: 3} m_Name: m_EditorClassIdentifier: + m_PointAction: {fileID: -1959881153152325168, guid: add476edce0d24d26bcdaf1681449ecf, type: 3} m_TooltipPopup: {fileID: 5940892342300009070} m_TooltipText: Ability 1 m_ActivateOnClick: 1 @@ -2720,6 +2742,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 79e7ca3e19eb99c4f97ff06a95ef7dac, type: 3} m_Name: m_EditorClassIdentifier: + m_PointAction: {fileID: -1959881153152325168, guid: add476edce0d24d26bcdaf1681449ecf, type: 3} m_TooltipPopup: {fileID: 5940892342300009070} m_TooltipText: Ability 2 m_ActivateOnClick: 1 @@ -2927,15 +2950,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -3061,15 +3086,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -3600,6 +3627,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 5940892341490189322} m_Modifications: + - target: {fileID: 463572819075978806, guid: ff848390065bf914fb60582f4d872815, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 857184778587777497, guid: ff848390065bf914fb60582f4d872815, type: 3} propertyPath: m_SizeDelta.x value: -128.157 @@ -3898,6 +3929,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 5940892341490189322} m_Modifications: + - target: {fileID: 463572819075978806, guid: ff848390065bf914fb60582f4d872815, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 857184778587777497, guid: ff848390065bf914fb60582f4d872815, type: 3} propertyPath: m_SizeDelta.x value: -56.959 @@ -4076,6 +4111,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 5940892341490189322} m_Modifications: + - target: {fileID: 463572819075978806, guid: ff848390065bf914fb60582f4d872815, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 857184778587777497, guid: ff848390065bf914fb60582f4d872815, type: 3} propertyPath: m_SizeDelta.x value: -56.959 @@ -4382,6 +4421,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 5940892341490189322} m_Modifications: + - target: {fileID: 463572819075978806, guid: ff848390065bf914fb60582f4d872815, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 857184778587777497, guid: ff848390065bf914fb60582f4d872815, type: 3} propertyPath: m_SizeDelta.x value: -64.078 @@ -4560,6 +4603,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 5940892341490189322} m_Modifications: + - target: {fileID: 463572819075978806, guid: ff848390065bf914fb60582f4d872815, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 857184778587777497, guid: ff848390065bf914fb60582f4d872815, type: 3} propertyPath: m_SizeDelta.x value: -64.079 @@ -4870,6 +4917,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 5940892341490189322} m_Modifications: + - target: {fileID: 463572819075978806, guid: ff848390065bf914fb60582f4d872815, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 857184778587777497, guid: ff848390065bf914fb60582f4d872815, type: 3} propertyPath: m_SizeDelta.x value: -64.078 @@ -5110,6 +5161,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 5940892341490189322} m_Modifications: + - target: {fileID: 463572819075978806, guid: ff848390065bf914fb60582f4d872815, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 857184778587777497, guid: ff848390065bf914fb60582f4d872815, type: 3} propertyPath: m_SizeDelta.x value: -62.37 @@ -5296,6 +5351,10 @@ PrefabInstance: propertyPath: m_Enabled value: 1 objectReference: {fileID: 0} + - target: {fileID: 463572819075978806, guid: ff848390065bf914fb60582f4d872815, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 857184778587777497, guid: ff848390065bf914fb60582f4d872815, type: 3} propertyPath: m_SizeDelta.x value: -83.065 diff --git a/Assets/Prefabs/UI/Hero Action Bar.prefab b/Assets/Prefabs/UI/Hero Action Bar.prefab index f704047a9..89c284d68 100644 --- a/Assets/Prefabs/UI/Hero Action Bar.prefab +++ b/Assets/Prefabs/UI/Hero Action Bar.prefab @@ -28,9 +28,9 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 9059929381734582209} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -107,9 +107,9 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 9059929380243764539} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -186,9 +186,9 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 9059929381413149715} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -265,9 +265,9 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 9059929380544550687} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -344,9 +344,9 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 9059929381734582209} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -425,11 +425,11 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 9059929380362573694} - {fileID: 6756708193988222877} m_Father: {fileID: 9059929381720062002} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -530,9 +530,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 79e7ca3e19eb99c4f97ff06a95ef7dac, type: 3} m_Name: m_EditorClassIdentifier: + m_PointAction: {fileID: -1959881153152325168, guid: add476edce0d24d26bcdaf1681449ecf, type: 3} m_TooltipPopup: {fileID: 0} m_TooltipText: m_ActivateOnClick: 1 + m_TooltipDelay: 0.5 --- !u!1 &9059929380362573693 GameObject: m_ObjectHideFlags: 0 @@ -561,9 +563,9 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 9059929380243764539} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -642,11 +644,11 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 9059929380831878973} - {fileID: 6487434095397898390} m_Father: {fileID: 9059929381720062002} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -747,9 +749,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 79e7ca3e19eb99c4f97ff06a95ef7dac, type: 3} m_Name: m_EditorClassIdentifier: + m_PointAction: {fileID: -1959881153152325168, guid: add476edce0d24d26bcdaf1681449ecf, type: 3} m_TooltipPopup: {fileID: 0} m_TooltipText: m_ActivateOnClick: 1 + m_TooltipDelay: 0.5 --- !u!1 &9059929380831878972 GameObject: m_ObjectHideFlags: 0 @@ -778,9 +782,9 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 9059929380544550687} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -859,11 +863,11 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 9059929381991440441} - {fileID: 7648382187687077328} m_Father: {fileID: 9059929381720062002} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -964,9 +968,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 79e7ca3e19eb99c4f97ff06a95ef7dac, type: 3} m_Name: m_EditorClassIdentifier: + m_PointAction: {fileID: -1959881153152325168, guid: add476edce0d24d26bcdaf1681449ecf, type: 3} m_TooltipPopup: {fileID: 0} m_TooltipText: m_ActivateOnClick: 1 + m_TooltipDelay: 0.5 --- !u!1 &9059929381720062001 GameObject: m_ObjectHideFlags: 0 @@ -997,13 +1003,13 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 9059929380544550687} - {fileID: 9059929381734582209} - {fileID: 9059929380243764539} - {fileID: 9059929381413149715} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -1089,6 +1095,7 @@ MonoBehaviour: m_SpecialAction2Button: {fileID: 9059929380243764532} m_EmoteBarButton: {fileID: 9059929381413149708} m_EmotePanel: {fileID: 0} + m_ToggleEmoteBarAction: {fileID: 0} --- !u!1 &9059929381734582208 GameObject: m_ObjectHideFlags: 0 @@ -1119,11 +1126,11 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 9059929380136398067} - {fileID: 6467281658954913184} m_Father: {fileID: 9059929381720062002} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1224,9 +1231,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 79e7ca3e19eb99c4f97ff06a95ef7dac, type: 3} m_Name: m_EditorClassIdentifier: + m_PointAction: {fileID: -1959881153152325168, guid: add476edce0d24d26bcdaf1681449ecf, type: 3} m_TooltipPopup: {fileID: 0} m_TooltipText: m_ActivateOnClick: 1 + m_TooltipDelay: 0.5 --- !u!1 &9059929381991440440 GameObject: m_ObjectHideFlags: 0 @@ -1255,9 +1264,9 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 9059929381413149715} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} diff --git a/Assets/Prefabs/UI/MainMenu UI Canvas.prefab b/Assets/Prefabs/UI/MainMenu UI Canvas.prefab index 76ffd5a41..5750330c1 100644 --- a/Assets/Prefabs/UI/MainMenu UI Canvas.prefab +++ b/Assets/Prefabs/UI/MainMenu UI Canvas.prefab @@ -1269,6 +1269,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 79e7ca3e19eb99c4f97ff06a95ef7dac, type: 3} m_Name: m_EditorClassIdentifier: + m_PointAction: {fileID: -1959881153152325168, guid: add476edce0d24d26bcdaf1681449ecf, type: 3} m_TooltipPopup: {fileID: 5331930138599208077} m_TooltipText: Unity Gaming Services ProjectID not set up. Click the Readme file in the Assets Folder within the Project window in-editor to follow "How to set diff --git a/Assets/Prefabs/UI/NetworkSimulator.prefab b/Assets/Prefabs/UI/NetworkSimulator.prefab index aca94770d..768c8b48a 100644 --- a/Assets/Prefabs/UI/NetworkSimulator.prefab +++ b/Assets/Prefabs/UI/NetworkSimulator.prefab @@ -108,15 +108,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -242,15 +244,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 + m_TextWrappingMode: 0 m_wordWrappingRatios: 0.4 m_overflowMode: 1 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -301,7 +305,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0.000030517578, y: 0.0000076293945} + m_AnchoredPosition: {x: 0.000030517578, y: 0} m_SizeDelta: {x: -0.0000076293945, y: 44.06} m_Pivot: {x: 0.5, y: 1} --- !u!1 &1187890238645865266 @@ -412,15 +416,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -771,7 +777,7 @@ MonoBehaviour: m_ScenariosButton: {fileID: 3849933660407801780} m_ScenariosButtonText: {fileID: 3849933660557125965} m_LagSpikeDuration: {fileID: 8516948734797190670} - m_OpenWindowKeyCode: 9 + m_ToggleNetworkSimulatorAction: {fileID: 34288948611290012, guid: add476edce0d24d26bcdaf1681449ecf, type: 3} m_ConnectionsCycleConfigurations: - m_ClassPreset: rid: 3384652154820362241 @@ -811,7 +817,7 @@ MonoBehaviour: - rid: 3384652154820362242 type: {class: NetworkSimulatorPreset, ns: Unity.Multiplayer.Tools.NetworkSimulator.Runtime, asm: Unity.Multiplayer.Tools.NetworkSimulator.Runtime} data: - k__BackingField: Home Broadband [WIFI, Cable, Console, PC] + k__BackingField: 'Home Broadband [WIFI, Cable, Console, PC]' k__BackingField: Typical of desktop and console platforms (and generally speaking most mobile players too). k__BackingField: 32 @@ -821,7 +827,7 @@ MonoBehaviour: - rid: 3384652154820362244 type: {class: NetworkSimulatorPreset, ns: Unity.Multiplayer.Tools.NetworkSimulator.Runtime, asm: Unity.Multiplayer.Tools.NetworkSimulator.Runtime} data: - k__BackingField: Mobile 5G ['20] + k__BackingField: 'Mobile 5G [''20]' k__BackingField: In many places, expect this to be 'as good as' or 'better than' home broadband. k__BackingField: 30 @@ -1011,15 +1017,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 + m_TextWrappingMode: 0 m_wordWrappingRatios: 0.4 m_overflowMode: 1 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -1274,15 +1282,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 + m_TextWrappingMode: 0 m_wordWrappingRatios: 0.4 m_overflowMode: 1 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 1 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -1536,7 +1546,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0.000030517578, y: 0} + m_AnchoredPosition: {x: 0.000030517578, y: -0.000022888184} m_SizeDelta: {x: -0.0000076293945, y: 44.06} m_Pivot: {x: 0.5, y: 1} --- !u!1 &3220895239932877001 @@ -1647,15 +1657,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -1781,15 +1793,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 + m_TextWrappingMode: 3 m_wordWrappingRatios: 0.4 m_overflowMode: 1 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 1 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -1935,6 +1949,7 @@ MonoBehaviour: m_ItemText: {fileID: 5108426573990114642} m_ItemImage: {fileID: 0} m_Value: 0 + m_MultiSelect: 0 m_Options: m_Options: [] m_OnValueChanged: @@ -2656,15 +2671,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -3286,7 +3303,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_PresetAsset: {fileID: 0} m_PresetReference: - rid: 6605000672329859073 + rid: 2061385516771705142 m_Scenario: rid: -2 m_IsScenarioSettingsFolded: 1 @@ -3296,7 +3313,7 @@ MonoBehaviour: RefIds: - rid: -2 type: {class: , ns: , asm: } - - rid: 6605000672329859073 + - rid: 2061385516771705142 type: {class: NetworkSimulatorPreset, ns: Unity.Multiplayer.Tools.NetworkSimulator.Runtime, asm: Unity.Multiplayer.Tools.NetworkSimulator.Runtime} data: k__BackingField: None @@ -3709,15 +3726,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -3843,15 +3862,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -4129,10 +4150,13 @@ MonoBehaviour: m_GlobalFontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_OnFocusSelectAll: 1 m_ResetOnDeActivation: 1 + m_KeepTextSelectionVisible: 0 m_RestoreOriginalTextOnEscape: 1 m_isRichTextEditingAllowed: 0 m_LineLimit: 0 + isAlert: 0 m_InputValidator: {fileID: 0} + m_ShouldActivateOnSelect: 1 --- !u!1 &7571868317983907511 GameObject: m_ObjectHideFlags: 0 @@ -4614,15 +4638,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -4768,6 +4794,7 @@ MonoBehaviour: m_ItemText: {fileID: 2572370505331673721} m_ItemImage: {fileID: 0} m_Value: 0 + m_MultiSelect: 0 m_Options: m_Options: [] m_OnValueChanged: @@ -4798,6 +4825,10 @@ PrefabInstance: propertyPath: m_enableAutoSizing value: 0 objectReference: {fileID: 0} + - target: {fileID: 5700619323420510958, guid: 2f2de97a89d7bef42919fd16c2f87f10, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 5700619323420510961, guid: 2f2de97a89d7bef42919fd16c2f87f10, type: 3} propertyPath: m_AnchorMax.x value: 1 @@ -4964,6 +4995,10 @@ PrefabInstance: propertyPath: m_fontSize value: 36 objectReference: {fileID: 0} + - target: {fileID: 5700619323420510958, guid: 2f2de97a89d7bef42919fd16c2f87f10, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 5700619323602338836, guid: 2f2de97a89d7bef42919fd16c2f87f10, type: 3} propertyPath: m_Type value: 1 @@ -5106,6 +5141,10 @@ PrefabInstance: propertyPath: m_enableAutoSizing value: 0 objectReference: {fileID: 0} + - target: {fileID: 5700619323420510958, guid: 2f2de97a89d7bef42919fd16c2f87f10, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 5700619323420510961, guid: 2f2de97a89d7bef42919fd16c2f87f10, type: 3} propertyPath: m_AnchorMax.x value: 1 diff --git a/Assets/Scenes/BossRoom.unity b/Assets/Scenes/BossRoom.unity index 134f7cae1..25e70f046 100644 --- a/Assets/Scenes/BossRoom.unity +++ b/Assets/Scenes/BossRoom.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:563f5ab263d3a1bc25ef209e45ac203c29d5f727a3c4204c8939adb1abebccdb -size 426863 +oid sha256:3a002e0d85e334bfd3b283e702fce926d0c8d2201d741d767d2842f3344f01c1 +size 427987 diff --git a/Assets/Scenes/CharSelect.unity b/Assets/Scenes/CharSelect.unity index 58e1d0c64..ed6534642 100644 --- a/Assets/Scenes/CharSelect.unity +++ b/Assets/Scenes/CharSelect.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d8d33954123e1f21d88d8267ebc8097362995bab0f724e32de5226bc7c941054 -size 49148 +oid sha256:b0a1012444ca7683272cb5372585c2c7917395ef9691159dd85bce962b36e772 +size 50035 diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index 6204ba89b..4d8a38845 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:79bf90e92970834821bfae7eccf2c13845b8f72e544136af41739edd694ca63a -size 72535 +oid sha256:cdaca1553f6a56d171dd72e4d8c51a3d22e5e4eaaff8def9c6ef3a7cde259a37 +size 73659 diff --git a/Assets/Scenes/Startup.unity b/Assets/Scenes/Startup.unity index c5fc2f93a..c819bfefd 100644 --- a/Assets/Scenes/Startup.unity +++ b/Assets/Scenes/Startup.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:051baee2f7626476a45adae7ef3ae46e1d2e63ecd142ccc36a7cd7859335e57e -size 60061 +oid sha256:127974d557ea582f65053f54c1434fd719f74af4ad1fada904afe2a11227e99a +size 61395 diff --git a/Assets/Scripts/Gameplay/Action/Input/AoeActionInput.cs b/Assets/Scripts/Gameplay/Action/Input/AoeActionInput.cs index 68a6ee1db..9e6b6b0e7 100644 --- a/Assets/Scripts/Gameplay/Action/Input/AoeActionInput.cs +++ b/Assets/Scripts/Gameplay/Action/Input/AoeActionInput.cs @@ -1,6 +1,7 @@ using Unity.BossRoom.Gameplay.GameplayObjects; using UnityEngine; using UnityEngine.AI; +using UnityEngine.InputSystem; namespace Unity.BossRoom.Gameplay.Actions { @@ -19,6 +20,12 @@ public class AoeActionInput : BaseActionInput [SerializeField] GameObject m_OutOfRangeVisualization; + [SerializeField] + InputActionReference m_PointAction; + + [SerializeField] + InputActionReference m_TargetAction; + Camera m_Camera; //The general action system works on MouseDown events (to support Charged Actions), but that means that if we only wait for @@ -44,7 +51,8 @@ void Start() void Update() { - if (PlaneRaycast(k_Plane, m_Camera.ScreenPointToRay(Input.mousePosition), out Vector3 pointOnPlane) && + // TODO: convert to mouse position using new input system + if (PlaneRaycast(k_Plane, m_Camera.ScreenPointToRay(m_PointAction.action.ReadValue()), out Vector3 pointOnPlane) && NavMesh.SamplePosition(pointOnPlane, out m_NavMeshHit, 2f, NavMesh.AllAreas)) { transform.position = m_NavMeshHit.position; @@ -56,12 +64,12 @@ void Update() m_OutOfRangeVisualization.SetActive(!isInRange); // wait for the player to click down and then release the mouse button before actually taking the input - if (Input.GetMouseButtonDown(0)) + if (m_TargetAction.action.WasPressedThisFrame()) { m_ReceivedMouseDownEvent = true; } - if (Input.GetMouseButtonUp(0) && m_ReceivedMouseDownEvent) + if (m_TargetAction.action.WasReleasedThisFrame() && m_ReceivedMouseDownEvent) { if (isInRange) { @@ -74,6 +82,7 @@ void Update() }; m_SendInput(data); } + Destroy(gameObject); return; } diff --git a/Assets/Scripts/Gameplay/DebugCheats/DebugCheatsManager.cs b/Assets/Scripts/Gameplay/DebugCheats/DebugCheatsManager.cs index e2a764b30..3cdda5104 100644 --- a/Assets/Scripts/Gameplay/DebugCheats/DebugCheatsManager.cs +++ b/Assets/Scripts/Gameplay/DebugCheats/DebugCheatsManager.cs @@ -7,6 +7,7 @@ using Unity.Multiplayer.Samples.Utilities; using Unity.Netcode; using UnityEngine; +using UnityEngine.InputSystem; using VContainer; namespace Unity.BossRoom.DebugCheats @@ -30,7 +31,7 @@ public class DebugCheatsManager : NetworkBehaviour NetworkObject m_BossPrefab; [SerializeField] - KeyCode m_OpenWindowKeyCode = KeyCode.Slash; + InputActionReference m_ToggleCheatsAction; SwitchedDoor m_SwitchedDoor; @@ -42,36 +43,30 @@ SwitchedDoor SwitchedDoor { m_SwitchedDoor = FindAnyObjectByType(); } + return m_SwitchedDoor; } } - const int k_NbTouchesToOpenWindow = 4; - bool m_DestroyPortalsOnNextToggle = true; [Inject] IPublisher m_CheatUsedMessagePublisher; - void Update() + void Start() { - if (Input.touchCount == k_NbTouchesToOpenWindow && AnyTouchDown() || - m_OpenWindowKeyCode != KeyCode.None && Input.GetKeyDown(m_OpenWindowKeyCode)) - { - m_DebugCheatsPanel.SetActive(!m_DebugCheatsPanel.activeSelf); - } + m_ToggleCheatsAction.action.performed += OnToggleCheatsActionPerformed; } - static bool AnyTouchDown() + public override void OnDestroy() { - foreach (var touch in Input.touches) - { - if (touch.phase == TouchPhase.Began) - { - return true; - } - } - return false; + base.OnDestroy(); + m_ToggleCheatsAction.action.performed -= OnToggleCheatsActionPerformed; + } + + void OnToggleCheatsActionPerformed(InputAction.CallbackContext obj) + { + m_DebugCheatsPanel.SetActive(!m_DebugCheatsPanel.activeSelf); } public void SpawnEnemy() @@ -166,7 +161,6 @@ void ServerKillTargetRpc(RpcParams serverRpcParams = default) UnityEngine.Debug.Log($"Target {targetId} has no IDamageable component or cannot be damaged."); } } - } } @@ -183,6 +177,7 @@ void ServerKillAllEnemiesRpc(RpcParams serverRpcParams = default) } } } + PublishCheatUsedMessage(serverRpcParams.Receive.SenderClientId, "KillAllEnemies"); } @@ -217,6 +212,7 @@ void ServerHealPlayerRpc(RpcParams serverRpcParams = default) damageable.ReceiveHP(null, baseHp); } } + PublishCheatUsedMessage(serverRpcParams.Receive.SenderClientId, "HealPlayer"); } } @@ -233,6 +229,7 @@ void ServerToggleSuperSpeedRpc(RpcParams serverRpcParams = default) break; } } + PublishCheatUsedMessage(clientId, "ToggleSuperSpeed"); } @@ -248,6 +245,7 @@ void ServerToggleTeleportModeRpc(RpcParams serverRpcParams = default) break; } } + PublishCheatUsedMessage(serverRpcParams.Receive.SenderClientId, "ToggleTeleportMode"); } diff --git a/Assets/Scripts/Gameplay/DebugCheats/Unity.BossRoom.DebugCheats.asmdef b/Assets/Scripts/Gameplay/DebugCheats/Unity.BossRoom.DebugCheats.asmdef index 18af0fb3c..00b9c150d 100644 --- a/Assets/Scripts/Gameplay/DebugCheats/Unity.BossRoom.DebugCheats.asmdef +++ b/Assets/Scripts/Gameplay/DebugCheats/Unity.BossRoom.DebugCheats.asmdef @@ -8,7 +8,7 @@ "Unity.BossRoom.ConnectionManagement", "Unity.Multiplayer.Samples.Utilities", "VContainer", - "VContainer.EnableCodeGen" + "Unity.InputSystem" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/Assets/Scripts/Gameplay/UI/HeroActionBar.cs b/Assets/Scripts/Gameplay/UI/HeroActionBar.cs index ba4d77f18..850703ef6 100644 --- a/Assets/Scripts/Gameplay/UI/HeroActionBar.cs +++ b/Assets/Scripts/Gameplay/UI/HeroActionBar.cs @@ -4,6 +4,7 @@ using Unity.BossRoom.Gameplay.GameplayObjects; using Unity.BossRoom.Gameplay.GameplayObjects.Character; using UnityEngine; +using UnityEngine.InputSystem; using Action = Unity.BossRoom.Gameplay.Actions.Action; using SkillTriggerStyle = Unity.BossRoom.Gameplay.UserInput.ClientInputSender.SkillTriggerStyle; @@ -40,6 +41,9 @@ public class HeroActionBar : MonoBehaviour /// ClientInputSender m_InputSender; + [SerializeField] + InputActionReference m_ToggleEmoteBarAction; + /// /// Identifiers for the buttons on the action bar. /// @@ -129,6 +133,7 @@ void RegisterInputSender(ClientPlayerAvatar clientPlayerAvatar) { GameDataSource.Instance.TryGetActionPrototypeByID(m_InputSender.actionState1.actionID, out action1); } + UpdateActionButton(m_ButtonInfo[ActionButtonType.BasicAction], action1); Action action2 = null; @@ -136,6 +141,7 @@ void RegisterInputSender(ClientPlayerAvatar clientPlayerAvatar) { GameDataSource.Instance.TryGetActionPrototypeByID(m_InputSender.actionState2.actionID, out action2); } + UpdateActionButton(m_ButtonInfo[ActionButtonType.Special1], action2); Action action3 = null; @@ -143,6 +149,7 @@ void RegisterInputSender(ClientPlayerAvatar clientPlayerAvatar) { GameDataSource.Instance.TryGetActionPrototypeByID(m_InputSender.actionState3.actionID, out action3); } + UpdateActionButton(m_ButtonInfo[ActionButtonType.Special2], action3); } @@ -161,6 +168,7 @@ void DeregisterInputSender() { m_InputSender.action1ModifiedCallback -= Action1ModifiedCallback; } + m_InputSender = null; } @@ -174,6 +182,8 @@ void Awake() [ActionButtonType.EmoteBar] = new ActionButtonInfo(ActionButtonType.EmoteBar, m_EmoteBarButton, this), }; + m_ToggleEmoteBarAction.action.performed += OnToggleEmoteBarPerformed; + ClientPlayerAvatar.LocalClientSpawned += RegisterInputSender; ClientPlayerAvatar.LocalClientDespawned += DeregisterInputSender; } @@ -198,13 +208,15 @@ void OnDestroy() { DeregisterInputSender(); + m_ToggleEmoteBarAction.action.performed -= OnToggleEmoteBarPerformed; + ClientPlayerAvatar.LocalClientSpawned -= RegisterInputSender; ClientPlayerAvatar.LocalClientDespawned -= DeregisterInputSender; } - void Update() + void OnToggleEmoteBarPerformed(InputAction.CallbackContext obj) { - if (Input.GetKeyUp(KeyCode.Alpha4)) + if (obj.performed) { m_ButtonInfo[ActionButtonType.EmoteBar].Button.OnPointerUpEvent.Invoke(); } diff --git a/Assets/Scripts/Gameplay/UI/UIHUDButton.cs b/Assets/Scripts/Gameplay/UI/UIHUDButton.cs index cbf9818ea..ff8e1c50f 100644 --- a/Assets/Scripts/Gameplay/UI/UIHUDButton.cs +++ b/Assets/Scripts/Gameplay/UI/UIHUDButton.cs @@ -9,7 +9,7 @@ namespace Unity.BossRoom.Gameplay.UI /// Provides logic for a UI HUD Button to slightly shrink scale on pointer down. /// Also has an optional code interface for receiving notifications about down/up events (instead of just on-click) /// - public class UIHUDButton : Button, IPointerDownHandler, IPointerUpHandler + public class UIHUDButton : Button { // We apply a uniform 95% scale to buttons when pressed static readonly Vector3 k_DownScale = new Vector3(0.95f, 0.95f, 0.95f); diff --git a/Assets/Scripts/Gameplay/UI/UITooltipDetector.cs b/Assets/Scripts/Gameplay/UI/UITooltipDetector.cs index 46c3abf86..03f281127 100644 --- a/Assets/Scripts/Gameplay/UI/UITooltipDetector.cs +++ b/Assets/Scripts/Gameplay/UI/UITooltipDetector.cs @@ -1,6 +1,7 @@ using System; using UnityEngine; using UnityEngine.EventSystems; +using UnityEngine.InputSystem; namespace Unity.BossRoom.Gameplay.UI { @@ -15,25 +16,28 @@ namespace Unity.BossRoom.Gameplay.UI /// public class UITooltipDetector : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler, IPointerClickHandler { + [SerializeField] + InputActionReference m_PointAction; + [SerializeField] [Tooltip("The actual Tooltip that should be triggered")] - private UITooltipPopup m_TooltipPopup; + UITooltipPopup m_TooltipPopup; [SerializeField] [Multiline] [Tooltip("The text of the tooltip (this is the default text; it can also be changed in code)")] - private string m_TooltipText; + string m_TooltipText; [SerializeField] [Tooltip("Should the tooltip appear instantly if the player clicks this UI element?")] - private bool m_ActivateOnClick = true; + bool m_ActivateOnClick = true; [SerializeField] [Tooltip("The length of time the mouse needs to hover over this element before the tooltip appears (in seconds)")] - private float m_TooltipDelay = 0.5f; + float m_TooltipDelay = 0.5f; - private float m_PointerEnterTime = 0; - private bool m_IsShowingTooltip; + float m_PointerEnterTime = 0; + bool m_IsShowingTooltip; public void SetText(string text) { @@ -66,7 +70,7 @@ public void OnPointerClick(PointerEventData eventData) } } - private void Update() + void Update() { if (m_PointerEnterTime != 0 && (Time.time - m_PointerEnterTime) > m_TooltipDelay) { @@ -74,16 +78,16 @@ private void Update() } } - private void ShowTooltip() + void ShowTooltip() { if (!m_IsShowingTooltip) { - m_TooltipPopup.ShowTooltip(m_TooltipText, Input.mousePosition); + m_TooltipPopup.ShowTooltip(m_TooltipText, m_PointAction.action.ReadValue()); m_IsShowingTooltip = true; } } - private void HideTooltip() + void HideTooltip() { if (m_IsShowingTooltip) { @@ -93,7 +97,7 @@ private void HideTooltip() } #if UNITY_EDITOR - private void OnValidate() + void OnValidate() { if (gameObject.scene.rootCount > 1) // Hacky way for checking if this is a scene object or a prefab instance and not a prefab definition. { diff --git a/Assets/Scripts/Gameplay/UI/UITooltipPopup.cs b/Assets/Scripts/Gameplay/UI/UITooltipPopup.cs index a863fa2ad..8b528e72f 100644 --- a/Assets/Scripts/Gameplay/UI/UITooltipPopup.cs +++ b/Assets/Scripts/Gameplay/UI/UITooltipPopup.cs @@ -12,16 +12,16 @@ namespace Unity.BossRoom.Gameplay.UI public class UITooltipPopup : MonoBehaviour { [SerializeField] - private Canvas m_Canvas; + Canvas m_Canvas; [SerializeField] [Tooltip("This transform is shown/hidden to show/hide the popup box")] - private GameObject m_WindowRoot; + GameObject m_WindowRoot; [SerializeField] - private TextMeshProUGUI m_TextField; + TextMeshProUGUI m_TextField; [SerializeField] - private Vector3 m_CursorOffset; + Vector3 m_CursorOffset; - private void Awake() + void Awake() { Assert.IsNotNull(m_Canvas); } @@ -48,7 +48,7 @@ public void HideTooltip() /// /// Maps screen coordinates (e.g. Input.mousePosition) to coordinates on our Canvas. /// - private Vector3 GetCanvasCoords(Vector3 screenCoords) + Vector3 GetCanvasCoords(Vector3 screenCoords) { Vector2 canvasCoords; RectTransformUtility.ScreenPointToLocalPointInRectangle( @@ -60,7 +60,7 @@ private Vector3 GetCanvasCoords(Vector3 screenCoords) } #if UNITY_EDITOR - private void OnValidate() + void OnValidate() { if (gameObject.scene.rootCount > 1) // Hacky way for checking if this is a scene object or a prefab instance and not a prefab definition. { diff --git a/Assets/Scripts/Gameplay/Unity.BossRoom.Gameplay.asmdef b/Assets/Scripts/Gameplay/Unity.BossRoom.Gameplay.asmdef index 2ae5c8c38..c2994e933 100644 --- a/Assets/Scripts/Gameplay/Unity.BossRoom.Gameplay.asmdef +++ b/Assets/Scripts/Gameplay/Unity.BossRoom.Gameplay.asmdef @@ -3,12 +3,10 @@ "rootNamespace": "", "references": [ "Unity.Netcode.Runtime", - "Unity.Netcode.Components", "Unity.Collections", "Unity.TextMeshPro", "Unity.Services.Core", "Unity.Services.Authentication", - "Unity.Services.Relay", "Unity.Networking.Transport", "Unity.BossRoom.Infrastructure", "Unity.BossRoom.UnityServices", @@ -22,7 +20,8 @@ "Unity.BossRoom.VisualEffects", "Unity.BossRoom.CameraUtils", "Unity.Multiplayer.Tools.NetworkSimulator.Runtime", - "Unity.Services.Multiplayer" + "Unity.Services.Multiplayer", + "Unity.InputSystem" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/Assets/Scripts/Gameplay/UserInput/ClientInputSender.cs b/Assets/Scripts/Gameplay/UserInput/ClientInputSender.cs index 9c2006ace..dcd6a1411 100644 --- a/Assets/Scripts/Gameplay/UserInput/ClientInputSender.cs +++ b/Assets/Scripts/Gameplay/UserInput/ClientInputSender.cs @@ -8,6 +8,7 @@ using UnityEngine.AI; using UnityEngine.Assertions; using UnityEngine.EventSystems; +using UnityEngine.InputSystem; namespace Unity.BossRoom.Gameplay.UserInput { @@ -23,7 +24,7 @@ public class ClientInputSender : NetworkBehaviour //upstream network conservation. This matters when holding down your mouse button to move. const float k_MoveSendRateSeconds = 0.04f; //25 fps. - const float k_TargetMoveTimeout = 0.45f; //prevent moves for this long after targeting someone (helps prevent walking to the guy you clicked). + const float k_TargetMoveTimeout = 0.45f; //prevent moves for this long after targeting someone (helps prevent walking to the guy you clicked). float m_LastSentMove; @@ -42,6 +43,27 @@ public class ClientInputSender : NetworkBehaviour [SerializeField] ServerCharacter m_ServerCharacter; + [SerializeField] + InputActionReference m_TargetAction; + [SerializeField] + InputActionReference m_Skill1Action; + [SerializeField] + InputActionReference m_PointAction; + [SerializeField] + InputActionReference m_Action1; + [SerializeField] + InputActionReference m_Action2; + [SerializeField] + InputActionReference m_Action3; + [SerializeField] + InputActionReference m_Action5; + [SerializeField] + InputActionReference m_Action6; + [SerializeField] + InputActionReference m_Action7; + [SerializeField] + InputActionReference m_Action8; + /// /// This event fires at the time when an action request is sent to the server. /// @@ -53,12 +75,12 @@ public class ClientInputSender : NetworkBehaviour /// public enum SkillTriggerStyle { - None, //no skill was triggered. - MouseClick, //skill was triggered via mouse-click implying you should do a raycast from the mouse position to find a target. - Keyboard, //skill was triggered via a Keyboard press, implying target should be taken from the active target. + None, //no skill was triggered. + MouseClick, //skill was triggered via mouse-click implying you should do a raycast from the mouse position to find a target. + Keyboard, //skill was triggered via a Keyboard press, implying target should be taken from the active target. KeyboardRelease, //represents a released key. - UI, //skill was triggered from the UI, and similar to Keyboard, target should be inferred from the active target. - UIRelease, //represents letting go of the mouse-button on a UI button + UI, //skill was triggered from the UI, and similar to Keyboard, target should be inferred from the active target. + UIRelease, //represents letting go of the mouse-button on a UI button } bool IsReleaseStyle(SkillTriggerStyle style) @@ -128,6 +150,7 @@ public override void OnNetworkSpawn() if (!IsClient || !IsOwner) { enabled = false; + // dont need to do anything else if not the owner return; } @@ -140,17 +163,30 @@ public override void OnNetworkSpawn() { actionState1 = new ActionState() { actionID = action1.ActionID, selectable = true }; } + if (CharacterClass.Skill2 && GameDataSource.Instance.TryGetActionPrototypeByID(CharacterClass.Skill2.ActionID, out var action2)) { actionState2 = new ActionState() { actionID = action2.ActionID, selectable = true }; } + if (CharacterClass.Skill3 && GameDataSource.Instance.TryGetActionPrototypeByID(CharacterClass.Skill3.ActionID, out var action3)) { actionState3 = new ActionState() { actionID = action3.ActionID, selectable = true }; } + m_Action1.action.started += OnAction1Started; + m_Action1.action.canceled += OnAction1Canceled; + m_Action2.action.started += OnAction2Started; + m_Action2.action.canceled += OnAction2Canceled; + m_Action3.action.started += OnAction3Started; + m_Action3.action.canceled += OnAction3Canceled; + m_Action5.action.performed += OnAction5Performed; + m_Action6.action.performed += OnAction6Performed; + m_Action7.action.performed += OnAction7Performed; + m_Action8.action.performed += OnAction8Performed; + m_GroundLayerMask = LayerMask.GetMask(new[] { "Ground" }); m_ActionLayerMask = LayerMask.GetMask(new[] { "PCs", "NPCs", "Ground" }); @@ -169,6 +205,17 @@ public override void OnNetworkDespawn() { m_TargetServerCharacter.NetLifeState.LifeState.OnValueChanged -= OnTargetLifeStateChanged; } + + m_Action1.action.started -= OnAction1Started; + m_Action1.action.canceled -= OnAction1Canceled; + m_Action2.action.started -= OnAction2Started; + m_Action2.action.canceled -= OnAction2Canceled; + m_Action3.action.started -= OnAction3Started; + m_Action3.action.canceled -= OnAction3Canceled; + m_Action5.action.performed -= OnAction5Performed; + m_Action6.action.performed -= OnAction6Performed; + m_Action7.action.performed -= OnAction7Performed; + m_Action8.action.performed -= OnAction8Performed; } void OnTargetChanged(ulong previousValue, ulong newValue) @@ -252,7 +299,7 @@ void FixedUpdate() if ((Time.time - m_LastSentMove) > k_MoveSendRateSeconds) { m_LastSentMove = Time.time; - var ray = m_MainCamera.ScreenPointToRay(UnityEngine.Input.mousePosition); + var ray = m_MainCamera.ScreenPointToRay(m_PointAction.action.ReadValue()); var groundHits = Physics.RaycastNonAlloc(ray, k_CachedHit, @@ -308,7 +355,7 @@ void PerformSkill(ActionID actionID, SkillTriggerStyle triggerStyle, ulong targe int numHits = 0; if (triggerStyle == SkillTriggerStyle.MouseClick) { - var ray = m_MainCamera.ScreenPointToRay(UnityEngine.Input.mousePosition); + var ray = m_MainCamera.ScreenPointToRay(m_PointAction.action.ReadValue()); numHits = Physics.RaycastNonAlloc(ray, k_CachedHit, k_MouseInputRaycastDistance, m_ActionLayerMask); } @@ -424,7 +471,7 @@ void PopulateSkillRequest(Vector3 hitPoint, ActionID actionID, ref ActionRequest //there is a bug where the direction is flipped if the hitPos and current position are almost the same, //so we use the character's direction instead. float directionLength = offset.magnitude; - Vector3 direction = 1.0f/*epsilon*/ <= directionLength ? (offset / directionLength) : m_PhysicsWrapper.Transform.forward; + Vector3 direction = 1.0f /*epsilon*/ <= directionLength ? (offset / directionLength) : m_PhysicsWrapper.Transform.forward; switch (actionConfig.Logic) { @@ -475,65 +522,73 @@ public void RequestAction(ActionID actionID, SkillTriggerStyle triggerStyle, ulo } } - void Update() + void OnAction1Started(InputAction.CallbackContext obj) { - if (Input.GetKeyDown(KeyCode.Alpha1) && CharacterClass.Skill1) - { - RequestAction(actionState1.actionID, SkillTriggerStyle.Keyboard); - } - else if (Input.GetKeyUp(KeyCode.Alpha1) && CharacterClass.Skill1) - { - RequestAction(actionState1.actionID, SkillTriggerStyle.KeyboardRelease); - } - if (Input.GetKeyDown(KeyCode.Alpha2) && CharacterClass.Skill2) - { - RequestAction(actionState2.actionID, SkillTriggerStyle.Keyboard); - } - else if (Input.GetKeyUp(KeyCode.Alpha2) && CharacterClass.Skill2) - { - RequestAction(actionState2.actionID, SkillTriggerStyle.KeyboardRelease); - } - if (Input.GetKeyDown(KeyCode.Alpha3) && CharacterClass.Skill3) - { - RequestAction(actionState3.actionID, SkillTriggerStyle.Keyboard); - } - else if (Input.GetKeyUp(KeyCode.Alpha3) && CharacterClass.Skill3) - { - RequestAction(actionState3.actionID, SkillTriggerStyle.KeyboardRelease); - } + RequestAction(actionState1.actionID, SkillTriggerStyle.Keyboard); + } - if (Input.GetKeyDown(KeyCode.Alpha5)) - { - RequestAction(GameDataSource.Instance.Emote1ActionPrototype.ActionID, SkillTriggerStyle.Keyboard); - } - if (Input.GetKeyDown(KeyCode.Alpha6)) - { - RequestAction(GameDataSource.Instance.Emote2ActionPrototype.ActionID, SkillTriggerStyle.Keyboard); - } - if (Input.GetKeyDown(KeyCode.Alpha7)) - { - RequestAction(GameDataSource.Instance.Emote3ActionPrototype.ActionID, SkillTriggerStyle.Keyboard); - } - if (Input.GetKeyDown(KeyCode.Alpha8)) - { - RequestAction(GameDataSource.Instance.Emote4ActionPrototype.ActionID, SkillTriggerStyle.Keyboard); - } + void OnAction1Canceled(InputAction.CallbackContext obj) + { + RequestAction(actionState1.actionID, SkillTriggerStyle.KeyboardRelease); + } + void OnAction2Started(InputAction.CallbackContext obj) + { + RequestAction(actionState2.actionID, SkillTriggerStyle.Keyboard); + } + + void OnAction2Canceled(InputAction.CallbackContext obj) + { + RequestAction(actionState2.actionID, SkillTriggerStyle.KeyboardRelease); + } + + void OnAction3Started(InputAction.CallbackContext obj) + { + RequestAction(actionState3.actionID, SkillTriggerStyle.Keyboard); + } + + void OnAction3Canceled(InputAction.CallbackContext obj) + { + RequestAction(actionState3.actionID, SkillTriggerStyle.KeyboardRelease); + } + + void OnAction5Performed(InputAction.CallbackContext obj) + { + RequestAction(GameDataSource.Instance.Emote1ActionPrototype.ActionID, SkillTriggerStyle.Keyboard); + } + + void OnAction6Performed(InputAction.CallbackContext obj) + { + RequestAction(GameDataSource.Instance.Emote2ActionPrototype.ActionID, SkillTriggerStyle.Keyboard); + } + + void OnAction7Performed(InputAction.CallbackContext obj) + { + RequestAction(GameDataSource.Instance.Emote3ActionPrototype.ActionID, SkillTriggerStyle.Keyboard); + } + + void OnAction8Performed(InputAction.CallbackContext obj) + { + RequestAction(GameDataSource.Instance.Emote4ActionPrototype.ActionID, SkillTriggerStyle.Keyboard); + } + + void Update() + { if (!EventSystem.current.IsPointerOverGameObject() && m_CurrentSkillInput == null) { //IsPointerOverGameObject() is a simple way to determine if the mouse is over a UI element. If it is, we don't perform mouse input logic, //to model the button "blocking" mouse clicks from falling through and interacting with the world. - if (Input.GetMouseButtonDown(1)) + if (m_Skill1Action.action.WasPressedThisFrame()) { RequestAction(CharacterClass.Skill1.ActionID, SkillTriggerStyle.MouseClick); } - if (Input.GetMouseButtonDown(0)) + if (m_TargetAction.action.WasPressedThisFrame()) { RequestAction(GameDataSource.Instance.GeneralTargetActionPrototype.ActionID, SkillTriggerStyle.MouseClick); } - else if (Input.GetMouseButton(0)) + else if (m_TargetAction.action.IsPressed()) { m_MoveRequest = true; } @@ -557,19 +612,19 @@ void UpdateAction1() actionState1.actionID = GameDataSource.Instance.DropActionPrototype.ActionID; } else if ((m_ServerCharacter.TargetId.Value != 0 - && selection != null - && selection.TryGetComponent(out PickUpState pickUpState)) - ) + && selection != null + && selection.TryGetComponent(out PickUpState pickUpState)) + ) { // special case: targeting a pickup-able item or holding a pickup object actionState1.actionID = GameDataSource.Instance.PickUpActionPrototype.ActionID; } else if (m_ServerCharacter.TargetId.Value != 0 - && selection != null - && selection.NetworkObjectId != m_ServerCharacter.NetworkObjectId - && selection.TryGetComponent(out ServerCharacter charState) - && !charState.IsNpc) + && selection != null + && selection.NetworkObjectId != m_ServerCharacter.NetworkObjectId + && selection.TryGetComponent(out ServerCharacter charState) + && !charState.IsNpc) { // special case: when we have a player selected, we change the meaning of the basic action // we have another player selected! In that case we want to reflect that our basic Action is a Revive, not an attack! diff --git a/Assets/Scripts/Utils/NetworkSimulatorUIMediator.cs b/Assets/Scripts/Utils/NetworkSimulatorUIMediator.cs index a80f4ef3e..a03338580 100644 --- a/Assets/Scripts/Utils/NetworkSimulatorUIMediator.cs +++ b/Assets/Scripts/Utils/NetworkSimulatorUIMediator.cs @@ -6,6 +6,7 @@ using Unity.Multiplayer.Tools.NetworkSimulator.Runtime.BuiltInScenarios; using Unity.Netcode; using UnityEngine; +using UnityEngine.InputSystem; using UnityEngine.UI; namespace Unity.BossRoom.Utils @@ -36,7 +37,7 @@ public class NetworkSimulatorUIMediator : MonoBehaviour TMP_InputField m_LagSpikeDuration; [SerializeField] - KeyCode m_OpenWindowKeyCode = KeyCode.Tilde; + InputActionReference m_ToggleNetworkSimulatorAction; [SerializeField] List m_ConnectionsCycleConfigurations; @@ -47,8 +48,6 @@ public class NetworkSimulatorUIMediator : MonoBehaviour [SerializeField] int m_RandomConnectionsSwapChangeIntervalMilliseconds; - const int k_NbTouchesToOpenWindow = 5; - Dictionary m_SimulatorPresets = new Dictionary(); #endif bool m_Shown; @@ -64,6 +63,7 @@ void Awake() #if UNITY_EDITOR || DEVELOPMENT_BUILD InitializeUI(); #endif + // Hide UI until ready Hide(); } @@ -81,6 +81,8 @@ void Start() { NetworkManager.Singleton.OnClientStarted += OnNetworkManagerStarted; NetworkManager.Singleton.OnServerStarted += OnNetworkManagerStarted; + + m_ToggleNetworkSimulatorAction.action.performed += OnToggleNetworkSimulatorActionPerformed; } void OnDestroy() @@ -90,6 +92,8 @@ void OnDestroy() NetworkManager.Singleton.OnClientStarted -= OnNetworkManagerStarted; NetworkManager.Singleton.OnServerStarted -= OnNetworkManagerStarted; } + + m_ToggleNetworkSimulatorAction.action.performed -= OnToggleNetworkSimulatorActionPerformed; } void OnNetworkManagerStarted() @@ -122,6 +126,7 @@ void OnScenarioChanged(int optionIndex) { connectionsCyleScenario.Configurations.Add(configuration); } + m_PresetsDropdown.captionText.color = m_PresetsDropdown.colors.disabledColor; m_PresetsDropdown.interactable = false; scenario = connectionsCyleScenario; @@ -133,6 +138,7 @@ void OnScenarioChanged(int optionIndex) { randomConnectionsSwapScenario.Configurations.Add(configuration); } + m_PresetsDropdown.captionText.color = m_PresetsDropdown.colors.disabledColor; m_PresetsDropdown.interactable = false; scenario = randomConnectionsSwapScenario; @@ -143,6 +149,7 @@ void OnScenarioChanged(int optionIndex) m_PresetsDropdown.interactable = true; break; } + m_NetworkSimulator.Scenario = scenario; if (m_NetworkSimulator.Scenario != null) { @@ -177,12 +184,14 @@ void InitializeUI() { // Initialize connection presets dropdown var optionData = new List(); + // Adding all available presets foreach (var networkSimulatorPreset in NetworkSimulatorPresets.Values) { m_SimulatorPresets[networkSimulatorPreset.Name] = networkSimulatorPreset; optionData.Add(new TMP_Dropdown.OptionData(networkSimulatorPreset.Name)); } + m_PresetsDropdown.AddOptions(optionData); m_PresetsDropdown.onValueChanged.AddListener(OnPresetChanged); @@ -206,12 +215,6 @@ void Update() { if (m_NetworkSimulator.IsAvailable) { - if (Input.touchCount == k_NbTouchesToOpenWindow && AnyTouchDown() || - m_OpenWindowKeyCode != KeyCode.None && Input.GetKeyDown(m_OpenWindowKeyCode)) - { - ToggleVisibility(); - } - var selectedPreset = m_PresetsDropdown.options[m_PresetsDropdown.value].text; if (selectedPreset != m_NetworkSimulator.CurrentPreset.Name) { @@ -223,7 +226,6 @@ void Update() } } } - } else { @@ -234,16 +236,9 @@ void Update() } } - static bool AnyTouchDown() + void OnToggleNetworkSimulatorActionPerformed(InputAction.CallbackContext obj) { - foreach (var touch in Input.touches) - { - if (touch.phase == TouchPhase.Began) - { - return true; - } - } - return false; + ToggleVisibility(); } public void SimulateDisconnect() diff --git a/Assets/Scripts/Utils/Unity.BossRoom.Utils.asmdef b/Assets/Scripts/Utils/Unity.BossRoom.Utils.asmdef index 9387c5ca7..5cc85b5d2 100644 --- a/Assets/Scripts/Utils/Unity.BossRoom.Utils.asmdef +++ b/Assets/Scripts/Utils/Unity.BossRoom.Utils.asmdef @@ -6,7 +6,8 @@ "Unity.Netcode.Runtime", "Unity.Multiplayer.Tools.NetworkSimulator.Runtime", "Unity.Networking.Transport", - "Unity.Collections" + "Unity.Collections", + "Unity.InputSystem" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/CHANGELOG.md b/CHANGELOG.md index 650fdb36e..ab47a269e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ Additional documentation and release notes are available at [Multiplayer Documen * Added a welcome dialog to guide users on their first time experience (#888) * Added a Table of Contents with helpful resources, that can be accessed from the `Tutorials > Show Tutorials` menu * Added the Multiplayer Play Mode package v1.3.1 to the project (#890) +* An In-Editor Tutorial walking through the process of associating your Unity project with a Unity Cloud ID has been added (#898) ### Changed * Upgraded editor version to 6000.0.25f1 and upgraded Boss Room to Netcode for GameObjects v2.0.0 (#890) @@ -23,6 +24,7 @@ Additional documentation and release notes are available at [Multiplayer Documen * com.unity.multiplayer.tools from v2.2.1 to v2.2.3 * com.unity.netcode.gameobjects from v2.0.0 to v2.1.1 * VContainer package upgraded from v1.11.0 to v1.14.0 (#896) This upgrade removes warning messages related to IL weaving as code gen is refactored in v1.14.0 +* Upgraded the project to the New Input System v1.11.2 (#897) Compatibility mode with the previous version has been disabled. ### Cleanup * Removed ParrelSync from the project (#890) diff --git a/Packages/com.unity.multiplayer.samples.coop/Utilities/Net/RNSM/NetStatsMonitorCustomization.cs b/Packages/com.unity.multiplayer.samples.coop/Utilities/Net/RNSM/NetStatsMonitorCustomization.cs index 99ae203a0..28e316032 100644 --- a/Packages/com.unity.multiplayer.samples.coop/Utilities/Net/RNSM/NetStatsMonitorCustomization.cs +++ b/Packages/com.unity.multiplayer.samples.coop/Utilities/Net/RNSM/NetStatsMonitorCustomization.cs @@ -1,5 +1,7 @@ +using System; using Unity.Multiplayer.Tools.NetStatsMonitor; using UnityEngine; +using UnityEngine.InputSystem; namespace Unity.Multiplayer.Samples.Utilities { @@ -8,33 +10,25 @@ public class NetStatsMonitorCustomization : MonoBehaviour [SerializeField] RuntimeNetStatsMonitor m_Monitor; - const int k_NbTouchesToOpenWindow = 3; + [SerializeField] + InputActionReference m_ToggleNetworkStatsAction; void Start() { m_Monitor.Visible = false; + + m_ToggleNetworkStatsAction.action.performed += OnToggleNetworkStatsActionperformed; } - void Update() + void OnDestroy() { - if (Input.GetKeyUp(KeyCode.S) || Input.touchCount == k_NbTouchesToOpenWindow && AnyTouchDown()) - { - m_Monitor.Visible = !m_Monitor.Visible; // toggle. Using "Visible" instead of "Enabled" to make sure RNSM keeps updating in the background - // while not visible. This way, when bring it back visible, we can make sure values are up to date. - } + m_ToggleNetworkStatsAction.action.performed -= OnToggleNetworkStatsActionperformed; } - static bool AnyTouchDown() + void OnToggleNetworkStatsActionperformed(InputAction.CallbackContext obj) { - foreach (var touch in Input.touches) - { - if (touch.phase == TouchPhase.Began) - { - return true; - } - } - - return false; + m_Monitor.Visible = !m_Monitor.Visible; // toggle. Using "Visible" instead of "Enabled" to make sure RNSM keeps updating in the background + // while not visible. This way, when bring it back visible, we can make sure values are up to date. } } } diff --git a/Packages/com.unity.multiplayer.samples.coop/Utilities/Net/RNSM/NetStatsMonitorPrefab.prefab b/Packages/com.unity.multiplayer.samples.coop/Utilities/Net/RNSM/NetStatsMonitorPrefab.prefab index 3a1e95238..38c5f615e 100644 --- a/Packages/com.unity.multiplayer.samples.coop/Utilities/Net/RNSM/NetStatsMonitorPrefab.prefab +++ b/Packages/com.unity.multiplayer.samples.coop/Utilities/Net/RNSM/NetStatsMonitorPrefab.prefab @@ -81,6 +81,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Monitor: {fileID: 2974514019541307268} + m_ToggleNetworkStatsAction: {fileID: -2038963145091817163, guid: add476edce0d24d26bcdaf1681449ecf, type: 3} --- !u!1 &3283172432546924609 GameObject: m_ObjectHideFlags: 0 @@ -189,15 +190,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 diff --git a/Packages/com.unity.multiplayer.samples.coop/Utilities/Net/RNSM/com.unity.multiplayer.samples.utilities.rnsm.asmdef b/Packages/com.unity.multiplayer.samples.coop/Utilities/Net/RNSM/com.unity.multiplayer.samples.utilities.rnsm.asmdef index 5f2db97f3..cab56fbd0 100644 --- a/Packages/com.unity.multiplayer.samples.coop/Utilities/Net/RNSM/com.unity.multiplayer.samples.utilities.rnsm.asmdef +++ b/Packages/com.unity.multiplayer.samples.coop/Utilities/Net/RNSM/com.unity.multiplayer.samples.utilities.rnsm.asmdef @@ -2,7 +2,8 @@ "name": "Unity.Multiplayer.Samples.Utilities.RNSM", "rootNamespace": "", "references": [ - "GUID:2c360f3794ebc41388fc11424ddbfdd0" + "GUID:2c360f3794ebc41388fc11424ddbfdd0", + "GUID:75469ad4d38634e559750d17036d5f7c" ], "includePlatforms": [], "excludePlatforms": [], @@ -15,4 +16,4 @@ ], "versionDefines": [], "noEngineReferences": false -} +} \ No newline at end of file diff --git a/Packages/manifest.json b/Packages/manifest.json index 69594422a..53c1b27db 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -6,6 +6,7 @@ "com.unity.collab-proxy": "2.6.0", "com.unity.ide.rider": "3.0.34", "com.unity.ide.visualstudio": "2.0.22", + "com.unity.inputsystem": "1.11.2", "com.unity.learn.iet-framework": "4.0.3", "com.unity.learn.iet-framework.authoring": "1.2.2", "com.unity.memoryprofiler": "1.1.3", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 09c32dfd1..909e7da56 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -85,6 +85,15 @@ }, "url": "https://packages.unity.com" }, + "com.unity.inputsystem": { + "version": "1.11.2", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.uielements": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.learn.iet-framework": { "version": "4.0.3", "depth": 0, diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 8e686c063..649ea9148 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:437a3072f7463a7664548b95f70f8fab91c81e4c8fc8847f9efd132d66549529 -size 984 +oid sha256:5d90838a4e9d8f3d5ff4a08f8ee287653afffd664138b4160c85898988d7f894 +size 1128 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index ecac03467..ae02dccf0 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:575f0b4ef595b79bd5cb4c34b1d19acb30209e68323c111bdaa4f82230b359a0 +oid sha256:cd3a24fdc467d2bb584ca578f24068db6028a8ec5105ced71f2cdad96e097d43 size 27731