diff --git a/Assets/Prefabs/Character/Kit Carlson.prefab b/Assets/Prefabs/Character/Kit Carlson.prefab index bf23a46..b201608 100644 --- a/Assets/Prefabs/Character/Kit Carlson.prefab +++ b/Assets/Prefabs/Character/Kit Carlson.prefab @@ -9,8 +9,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7915496552382078928} - - component: {fileID: 7915496552382078935} - component: {fileID: 7915496552382078934} + - component: {fileID: 7915496552382078935} m_Layer: 0 m_Name: Kit Carlson m_TagString: Untagged @@ -32,7 +32,7 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &7915496552382078935 +--- !u!114 &7915496552382078934 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -41,14 +41,14 @@ MonoBehaviour: m_GameObject: {fileID: 7915496552382078933} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9b91ecbcc199f4492b9a91e820070131, type: 3} + m_Script: {fileID: 11500000, guid: 0d4612184ffe3f44f99056cf69c810f9, type: 3} m_Name: m_EditorClassIdentifier: - serverOnly: 0 - localPlayerAuthority: 0 - m_AssetId: - m_SceneId: 1035883293 ---- !u!114 &7915496552382078934 + syncMode: 0 + syncInterval: 0.1 + characterName: Kit Carlson + characterHP: 4 +--- !u!114 &7915496552382078935 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -57,9 +57,10 @@ MonoBehaviour: m_GameObject: {fileID: 7915496552382078933} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0d4612184ffe3f44f99056cf69c810f9, type: 3} + m_Script: {fileID: 11500000, guid: 9b91ecbcc199f4492b9a91e820070131, type: 3} m_Name: m_EditorClassIdentifier: - syncInterval: 0.1 - characterName: Kit Carlson - characterHP: 4 + serverOnly: 0 + localPlayerAuthority: 0 + m_AssetId: + m_SceneId: 2971758318 diff --git a/Assets/Prefabs/Character/Lemonade Jim.prefab b/Assets/Prefabs/Character/Lemonade Jim.prefab index dd3facb..3da35e1 100644 --- a/Assets/Prefabs/Character/Lemonade Jim.prefab +++ b/Assets/Prefabs/Character/Lemonade Jim.prefab @@ -9,8 +9,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5389608874815740604} - - component: {fileID: 5389608874815740605} - component: {fileID: 5389608874815740602} + - component: {fileID: 5389608874815740605} m_Layer: 0 m_Name: Lemonade Jim m_TagString: Untagged @@ -32,7 +32,7 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &5389608874815740605 +--- !u!114 &5389608874815740602 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -41,14 +41,14 @@ MonoBehaviour: m_GameObject: {fileID: 5389608874815740603} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9b91ecbcc199f4492b9a91e820070131, type: 3} + m_Script: {fileID: 11500000, guid: 3dbd71c87151fae49b81bf010d57d5b2, type: 3} m_Name: m_EditorClassIdentifier: - m_ServerOnly: 0 - m_LocalPlayerAuthority: 0 - m_AssetId: - m_SceneId: 185060260 ---- !u!114 &5389608874815740602 + syncMode: 0 + syncInterval: 0.1 + characterName: Lemonade Jim + characterHP: 4 +--- !u!114 &5389608874815740605 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -57,9 +57,10 @@ MonoBehaviour: m_GameObject: {fileID: 5389608874815740603} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3dbd71c87151fae49b81bf010d57d5b2, type: 3} + m_Script: {fileID: 11500000, guid: 9b91ecbcc199f4492b9a91e820070131, type: 3} m_Name: m_EditorClassIdentifier: - syncInterval: 0.1 - characterName: Lemonade Jim - characterHP: 4 + serverOnly: 0 + localPlayerAuthority: 0 + m_AssetId: + m_SceneId: 740403312 diff --git a/Assets/Prefabs/Character/Lucky Duke.prefab b/Assets/Prefabs/Character/Lucky Duke.prefab index 07313c9..f0284e3 100644 --- a/Assets/Prefabs/Character/Lucky Duke.prefab +++ b/Assets/Prefabs/Character/Lucky Duke.prefab @@ -9,8 +9,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7833244474940123918} - - component: {fileID: 7833244474940123919} - component: {fileID: 7833244474940123916} + - component: {fileID: 7833244474940123919} m_Layer: 0 m_Name: Lucky Duke m_TagString: Untagged @@ -32,7 +32,7 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &7833244474940123919 +--- !u!114 &7833244474940123916 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -41,14 +41,14 @@ MonoBehaviour: m_GameObject: {fileID: 7833244474940123917} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9b91ecbcc199f4492b9a91e820070131, type: 3} + m_Script: {fileID: 11500000, guid: 28633acd8f5b8d74ab48fa20cd012623, type: 3} m_Name: m_EditorClassIdentifier: - serverOnly: 0 - localPlayerAuthority: 0 - m_AssetId: - m_SceneId: 738093744 ---- !u!114 &7833244474940123916 + syncMode: 0 + syncInterval: 0.1 + characterName: Lucky Duke + characterHP: 4 +--- !u!114 &7833244474940123919 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -57,9 +57,10 @@ MonoBehaviour: m_GameObject: {fileID: 7833244474940123917} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28633acd8f5b8d74ab48fa20cd012623, type: 3} + m_Script: {fileID: 11500000, guid: 9b91ecbcc199f4492b9a91e820070131, type: 3} m_Name: m_EditorClassIdentifier: - syncInterval: 0.1 - characterName: Lucky Duke - characterHP: 4 + serverOnly: 0 + localPlayerAuthority: 0 + m_AssetId: + m_SceneId: 2865439807 diff --git a/Assets/Prefabs/Character/Molly Stark.prefab b/Assets/Prefabs/Character/Molly Stark.prefab index 383bf26..8ff7cb7 100644 --- a/Assets/Prefabs/Character/Molly Stark.prefab +++ b/Assets/Prefabs/Character/Molly Stark.prefab @@ -9,8 +9,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3279534552043588207} - - component: {fileID: 3279534552043588206} - component: {fileID: 3279534552043588201} + - component: {fileID: 3279534552043588206} m_Layer: 0 m_Name: Molly Stark m_TagString: Untagged @@ -32,7 +32,7 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &3279534552043588206 +--- !u!114 &3279534552043588201 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -41,14 +41,14 @@ MonoBehaviour: m_GameObject: {fileID: 3279534552043588200} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9b91ecbcc199f4492b9a91e820070131, type: 3} + m_Script: {fileID: 11500000, guid: b23abecef8498be4892d5d035d18e30e, type: 3} m_Name: m_EditorClassIdentifier: - m_ServerOnly: 0 - m_LocalPlayerAuthority: 0 - m_AssetId: b231de2e611f66c4189f93e692e277ea - m_SceneId: 0 ---- !u!114 &3279534552043588201 + syncMode: 0 + syncInterval: 0.1 + characterName: Molly Stark + characterHP: 4 +--- !u!114 &3279534552043588206 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -57,9 +57,10 @@ MonoBehaviour: m_GameObject: {fileID: 3279534552043588200} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b23abecef8498be4892d5d035d18e30e, type: 3} + m_Script: {fileID: 11500000, guid: 9b91ecbcc199f4492b9a91e820070131, type: 3} m_Name: m_EditorClassIdentifier: - syncInterval: 0.1 - characterName: Molly Stark - characterHP: 4 + serverOnly: 0 + localPlayerAuthority: 0 + m_AssetId: + m_SceneId: 2288768565 diff --git a/Assets/Prefabs/Character/Sid Ketchum.prefab b/Assets/Prefabs/Character/Sid Ketchum.prefab index 4a46d7a..fed1e7a 100644 --- a/Assets/Prefabs/Character/Sid Ketchum.prefab +++ b/Assets/Prefabs/Character/Sid Ketchum.prefab @@ -44,9 +44,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5fc4162c7a6a40d48be80646c4fc773c, type: 3} m_Name: m_EditorClassIdentifier: + syncMode: 0 syncInterval: 0.1 characterName: Sid Ketchum - characterHP: 2 + characterHP: 4 --- !u!114 &2599033479935168032 MonoBehaviour: m_ObjectHideFlags: 0 @@ -62,4 +63,4 @@ MonoBehaviour: serverOnly: 0 localPlayerAuthority: 0 m_AssetId: - m_SceneId: 1517100967 + m_SceneId: 1147093267 diff --git a/Packages/manifest.json b/Packages/manifest.json index 6e4cb43..ba118ab 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -7,10 +7,10 @@ "com.unity.collab-proxy": "1.2.16", "com.unity.ext.nunit": "1.0.0", "com.unity.ide.rider": "1.1.0", - "com.unity.ide.vscode": "1.1.0", - "com.unity.multiplayer-hlapi": "1.0.2", + "com.unity.ide.vscode": "1.1.2", + "com.unity.multiplayer-hlapi": "1.0.4", "com.unity.purchasing": "2.0.6", - "com.unity.test-framework": "1.0.13", + "com.unity.test-framework": "1.1.2", "com.unity.textmeshpro": "2.0.1", "com.unity.ugui": "1.0.0", "com.unity.xr.legacyinputhelpers": "2.0.2", diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index e8293a6..a4540d8 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -3,7 +3,7 @@ --- !u!30 &1 GraphicsSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 + serializedVersion: 13 m_Deferred: m_Mode: 1 m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0} @@ -39,6 +39,7 @@ GraphicsSettings: - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} @@ -63,3 +64,5 @@ GraphicsSettings: m_AlbedoSwatchInfos: [] m_LightsUseLinearIntensity: 0 m_LightsUseColorTemperature: 0 + m_LogWhenShaderIsCompiled: 0 + m_AllowEnlightenSupportForUpgradedProject: 1 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 4badec8..f2b59b1 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 18 + serializedVersion: 20 productGUID: 43d56193844321e4f8d5e222e0810fe6 AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -52,7 +52,6 @@ PlayerSettings: m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 - displayResolutionDialog: 2 iosUseCustomAppBackgroundBehavior: 0 iosAllowHTTPDownload: 1 allowedAutorotateToPortrait: 0 @@ -85,7 +84,6 @@ PlayerSettings: useMacAppStoreValidation: 0 macAppStoreCategory: public.app-category.games gpuSkinning: 1 - graphicsJobs: 0 xboxPIXTextureCapture: 0 xboxEnableAvatar: 0 xboxEnableKinect: 0 @@ -93,7 +91,6 @@ PlayerSettings: xboxEnableFitness: 0 visibleInBackground: 1 allowFullscreenSwitch: 1 - graphicsJobMode: 0 fullscreenMode: 3 xboxSpeechDB: 0 xboxEnableHeadOrientation: 0 @@ -113,6 +110,7 @@ PlayerSettings: switchNVNShaderPoolsGranularity: 33554432 switchNVNDefaultPoolsGranularity: 16777216 switchNVNOtherPoolsGranularity: 16777216 + vulkanNumSwapchainBuffers: 2 vulkanEnableSetSRGBWrite: 0 m_SupportedAspectRatios: 4:3: 1 @@ -151,11 +149,13 @@ PlayerSettings: sharedDepthBuffer: 1 dashSupport: 1 lowOverheadMode: 0 + protectedContext: 0 + v2Signing: 0 enable360StereoCapture: 0 isWsaHolographicRemotingEnabled: 0 - protectGraphicsMemory: 0 enableFrameTimingStats: 0 useHDRDisplay: 0 + D3DHDRBitDepth: 0 m_ColorGamuts: 00000000 targetPixelDensity: 30 resolutionScalingMode: 0 @@ -165,7 +165,7 @@ PlayerSettings: Android: com.Javierfoe.PimPamPum buildNumber: {} AndroidBundleVersionCode: 1 - AndroidMinSdkVersion: 16 + AndroidMinSdkVersion: 19 AndroidTargetSdkVersion: 0 AndroidPreferredInstallLocation: 1 aotOptions: @@ -180,10 +180,10 @@ PlayerSettings: StripUnusedMeshComponents: 1 VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 - iOSTargetOSVersionString: 9.0 + iOSTargetOSVersionString: 10.0 tvOSSdkVersion: 0 tvOSRequireExtendedGameController: 0 - tvOSTargetOSVersionString: 9.0 + tvOSTargetOSVersionString: 10.0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 @@ -273,7 +273,6 @@ PlayerSettings: androidGamepadSupportLevel: 0 AndroidValidateAppBundleSize: 1 AndroidAppBundleSizeToValidate: 150 - resolutionDialogBanner: {fileID: 0} m_BuildTargetIcons: [] m_BuildTargetPlatformIcons: - m_BuildTarget: Android @@ -384,6 +383,38 @@ PlayerSettings: - m_BuildTarget: WebGL m_StaticBatching: 0 m_DynamicBatching: 0 + m_BuildTargetGraphicsJobs: + - m_BuildTarget: MacStandaloneSupport + m_GraphicsJobs: 0 + - m_BuildTarget: Switch + m_GraphicsJobs: 0 + - m_BuildTarget: MetroSupport + m_GraphicsJobs: 0 + - m_BuildTarget: AppleTVSupport + m_GraphicsJobs: 0 + - m_BuildTarget: BJMSupport + m_GraphicsJobs: 0 + - m_BuildTarget: LinuxStandaloneSupport + m_GraphicsJobs: 0 + - m_BuildTarget: PS4Player + m_GraphicsJobs: 0 + - m_BuildTarget: iOSSupport + m_GraphicsJobs: 0 + - m_BuildTarget: WindowsStandaloneSupport + m_GraphicsJobs: 0 + - m_BuildTarget: XboxOnePlayer + m_GraphicsJobs: 0 + - m_BuildTarget: LuminSupport + m_GraphicsJobs: 0 + - m_BuildTarget: AndroidPlayer + m_GraphicsJobs: 0 + - m_BuildTarget: WebGLSupport + m_GraphicsJobs: 0 + m_BuildTargetGraphicsJobMode: + - m_BuildTarget: PS4Player + m_GraphicsJobMode: 0 + - m_BuildTarget: XboxOnePlayer + m_GraphicsJobMode: 0 m_BuildTargetGraphicsAPIs: - m_BuildTarget: AndroidPlayer m_APIs: 0b00000008000000 @@ -642,7 +673,7 @@ PlayerSettings: webGLWasmStreaming: 0 scriptingDefineSymbols: 1: MIRROR;MIRROR_1726_OR_NEWER;MIRROR_3_0_OR_NEWER;MIRROR_3_12_OR_NEWER;MIRROR_4_0_OR_NEWER - 7: MIRROR;MIRROR_1726_OR_NEWER;IGNORANCE;IGNORANCE_1;IGNORANCE_1_2;MIRROR_3_0_OR_NEWER;MIRROR_3_12_OR_NEWER + 7: MIRROR;MIRROR_1726_OR_NEWER;IGNORANCE;IGNORANCE_1;IGNORANCE_1_2;MIRROR_3_0_OR_NEWER;MIRROR_3_12_OR_NEWER;MIRROR_4_0_OR_NEWER platformArchitecture: {} scriptingBackend: {} il2cppCompilerConfiguration: {} @@ -707,7 +738,6 @@ PlayerSettings: XboxOneAllowedProductIds: [] XboxOnePersistentLocalStorageSize: 0 XboxOneXTitleMemory: 8 - xboxOneScriptCompiler: 1 XboxOneOverrideIdentityName: vrEditorSettings: daydream: @@ -726,13 +756,6 @@ PlayerSettings: luminVersion: m_VersionCode: 1 m_VersionName: - facebookSdkVersion: 7.9.4 - facebookAppId: - facebookCookies: 1 - facebookLogging: 1 - facebookStatus: 1 - facebookXfbml: 0 - facebookFrictionlessRequests: 1 apiCompatibilityLevel: 6 cloudProjectId: framebufferDepthMemorylessMode: 0 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 2b1ab8e..33526af 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2019.2.7f2 -m_EditorVersionWithRevision: 2019.2.7f2 (c96f78eb5904) +m_EditorVersion: 2019.3.0b6 +m_EditorVersionWithRevision: 2019.3.0b6 (0612c96692fb)