Conjure/PillowFight
6
0
Fork 0
mirror of https://github.com/ConjureETS/PillowFight.git synced 2026-03-24 00:50:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/conjureets/pillowfight

Browse Source
This commit is contained in:
jparent 2015-08-23 16:10:57 -04:00
commit 34b5b79d17
10 changed files with 70 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Assets/Art/Materials/T_Molly.mat
View File

@ -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}

27
Assets/Art/anims/Materials/T_Kid-pyjama.mat
View File

@ -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}

3
Assets/ControllerMapper.asset
View File

@ -17,6 +17,9 @@ MonoBehaviour:
- name: Jump
XboxButtons: 00000000
KeyboardKeys:
- name: Hit
XboxButtons: 01000000
KeyboardKeys:
- name: Sleep
XboxButtons: 02000000
KeyboardKeys:

1
Assets/Scenes/Gameplay.unity
View File

@ -626,7 +626,6 @@ Camera:
m_OcclusionCulling: 1
m_StereoConvergence: 10
m_StereoSeparation: .0219999999
m_StereoMirrorMode: 0
--- !u!4 &573037243
Transform:
m_ObjectHideFlags: 0

4
Assets/Scripts/Child.cs
View File

@ -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
@ -359,7 +359,7 @@ public class Child : MonoBehaviour
void Die()
{
PlayerWinsMenu menu = (PlayerWinsMenu)MenusHandler.MenusManager.Instance.ShowMenu("PlayerWinsMenu");
menu.SetPlayerIndex(this.Index);
menu.SetPlayerIndex(this.Index == 1 ? 2 : 1);
Destroy(gameObject);
}

2
Assets/Scripts/ChildController.cs
View File

@ -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();
}

22
Assets/Scripts/Menus/SimpleMenu.cs
View File

@ -1,26 +1,22 @@
using UnityEngine;
using UnityEngine;
using System.Collections;
public class SimpleMenu : MonoBehaviour
{
public int NextLevel;
// Use this for initialization
void Start () {
StartCoroutine(AutoSkip());
}
// Update is called once per frame
public int NextLevel;
// Update is called once per frame
void Update () {
if (Input.anyKeyDown) {
Application.LoadLevel(NextLevel);
}
}
}
IEnumerator AutoSkip() {
yield return new WaitForSeconds(5);
Application.LoadLevel(NextLevel);
}
}
}
}

8
ProjectSettings/EditorBuildSettings.asset
View File

@ -4,4 +4,10 @@
EditorBuildSettings:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Scenes: []
m_Scenes:
- enabled: 1
path: Assets/Scenes/Menu/SplashScreen.unity
- enabled: 1
path: Assets/Scenes/Menu/Instructions.unity
- enabled: 1
path: Assets/Scenes/Gameplay.unity

26
ProjectSettings/ProjectSettings.asset
View File

@ -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
@ -132,9 +134,12 @@ PlayerSettings:
banner: {fileID: 0}
androidGamepadSupportLevel: 0
resolutionDialogBanner: {fileID: 0}
m_BuildTargetIcons: []
m_BuildTargetIcons:
- m_BuildTarget:
m_Icons:
- m_Icon: {fileID: 0}
m_Size: 128
m_BuildTargetBatching: []
m_BuildTargetGraphicsAPIs: []
webPlayerTemplate: APPLICATION:Default
m_TemplateCustomTags: {}
actionOnDotNetUnhandledException: 1
@ -196,7 +201,6 @@ PlayerSettings:
ps4ApplicationParam2: 0
ps4ApplicationParam3: 0
ps4ApplicationParam4: 0
ps4GarlicHeapSize: 2048
ps4Passcode: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ
ps4pnSessions: 1
ps4pnPresence: 1
@ -339,7 +343,8 @@ PlayerSettings:
blackberrySquareSplashScreen: {fileID: 0}
tizenProductDescription:
tizenProductURL:
tizenSigningProfileName:
tizenCertificatePath:
tizenCertificatePassword:
tizenGPSPermissions: 0
tizenMicrophonePermissions: 0
stvDeviceAddress:
@ -401,9 +406,4 @@ PlayerSettings:
WebGL::emscriptenArgs:
WebGL::template: APPLICATION:Default
additionalIl2CppArgs::additionalIl2CppArgs:
firstStreamedSceneWithResources: 0
cloudProjectId:
projectId:
projectName:
organizationId:
cloudEnabled: 0
firstStreamedLevelWithResources: 0

2
ProjectSettings/ProjectVersion.txt
View File

@ -1,2 +1,2 @@
m_EditorVersion: 5.1.2f1
m_EditorVersion: 5.0.2f1
m_StandardAssetsVersion: 0