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

Added the player avatars

Browse Source 
Signed-off-by: RosimInc <rosim_inc@hotmail.com>
This commit is contained in:
RosimInc 2015-08-23 12:20:40 -04:00
parent 15d1776957
commit 27efaae69b
32 changed files with 3573 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Assets/Prefabs/Canvas.prefab Normal file
View File

@ -0,0 +1,13 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &100100000
Prefab:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications: []
m_RemovedComponents: []
m_ParentPrefab: {fileID: 0}
m_RootGameObject: {fileID: 0}
m_IsPrefabParent: 1

8
Assets/Prefabs/Canvas.prefab.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: dec23153e975cb94db47e642092ad58e
timeCreated: 1440346746
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:

3050
Assets/Scenes/LifeCanvasSimon.unity Normal file
View File

File diff suppressed because it is too large Load Diff

8
Assets/Scenes/LifeCanvasSimon.unity.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: d3be4c537e70b60449a5a63731c7d6c9
timeCreated: 1440338414
licenseType: Free
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

33
Assets/Scripts/Child.cs
View File

@ -12,7 +12,8 @@ public class Child : MonoBehaviour
public GameObject GroundCheck;
public Pillow pillow;
public MomBehavior Mom;
public MomBehavior Mom;
public PlayerAvatar Avatar;
private Rigidbody _rb;
private bool _isGrounded = false;
@ -24,7 +25,18 @@ public class Child : MonoBehaviour
public Transform target;
private int _index;
private bool _isPushed = false;
private bool _isPushed = false;
private int _numZ = 0;
public int NumZ
{
get { return _numZ; }
set
{
_numZ = value;
Avatar.NumZ = _numZ;
if (_numZ == 3) Die();
}
}
public int Index
{
@ -41,7 +53,12 @@ public class Child : MonoBehaviour
void Awake()
{
_rb = GetComponent<Rigidbody>();
}
}
void Start()
{
Avatar.PlayerNum = Index + 1;
}
void Update()
{
@ -259,10 +276,16 @@ public class Child : MonoBehaviour
}
private void TakeLavaDamage()
{
{
NumZ += 1;
// TODO: Lose a life (probably) and become immune for ~ 2 or 3 seconds
_invulnerableTime = 0f;
}
}
void Die()
{
Destroy(gameObject);
}
void OnDestroy()
{

5
Assets/Scripts/MomBehavior.cs
View File

@ -120,8 +120,9 @@ public class MomBehavior : MonoBehaviour
{
Debug.Log("Player " + child.Index + " has been spotted by mom.");
// TODO: Visual animation that the player lost (lasso?)
// TODO: Visual animation that the player lost (lasso?)
child.NumZ = 4;
Destroy(child.gameObject);
}
}

71
Assets/Scripts/PlayerAvatar.cs Normal file
View File

@ -0,0 +1,71 @@
using UnityEngine;
using UnityEngine.UI;
using System.Collections;
[RequireComponent(typeof(Image))]
public class PlayerAvatar : MonoBehaviour {
private const int NumSprites = 5;
private Sprite[] _sprites;
private int _playerNum;
private Image _image;
private int _numZ;
public int NumZ
{
get
{
return _numZ;
}
set
{
_numZ = value;
_image.sprite = _sprites[_numZ];
if(_numZ == 3)
StartCoroutine(Die());
}
}
public int PlayerNum
{
set
{
_playerNum = value; //child.Index + 1;
//0 - 3 - Number of Z
// 4 - Dead
_sprites = new Sprite[NumSprites];
for (int i = 0; i < NumSprites; i++)
{
_sprites[i] = Resources.Load<Sprite>("UI_P" + _playerNum + "_" + i);
}
gameObject.SetActive(true);
NumZ = _numZ;
}
}
private int curr;
private float time = 1f;
// Use this for initialization
void Awake ()
{
_image = GetComponent<Image>();
_numZ = 0;
}
// Update is called once per frame
void Update ()
{
}
IEnumerator Die()
{
yield return new WaitForSeconds(1.2f);
NumZ = 4;
}
}

