Merge branch 'master' into menu
This commit is contained in:
Randall
commit
2919692ed4
9 changed files with 254 additions and 42 deletions
|
|
@ -81,6 +81,23 @@ GameObject:
|
|||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!1 &1725052834674304
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 1
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
serializedVersion: 5
|
||||
m_Component:
|
||||
- component: {fileID: 224266893877336972}
|
||||
- component: {fileID: 222672593524269768}
|
||||
- component: {fileID: 114533626747003854}
|
||||
m_Layer: 0
|
||||
m_Name: Overlay
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!1 &1889434021946074
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -198,6 +215,7 @@ Camera:
|
|||
m_OcclusionCulling: 1
|
||||
m_StereoConvergence: 10
|
||||
m_StereoSeparation: 0.022
|
||||
m_StereoMirrorMode: 0
|
||||
--- !u!20 &20960955616270498
|
||||
Camera:
|
||||
m_ObjectHideFlags: 1
|
||||
|
|
@ -233,6 +251,7 @@ Camera:
|
|||
m_OcclusionCulling: 1
|
||||
m_StereoConvergence: 10
|
||||
m_StereoSeparation: 0.022
|
||||
m_StereoMirrorMode: 0
|
||||
--- !u!23 &23118308228354854
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 1
|
||||
|
|
@ -242,7 +261,6 @@ MeshRenderer:
|
|||
m_Enabled: 1
|
||||
m_CastShadows: 1
|
||||
m_ReceiveShadows: 1
|
||||
m_DynamicOccludee: 1
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
|
|
@ -258,7 +276,6 @@ MeshRenderer:
|
|||
m_PreserveUVs: 1
|
||||
m_IgnoreNormalsForChartDetection: 0
|
||||
m_ImportantGI: 0
|
||||
m_StitchLightmapSeams: 0
|
||||
m_SelectedEditorRenderState: 3
|
||||
m_MinimumChartSize: 4
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
|
|
@ -416,6 +433,33 @@ MonoBehaviour:
|
|||
instantiationId: -1
|
||||
currentMasterID: -1
|
||||
isRuntimeInstantiated: 0
|
||||
--- !u!114 &114533626747003854
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 1
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
m_GameObject: {fileID: 1725052834674304}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 2100000, guid: a3c9ba309d7999b489463b2ebe102c8b, type: 2}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: f35113489423bfa4d8cec8c6e055d9cc, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
--- !u!114 &114616545285086590
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 1
|
||||
|
|
@ -532,6 +576,12 @@ CanvasRenderer:
|
|||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
m_GameObject: {fileID: 1706951542144962}
|
||||
--- !u!222 &222672593524269768
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 1
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
m_GameObject: {fileID: 1725052834674304}
|
||||
--- !u!223 &223842615197851596
|
||||
Canvas:
|
||||
m_ObjectHideFlags: 1
|
||||
|
|
@ -559,16 +609,34 @@ RectTransform:
|
|||
m_PrefabInternal: {fileID: 100100000}
|
||||
m_GameObject: {fileID: 1706951542144962}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: -513.4081, y: 217.19734, z: 0}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 224828917623348380}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -513.4081, y: 217.19734}
|
||||
m_SizeDelta: {x: 160, y: 30}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!224 &224266893877336972
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 1
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
m_GameObject: {fileID: 1725052834674304}
|
||||
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_Children: []
|
||||
m_Father: {fileID: 224424466063770242}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -0.15002441, y: -0.55003357}
|
||||
m_SizeDelta: {x: 0.6999512, y: 0.099975586}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!224 &224424466063770242
|
||||
RectTransform:
|
||||
|
|
@ -577,18 +645,19 @@ RectTransform:
|
|||
m_PrefabInternal: {fileID: 100100000}
|
||||
m_GameObject: {fileID: 1002941015032580}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 9}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 0, y: 0, z: 0}
|
||||
m_Children:
|
||||
- {fileID: 224266893877336972}
|
||||
- {fileID: 224828917623348380}
|
||||
m_Father: {fileID: 4661043116803332}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0, y: 0}
|
||||
--- !u!224 &224828917623348380
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 1
|
||||
|
|
@ -596,12 +665,12 @@ RectTransform:
|
|||
m_PrefabInternal: {fileID: 100100000}
|
||||
m_GameObject: {fileID: 1207964487639616}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: -15.300003, y: -16.099998, z: 0}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 224003334026830312}
|
||||
m_Father: {fileID: 224424466063770242}
|
||||
m_RootOrder: 0
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
|
|
|
|||
|
|
@ -77,17 +77,15 @@ LightmapSettings:
|
|||
m_PVRDirectSampleCount: 32
|
||||
m_PVRSampleCount: 500
|
||||
m_PVRBounces: 2
|
||||
m_PVRFilterTypeDirect: 0
|
||||
m_PVRFilterTypeIndirect: 0
|
||||
m_PVRFilterTypeAO: 0
|
||||
m_PVRFiltering: 0
|
||||
m_PVRFilteringMode: 1
|
||||
m_PVRCulling: 1
|
||||
m_PVRFilteringGaussRadiusDirect: 1
|
||||
m_PVRFilteringGaussRadiusIndirect: 5
|
||||
m_PVRFilteringGaussRadiusAO: 2
|
||||
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
|
||||
m_PVRFilteringAtrousPositionSigmaIndirect: 2
|
||||
m_PVRFilteringAtrousPositionSigmaAO: 1
|
||||
m_PVRFilteringAtrousColorSigma: 1
|
||||
m_PVRFilteringAtrousNormalSigma: 1
|
||||
m_PVRFilteringAtrousPositionSigma: 1
|
||||
m_LightingDataAsset: {fileID: 0}
|
||||
m_UseShadowmask: 1
|
||||
--- !u!196 &4
|
||||
|
|
@ -1085,17 +1083,17 @@ Prefab:
|
|||
- target: {fileID: 224424466063770242, guid: c67fa24334c0f364cad8798522e92116,
|
||||
type: 2}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 5.8550987
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 224828917623348380, guid: c67fa24334c0f364cad8798522e92116,
|
||||
type: 2}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 462.7
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 224828917623348380, guid: c67fa24334c0f364cad8798522e92116,
|
||||
type: 2}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -236.6
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4661043116803332, guid: c67fa24334c0f364cad8798522e92116, type: 2}
|
||||
propertyPath: m_LocalScale.x
|
||||
|
|
@ -2632,7 +2630,7 @@ MonoBehaviour:
|
|||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 86499a4a05368424fa17fc7f098d46a9, type: 3}
|
||||
m_FontSize: 16
|
||||
m_FontSize: 18
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 1
|
||||
|
|
@ -4142,17 +4140,17 @@ Prefab:
|
|||
- target: {fileID: 224424466063770242, guid: c67fa24334c0f364cad8798522e92116,
|
||||
type: 2}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 1.412919
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 224828917623348380, guid: c67fa24334c0f364cad8798522e92116,
|
||||
type: 2}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 462.7
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 224828917623348380, guid: c67fa24334c0f364cad8798522e92116,
|
||||
type: 2}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -236.6
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4661043116803332, guid: c67fa24334c0f364cad8798522e92116, type: 2}
|
||||
propertyPath: m_LocalScale.y
|
||||
|
|
@ -4755,8 +4753,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0}
|
||||
m_AnchorMax: {x: 0.5, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 121}
|
||||
m_SizeDelta: {x: 700, y: 5}
|
||||
m_AnchoredPosition: {x: 0, y: 140}
|
||||
m_SizeDelta: {x: 750, y: 5}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1213473210
|
||||
MonoBehaviour:
|
||||
|
|
@ -4783,10 +4781,10 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Padding:
|
||||
m_Left: 5
|
||||
m_Right: 5
|
||||
m_Top: 5
|
||||
m_Bottom: 5
|
||||
m_Left: 10
|
||||
m_Right: 10
|
||||
m_Top: 10
|
||||
m_Bottom: 10
|
||||
m_ChildAlignment: 0
|
||||
m_Spacing: 0
|
||||
m_ChildForceExpandWidth: 1
|
||||
|
|
@ -4805,7 +4803,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 0.392}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 0.566}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
|
|
@ -5621,17 +5619,17 @@ Prefab:
|
|||
- target: {fileID: 224424466063770242, guid: c67fa24334c0f364cad8798522e92116,
|
||||
type: 2}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 5.723283
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 224828917623348380, guid: c67fa24334c0f364cad8798522e92116,
|
||||
type: 2}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 462.7
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 224828917623348380, guid: c67fa24334c0f364cad8798522e92116,
|
||||
type: 2}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -236.6
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4661043116803332, guid: c67fa24334c0f364cad8798522e92116, type: 2}
|
||||
propertyPath: m_LocalScale.x
|
||||
|
|
|
|||
|
|
@ -264,8 +264,9 @@ GameObject:
|
|||
- component: {fileID: 854366558}
|
||||
- component: {fileID: 854366560}
|
||||
- component: {fileID: 854366559}
|
||||
- component: {fileID: 854366561}
|
||||
m_Layer: 5
|
||||
m_Name: Image (1)
|
||||
m_Name: SplashText
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
|
|
@ -322,6 +323,17 @@ CanvasRenderer:
|
|||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 854366557}
|
||||
--- !u!114 &854366561
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 854366557}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 96b46a3ec497e3640a9ecf1b5067a5a2, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &1108133782
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -404,7 +416,7 @@ RectTransform:
|
|||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 1108133782}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 485, y: 267.5, z: 0}
|
||||
m_LocalPosition: {x: 512, y: 384, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 1531749743}
|
||||
|
|
@ -493,7 +505,7 @@ GameObject:
|
|||
- component: {fileID: 1531749745}
|
||||
- component: {fileID: 1531749744}
|
||||
m_Layer: 5
|
||||
m_Name: Image
|
||||
m_Name: SplashBackground
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ public class LobbyManager : Photon.PunBehaviour {
|
|||
|
||||
public override void OnLeftRoom()
|
||||
{
|
||||
SceneManager.LoadScene(0);
|
||||
SceneManager.LoadScene("MainMenu");
|
||||
}
|
||||
|
||||
public void LeaveRoom()
|
||||
|
|
|
|||
35
Project Undercover/Assets/Scripts/UI/SplashController.cs
Normal file
35
Project Undercover/Assets/Scripts/UI/SplashController.cs
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine.UI;
|
||||
using UnityEngine;
|
||||
using UnityEngine.SceneManagement;
|
||||
|
||||
public class SplashController : MonoBehaviour {
|
||||
private Image splashText;
|
||||
private float timer;
|
||||
|
||||
void Start () {
|
||||
splashText = GetComponent<Image> ();
|
||||
Color tempcolor = Color.white;
|
||||
tempcolor.a = 0;
|
||||
splashText.color = tempcolor;
|
||||
timer = 4;
|
||||
}
|
||||
|
||||
void Update () {
|
||||
Color setalpha = Color.white;
|
||||
timer -= Time.deltaTime;
|
||||
|
||||
if(timer >= 2.5 && timer < 3.5) {
|
||||
setalpha.a = 1 - (timer - 2.5f);
|
||||
splashText.color = setalpha;
|
||||
}
|
||||
if(timer >= 0.5 && timer < 1.5) {
|
||||
setalpha.a = (timer - 0.5f);
|
||||
splashText.color = setalpha;
|
||||
}
|
||||
if(timer <= 0) {
|
||||
SceneManager.LoadScene ("MainMenu");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 96b46a3ec497e3640a9ecf1b5067a5a2
|
||||
timeCreated: 1512026200
|
||||
licenseType: Free
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
BIN
Project Undercover/Assets/Sprites/Guard Camera Overlay.png
Executable file
BIN
Project Undercover/Assets/Sprites/Guard Camera Overlay.png
Executable file
Binary file not shown.
|
After Width: | Height: | Size: 58 KiB |
82
Project Undercover/Assets/Sprites/Guard Camera Overlay.png.meta
Executable file
82
Project Undercover/Assets/Sprites/Guard Camera Overlay.png.meta
Executable file
|
|
@ -0,0 +1,82 @@
|
|||
fileFormatVersion: 2
|
||||
guid: f35113489423bfa4d8cec8c6e055d9cc
|
||||
timeCreated: 1512062076
|
||||
licenseType: Free
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
serializedVersion: 4
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
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
|
||||
isReadable: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: -1
|
||||
aniso: -1
|
||||
mipBias: -1
|
||||
wrapU: 1
|
||||
wrapV: -1
|
||||
wrapW: -1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spritePixelsToUnits: 100
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
platformSettings:
|
||||
- buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
- buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
spritePackingTag:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -5,6 +5,9 @@ EditorBuildSettings:
|
|||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Scenes:
|
||||
- enabled: 1
|
||||
path: Assets/Scenes/Splash.unity
|
||||
guid: 80c13d19a818169428f9806c4f7e942f
|
||||
- enabled: 1
|
||||
path: Assets/Scenes/MainMenu.unity
|
||||
guid: 90e4e81f379e2bb46b670a647ffe0200
|
||||
|
|
|
|||
Reference in a new issue