diff --git a/Assets/Art/Materials/T_Molly.mat b/Assets/Art/Materials/T_Molly.mat index 4872a52..e6d23e8 100644 --- a/Assets/Art/Materials/T_Molly.mat +++ b/Assets/Art/Materials/T_Molly.mat @@ -2,16 +2,15 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 5 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_Name: T_Molly m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: - m_LightmapFlags: 5 + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 m_CustomRenderQueue: -1 - stringTagMap: {} m_SavedProperties: serializedVersion: 2 m_TexEnvs: @@ -54,7 +53,7 @@ Material: first: name: _EmissionMap second: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 77150351248a93848a6b94486188b4c5, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} data: @@ -79,6 +78,10 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: + data: + first: + name: _Cutoff + second: .5 data: first: name: _SrcBlend @@ -87,10 +90,6 @@ Material: first: name: _DstBlend second: 0 - data: - first: - name: _Cutoff - second: .5 data: first: name: _Parallax @@ -127,12 +126,20 @@ Material: first: name: _Metallic second: 0 + data: + first: + name: _EmissionScaleUI + second: 1 m_Colors: data: first: name: _EmissionColor - second: {r: 0, g: 0, b: 0, a: 1} + second: {r: 1, g: 1, b: 1, a: 1} data: first: name: _Color second: {r: .588, g: .588, b: .588, a: 1} + data: + first: + name: _EmissionColorUI + second: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/Art/anims/Materials/T_Kid-pyjama.mat b/Assets/Art/anims/Materials/T_Kid-pyjama.mat index 9df8890..a13a010 100644 --- a/Assets/Art/anims/Materials/T_Kid-pyjama.mat +++ b/Assets/Art/anims/Materials/T_Kid-pyjama.mat @@ -2,16 +2,15 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 5 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_Name: T_Kid-pyjama m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: - m_LightmapFlags: 5 + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 m_CustomRenderQueue: -1 - stringTagMap: {} m_SavedProperties: serializedVersion: 2 m_TexEnvs: @@ -54,7 +53,7 @@ Material: first: name: _EmissionMap second: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: b5d49db93cceafd458c3b0b7f61d0d1b, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} data: @@ -79,6 +78,10 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: + data: + first: + name: _Cutoff + second: .5 data: first: name: _SrcBlend @@ -87,10 +90,6 @@ Material: first: name: _DstBlend second: 0 - data: - first: - name: _Cutoff - second: .5 data: first: name: _Parallax @@ -127,12 +126,20 @@ Material: first: name: _Metallic second: 0 + data: + first: + name: _EmissionScaleUI + second: 1 m_Colors: data: first: name: _EmissionColor - second: {r: 0, g: 0, b: 0, a: 1} + second: {r: 1, g: 1, b: 1, a: 1} data: first: name: _Color second: {r: .588, g: .588, b: .588, a: 1} + data: + first: + name: _EmissionColorUI + second: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/ControllerMapper.asset b/Assets/ControllerMapper.asset index 23af3fe..60f68f4 100644 --- a/Assets/ControllerMapper.asset +++ b/Assets/ControllerMapper.asset @@ -17,6 +17,9 @@ MonoBehaviour: - name: Jump XboxButtons: 00000000 KeyboardKeys: + - name: Hit + XboxButtons: 01000000 + KeyboardKeys: - name: Sleep XboxButtons: 02000000 KeyboardKeys: diff --git a/Assets/Scenes/Gameplay.unity b/Assets/Scenes/Gameplay.unity index 66ad268..621df09 100644 --- a/Assets/Scenes/Gameplay.unity +++ b/Assets/Scenes/Gameplay.unity @@ -584,7 +584,6 @@ Camera: m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: .0219999999 - m_StereoMirrorMode: 0 --- !u!4 &573037243 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Child.cs b/Assets/Scripts/Child.cs index 66d14ca..8a60b11 100644 --- a/Assets/Scripts/Child.cs +++ b/Assets/Scripts/Child.cs @@ -169,7 +169,7 @@ public class Child : MonoBehaviour } // picking up a pillow else if (this.pillow == null && incomingPillow.IsPickable) { - Debug.Log("def"); + //Debug.Log("def"); pillow = incomingPillow; pillow.transform.parent = transform; // make the pillow a child of Child diff --git a/Assets/Scripts/ChildController.cs b/Assets/Scripts/ChildController.cs index 66c2792..271f534 100644 --- a/Assets/Scripts/ChildController.cs +++ b/Assets/Scripts/ChildController.cs @@ -97,7 +97,7 @@ public class ChildController : MonoBehaviour if (input.Ranges.ContainsKey("Throw")) _child.Throw(); - if (input.Ranges.ContainsKey("Hit")) + if (input.Actions.Contains("Hit")) _child.Swing(); } diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index fe592b5..502bbc6 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -3,14 +3,17 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 7 + serializedVersion: 6 AndroidProfiler: 0 defaultScreenOrientation: 4 targetDevice: 2 + targetGlesGraphics: -1 + targetIOSGraphics: -1 targetResolution: 0 accelerometerFrequency: 60 companyName: DefaultCompany productName: PillowUnity + cloudProjectId: defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_ShowUnitySplashScreen: 1 @@ -23,6 +26,7 @@ PlayerSettings: m_ActiveColorSpace: 0 m_MTRendering: 1 m_MobileMTRendering: 0 + m_UseDX11: 1 m_Stereoscopic3D: 0 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 @@ -77,7 +81,6 @@ PlayerSettings: metroEnableIndependentInputSource: 0 metroEnableLowLatencyPresentationAPI: 0 xboxOneDisableKinectGpuReservation: 0 - virtualRealitySupported: 0 productGUID: f74b42ae0c00e944a95d85e94fc9366e AndroidBundleVersionCode: 1 AndroidMinSdkVersion: 9 @@ -120,7 +123,6 @@ PlayerSettings: iOSLaunchScreenCustomXibPath: AndroidTargetDevice: 0 AndroidSplashScreenScale: 0 - androidSplashScreen: {fileID: 0} AndroidKeystoreName: AndroidKeyaliasName: AndroidTVCompatibility: 1 @@ -138,7 +140,6 @@ PlayerSettings: - m_Icon: {fileID: 0} m_Size: 128 m_BuildTargetBatching: [] - m_BuildTargetGraphicsAPIs: [] webPlayerTemplate: APPLICATION:Default m_TemplateCustomTags: {} actionOnDotNetUnhandledException: 1 @@ -200,7 +201,6 @@ PlayerSettings: ps4ApplicationParam2: 0 ps4ApplicationParam3: 0 ps4ApplicationParam4: 0 - ps4GarlicHeapSize: 2048 ps4Passcode: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ ps4pnSessions: 1 ps4pnPresence: 1 @@ -343,7 +343,8 @@ PlayerSettings: blackberrySquareSplashScreen: {fileID: 0} tizenProductDescription: tizenProductURL: - tizenSigningProfileName: + tizenCertificatePath: + tizenCertificatePassword: tizenGPSPermissions: 0 tizenMicrophonePermissions: 0 stvDeviceAddress: @@ -405,9 +406,4 @@ PlayerSettings: WebGL::emscriptenArgs: WebGL::template: APPLICATION:Default additionalIl2CppArgs::additionalIl2CppArgs: - firstStreamedSceneWithResources: 0 - cloudProjectId: - projectId: - projectName: - organizationId: - cloudEnabled: 0 + firstStreamedLevelWithResources: 0 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 8c353d8..802c8ce 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 5.1.2f1 +m_EditorVersion: 5.0.2f1 m_StandardAssetsVersion: 0