12
Assets/Scripts/PlayerAvatar.cs.meta Normal file
View File

@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: 278f19d622fc5894ba64fdd068822284
timeCreated: 1440338837
licenseType: Free
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

9
Assets/UI/Resources.meta Normal file
View File

@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: 7b0e8f99ac896364c8e096b14fac788b
folderAsset: yes
timeCreated: 1440338566
licenseType: Free
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/UI/Resources/UI_P1_0.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

16
Assets/UI/UI_P2_1Z.png.meta → Assets/UI/Resources/UI_P1_0.png.meta
View File

@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: be26e8d14bec3b84d98ed4529b184923
timeCreated: 1440311909
guid: 32ef2fd25049b984cab324df2bdf0832
timeCreated: 1440339593
licenseType: Free
TextureImporter:
fileIDToRecycleName: {}
@ -30,22 +30,22 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: -1
aniso: 16
mipBias: -1
wrapMode: -1
nPOTScale: 1
wrapMode: 1
nPOTScale: 0
lightmap: 0
rGBM: 0
compressionQuality: 50
spriteMode: 0
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: .5, y: .5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaIsTransparency: 0
textureType: -1
alphaIsTransparency: 1
textureType: 8
buildTargetSettings: []
spriteSheet:
sprites: []

BIN
Assets/UI/Resources/UI_P1_1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

16
Assets/UI/UI_P2_2Z.png.meta → Assets/UI/Resources/UI_P1_1.png.meta
View File

@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: fc00908bd49720045a634752e2064338
timeCreated: 1440311912
guid: ba14b0d50e47f3941b43e1782b075d2d
timeCreated: 1440339594
licenseType: Free
TextureImporter:
fileIDToRecycleName: {}
@ -30,22 +30,22 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: -1
aniso: 16
mipBias: -1
wrapMode: -1
nPOTScale: 1
wrapMode: 1
nPOTScale: 0
lightmap: 0
rGBM: 0
compressionQuality: 50
spriteMode: 0
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: .5, y: .5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaIsTransparency: 0
textureType: -1
alphaIsTransparency: 1
textureType: 8
buildTargetSettings: []
spriteSheet:
sprites: []

BIN
Assets/UI/Resources/UI_P1_2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

16
Assets/UI/UI_P2_3Z.png.meta → Assets/UI/Resources/UI_P1_2.png.meta
View File

@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 9cb56e1b9e0bf974b93d6132c10ac17e
timeCreated: 1440311906
guid: ecc2a9e7b56c53b44a888710237b8ac3
timeCreated: 1440339594
licenseType: Free
TextureImporter:
fileIDToRecycleName: {}
@ -30,22 +30,22 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: -1
aniso: 16
mipBias: -1
wrapMode: -1
nPOTScale: 1
wrapMode: 1
nPOTScale: 0
lightmap: 0
rGBM: 0
compressionQuality: 50
spriteMode: 0
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: .5, y: .5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaIsTransparency: 0
textureType: -1
alphaIsTransparency: 1
textureType: 8
buildTargetSettings: []
spriteSheet:
sprites: []

BIN
Assets/UI/Resources/UI_P1_3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

16
Assets/UI/UI_P2_Dead.png.meta → Assets/UI/Resources/UI_P1_3.png.meta
View File

@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: d09536caab3bd214cae76208257fecff
timeCreated: 1440311910
guid: 7dd28e3b5e915cc4b9b2e7091d5296d0
timeCreated: 1440339594
licenseType: Free
TextureImporter:
fileIDToRecycleName: {}
@ -30,22 +30,22 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: -1
aniso: 16
mipBias: -1
wrapMode: -1
nPOTScale: 1
wrapMode: 1
nPOTScale: 0
lightmap: 0
rGBM: 0
compressionQuality: 50
spriteMode: 0
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: .5, y: .5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaIsTransparency: 0
textureType: -1
alphaIsTransparency: 1
textureType: 8
buildTargetSettings: []
spriteSheet:
sprites: []

BIN
Assets/UI/Resources/UI_P1_4.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

55
Assets/UI/Resources/UI_P1_4.png.meta Normal file
View File

@ -0,0 +1,55 @@
fileFormatVersion: 2
guid: 49a7f4622090bdb45a4fbc886fdfb916
timeCreated: 1440339593
licenseType: Free
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 2
mipmaps:
mipMapMode: 0
enableMipMap: 1
linearTexture: 0
correctGamma: 0
fadeOut: 0
borderMipMap: 0
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: .25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 0
cubemapConvolution: 0
cubemapConvolutionSteps: 8
cubemapConvolutionExponent: 1.5
seamlessCubemap: 0
textureFormat: -1
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: 16
mipBias: -1
wrapMode: 1
nPOTScale: 0
lightmap: 0
rGBM: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: .5, y: .5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaIsTransparency: 1
textureType: 8
buildTargetSettings: []
spriteSheet:
sprites: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:

0
Assets/UI/UI_P2_noZ.png → Assets/UI/Resources/UI_P2_0.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

55
Assets/UI/Resources/UI_P2_0.png.meta Normal file
View File

@ -0,0 +1,55 @@
fileFormatVersion: 2
guid: e06a41f1643dbac4595002871a5e5d53
timeCreated: 1440338588
licenseType: Free
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 2
mipmaps:
mipMapMode: 0
enableMipMap: 1
linearTexture: 0
correctGamma: 0
fadeOut: 0
borderMipMap: 0
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: .25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 0
cubemapConvolution: 0
cubemapConvolutionSteps: 8
cubemapConvolutionExponent: 1.5
seamlessCubemap: 0
textureFormat: -1
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: 16
mipBias: -1
wrapMode: 1
nPOTScale: 0
lightmap: 0
rGBM: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: .5, y: .5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaIsTransparency: 1
textureType: 8
buildTargetSettings: []
spriteSheet:
sprites: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:

0
Assets/UI/UI_P2_1Z.png → Assets/UI/Resources/UI_P2_1.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

55
Assets/UI/Resources/UI_P2_1.png.meta Normal file
View File

@ -0,0 +1,55 @@
fileFormatVersion: 2
guid: 10404f9b22fe2a148ad883d271da76e0
timeCreated: 1440338587
licenseType: Free
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 2
mipmaps:
mipMapMode: 0
enableMipMap: 1
linearTexture: 0
correctGamma: 0
fadeOut: 0
borderMipMap: 0
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: .25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 0
cubemapConvolution: 0
cubemapConvolutionSteps: 8
cubemapConvolutionExponent: 1.5
seamlessCubemap: 0
textureFormat: -1
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: 16
mipBias: -1
wrapMode: 1
nPOTScale: 0
lightmap: 0
rGBM: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: .5, y: .5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaIsTransparency: 1
textureType: 8
buildTargetSettings: []
spriteSheet:
sprites: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:

0
Assets/UI/UI_P2_2Z.png → Assets/UI/Resources/UI_P2_2.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

55
Assets/UI/Resources/UI_P2_2.png.meta Normal file
View File

@ -0,0 +1,55 @@
fileFormatVersion: 2
guid: 6fb3add0bf5619c4b95933df09116277
timeCreated: 1440338588
licenseType: Free
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 2
mipmaps:
mipMapMode: 0
enableMipMap: 1
linearTexture: 0
correctGamma: 0
fadeOut: 0
borderMipMap: 0
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: .25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 0
cubemapConvolution: 0
cubemapConvolutionSteps: 8
cubemapConvolutionExponent: 1.5
seamlessCubemap: 0
textureFormat: -1
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: 16
mipBias: -1
wrapMode: 1
nPOTScale: 0
lightmap: 0
rGBM: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: .5, y: .5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaIsTransparency: 1
textureType: 8
buildTargetSettings: []
spriteSheet:
sprites: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:

0
Assets/UI/UI_P2_3Z.png → Assets/UI/Resources/UI_P2_3.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

55
Assets/UI/Resources/UI_P2_3.png.meta Normal file
View File

@ -0,0 +1,55 @@
fileFormatVersion: 2
guid: 86c7586eab4e5954f8bafeb018fd1ed0
timeCreated: 1440338588
licenseType: Free
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 2
mipmaps:
mipMapMode: 0
enableMipMap: 1
linearTexture: 0
correctGamma: 0
fadeOut: 0
borderMipMap: 0
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: .25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 0
cubemapConvolution: 0
cubemapConvolutionSteps: 8
cubemapConvolutionExponent: 1.5
seamlessCubemap: 0
textureFormat: -1
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: 16
mipBias: -1
wrapMode: 1
nPOTScale: 0
lightmap: 0
rGBM: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: .5, y: .5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaIsTransparency: 1
textureType: 8
buildTargetSettings: []
spriteSheet:
sprites: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:

0
Assets/UI/UI_P2_Dead.png → Assets/UI/Resources/UI_P2_4.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

55
Assets/UI/Resources/UI_P2_4.png.meta Normal file
View File

@ -0,0 +1,55 @@
fileFormatVersion: 2
guid: 2ce2dd05085d5f346bf7978c08cf9c2a
timeCreated: 1440338588
licenseType: Free
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 2
mipmaps:
mipMapMode: 0
enableMipMap: 1
linearTexture: 0
correctGamma: 0
fadeOut: 0
borderMipMap: 0
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: .25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 0
cubemapConvolution: 0
cubemapConvolutionSteps: 8
cubemapConvolutionExponent: 1.5
seamlessCubemap: 0
textureFormat: -1
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: 16
mipBias: -1
wrapMode: 1
nPOTScale: 0
lightmap: 0
rGBM: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: .5, y: .5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaIsTransparency: 1
textureType: 8
buildTargetSettings: []
spriteSheet:
sprites: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:

55
Assets/UI/UI_P2_noZ.png.meta
View File

@ -1,55 +0,0 @@
fileFormatVersion: 2
guid: f11bad74d0dac4046a4957fd043e5a6a
timeCreated: 1440311911
licenseType: Free
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 2
mipmaps:
mipMapMode: 0
enableMipMap: 1
linearTexture: 0
correctGamma: 0
fadeOut: 0
borderMipMap: 0
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: .25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 0
cubemapConvolution: 0
cubemapConvolutionSteps: 8
cubemapConvolutionExponent: 1.5
seamlessCubemap: 0
textureFormat: -1
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: -1
mipBias: -1
wrapMode: -1
nPOTScale: 1
lightmap: 0
rGBM: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: .5, y: .5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaIsTransparency: 0
textureType: -1
buildTargetSettings: []
spriteSheet:
sprites: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:

20
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
@ -134,7 +136,6 @@ PlayerSettings:
resolutionDialogBanner: {fileID: 0}
m_BuildTargetIcons: []
m_BuildTargetBatching: []
m_BuildTargetGraphicsAPIs: []
webPlayerTemplate: APPLICATION:Default
m_TemplateCustomTags: {}
actionOnDotNetUnhandledException: 1
@ -196,7 +197,6 @@ PlayerSettings:
ps4ApplicationParam2: 0
ps4ApplicationParam3: 0
ps4ApplicationParam4: 0
ps4GarlicHeapSize: 2048
ps4Passcode: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ
ps4pnSessions: 1
ps4pnPresence: 1
@ -339,7 +339,8 @@ PlayerSettings:
blackberrySquareSplashScreen: {fileID: 0}
tizenProductDescription:
tizenProductURL:
tizenSigningProfileName:
tizenCertificatePath:
tizenCertificatePassword:
tizenGPSPermissions: 0
tizenMicrophonePermissions: 0
stvDeviceAddress:
@ -401,9 +402,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