even newer level.. (TEST)

2017-10-23 23:36:30 -05:00 · 2017-10-23 23:36:30 -05:00 · 8a25f18aeb
commit 8a25f18aeb
parent f53e6e309b
35 changed files with 5576 additions and 333 deletions
--- a/Undercover/Assets/Materials/Blue
+++ b/Undercover/Assets/Materials/Blue
@ -0,0 +1,76 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Blue Light
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: _EMISSION _GLOSSYREFLECTIONS_OFF _SPECULARHIGHLIGHTS_OFF
+  m_LightmapFlags: 1
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0
+    - _GlossyReflections: 0
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 0
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 0, g: 0.08965492, b: 1, a: 1}
+    - _EmissionColor: {r: 0.07586241, g: 0, b: 1, a: 1}
--- a/Undercover/Assets/Materials/Blue
+++ b/Undercover/Assets/Materials/Blue
@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 29f344e09585ccc469cbf9feefdd5c43
+timeCreated: 1508811711
+licenseType: Free
+NativeFormatImporter:
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Undercover/Assets/Materials/Glass.mat
+++ b/Undercover/Assets/Materials/Glass.mat
@ -0,0 +1,77 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Glass
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: _ALPHAPREMULTIPLY_ON
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 3000
+  stringTagMap:
+    RenderType: Transparent
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 10
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0.22
+    - _Mode: 3
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 0
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 0.1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
--- a/Undercover/Assets/Materials/Glass.mat.meta
+++ b/Undercover/Assets/Materials/Glass.mat.meta
@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 27884a5e9fbe37240a5e016a3d2d5bde
+timeCreated: 1508810714
+licenseType: Free
+NativeFormatImporter:
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Undercover/Assets/Models/block.fbx
+++ b/Undercover/Assets/Models/block.fbx
--- a/Undercover/Assets/Models/block.fbx.meta
+++ b/Undercover/Assets/Models/block.fbx.meta
@ -1,95 +0,0 @@
-fileFormatVersion: 2
-guid: 26c8b13ef4b43a743aa02ed3be51469d
-timeCreated: 1508784269
-licenseType: Free
-ModelImporter:
-  serializedVersion: 21
-  fileIDToRecycleName:
-    100000: //RootNode
-    100002: Camera
-    100004: Cube
-    100006: Lamp
-    400000: //RootNode
-    400002: Camera
-    400004: Cube
-    400006: Lamp
-    2000000: Camera
-    2300000: Cube
-    3300000: Cube
-    4300000: Cube
-    10800000: Lamp
-  materials:
-    importMaterials: 1
-    materialName: 0
-    materialSearch: 1
-  animations:
-    legacyGenerateAnimations: 4
-    bakeSimulation: 0
-    resampleCurves: 1
-    optimizeGameObjects: 0
-    motionNodeName: 
-    rigImportErrors: 
-    rigImportWarnings: 
-    animationImportErrors: 
-    animationImportWarnings: 
-    animationRetargetingWarnings: 
-    animationDoRetargetingWarnings: 0
-    animationCompression: 1
-    animationRotationError: 0.5
-    animationPositionError: 0.5
-    animationScaleError: 0.5
-    animationWrapMode: 0
-    extraExposedTransformPaths: []
-    extraUserProperties: []
-    clipAnimations: []
-    isReadable: 1
-  meshes:
-    lODScreenPercentages: []
-    globalScale: 1
-    meshCompression: 0
-    addColliders: 0
-    importVisibility: 1
-    importBlendShapes: 1
-    importCameras: 1
-    importLights: 1
-    swapUVChannels: 0
-    generateSecondaryUV: 0
-    useFileUnits: 1
-    optimizeMeshForGPU: 1
-    keepQuads: 0
-    weldVertices: 1
-    secondaryUVAngleDistortion: 8
-    secondaryUVAreaDistortion: 15.000001
-    secondaryUVHardAngle: 88
-    secondaryUVPackMargin: 4
-    useFileScale: 1
-  tangentSpace:
-    normalSmoothAngle: 60
-    normalImportMode: 0
-    tangentImportMode: 3
-    normalCalculationMode: 4
-  importAnimation: 1
-  copyAvatar: 0
-  humanDescription:
-    serializedVersion: 2
-    human: []
-    skeleton: []
-    armTwist: 0.5
-    foreArmTwist: 0.5
-    upperLegTwist: 0.5
-    legTwist: 0.5
-    armStretch: 0.05
-    legStretch: 0.05
-    feetSpacing: 0
-    rootMotionBoneName: 
-    rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1}
-    hasTranslationDoF: 0
-    hasExtraRoot: 0
-    skeletonHasParents: 1
-  lastHumanDescriptionAvatarSource: {instanceID: 0}
-  animationType: 0
-  humanoidOversampling: 1
-  additionalBone: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Undercover/Assets/Scenes/New
+++ b/Undercover/Assets/Scenes/New
--- a/Undercover/Assets/Scenes/New
+++ b/Undercover/Assets/Scenes/New
--- a/Level/LightingData.asset.meta
+++ b/Level/LightingData.asset.meta
@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: a11d735b39938e34aa047a8940e3bf25
-timeCreated: 1508782721
+timeCreated: 1508809072
 licenseType: Free
 NativeFormatImporter:
  mainObjectFileID: 25800000
--- a/Level/Lightmap-0_comp_dir.png
+++ b/Level/Lightmap-0_comp_dir.png
--- a/Level/Lightmap-0_comp_dir.png.meta
+++ b/Level/Lightmap-0_comp_dir.png.meta
@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 70befdd0462604a4f8b7ea74037964f6
-timeCreated: 1508782720
+timeCreated: 1508809071
 licenseType: Free
 TextureImporter:
  fileIDToRecycleName: {}
--- a/Level/Lightmap-0_comp_light.exr
+++ b/Level/Lightmap-0_comp_light.exr
--- a/Level/Lightmap-0_comp_light.exr.meta
+++ b/Level/Lightmap-0_comp_light.exr.meta
@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 563ff2b2ced45194580352c4e42474ac
-timeCreated: 1508782719
+timeCreated: 1508809071
 licenseType: Free
 TextureImporter:
  fileIDToRecycleName: {}
--- a/Level/Lightmap-1_comp_dir.png
+++ b/Level/Lightmap-1_comp_dir.png
--- a/Level/Lightmap-1_comp_dir.png.meta
+++ b/Level/Lightmap-1_comp_dir.png.meta
@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 95596559c3fb46a4ea02f2559264bc87
-timeCreated: 1508782720
+timeCreated: 1508809071
 licenseType: Free
 TextureImporter:
  fileIDToRecycleName: {}
--- a/Level/Lightmap-1_comp_light.exr
+++ b/Level/Lightmap-1_comp_light.exr
--- a/Level/Lightmap-1_comp_light.exr.meta
+++ b/Level/Lightmap-1_comp_light.exr.meta
@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 36b113629ed924940823112ff81195a3
-timeCreated: 1508782719
+timeCreated: 1508809070
 licenseType: Free
 TextureImporter:
  fileIDToRecycleName: {}
--- a/Level/Lightmap-2_comp_dir.png
+++ b/Level/Lightmap-2_comp_dir.png
--- a/Level/Lightmap-2_comp_dir.png.meta
+++ b/Level/Lightmap-2_comp_dir.png.meta
@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: e612c6262b7c64f47a9e6942b37f2865
-timeCreated: 1508782721
+timeCreated: 1508809071
 licenseType: Free
 TextureImporter:
  fileIDToRecycleName: {}
--- a/Level/Lightmap-2_comp_light.exr
+++ b/Level/Lightmap-2_comp_light.exr
--- a/Level/Lightmap-2_comp_light.exr.meta
+++ b/Level/Lightmap-2_comp_light.exr.meta
@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: eb75be656fce6324292c543838467d12
-timeCreated: 1508782721
+timeCreated: 1508809071
 licenseType: Free
 TextureImporter:
  fileIDToRecycleName: {}
--- a/Level/Lightmap-3_comp_dir.png
+++ b/Level/Lightmap-3_comp_dir.png
--- a/Level/Lightmap-3_comp_dir.png.meta
+++ b/Level/Lightmap-3_comp_dir.png.meta
@ -1,74 +0,0 @@
-fileFormatVersion: 2
-guid: b1961684867b4614f91349f95dce651c
-timeCreated: 1508782720
-licenseType: Free
-TextureImporter:
-  fileIDToRecycleName: {}
-  serializedVersion: 4
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 1
-    sRGBTexture: 0
-    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: 3
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 1
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 0
-  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: 0
-  spriteTessellationDetail: -1
-  textureType: 0
-  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
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-  spritePackingTag: 
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Level/Lightmap-3_comp_light.exr
+++ b/Level/Lightmap-3_comp_light.exr
--- a/Level/Lightmap-3_comp_light.exr.meta
+++ b/Level/Lightmap-3_comp_light.exr.meta
@ -1,74 +0,0 @@
-fileFormatVersion: 2
-guid: b1fe1d2f6b159ed46b74841e4653616f
-timeCreated: 1508782721
-licenseType: Free
-TextureImporter:
-  fileIDToRecycleName: {}
-  serializedVersion: 4
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 1
-    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: 3
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 1
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 0
-  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: 0
-  alphaIsTransparency: 0
-  spriteTessellationDetail: -1
-  textureType: 6
-  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
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-  spritePackingTag: 
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Undercover/Assets/Scenes/New
+++ b/Undercover/Assets/Scenes/New
--- a/Undercover/Assets/Scenes/New
+++ b/Undercover/Assets/Scenes/New
@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 19087f0ef2eea6b438a6aa5a74fca60b
-timeCreated: 1508788745
+timeCreated: 1508807426
 licenseType: Free
 NativeFormatImporter:
  mainObjectFileID: 23800000
--- a/Undercover/Assets/Scenes/TEST.meta
+++ b/Undercover/Assets/Scenes/TEST.meta
@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 96955048fc9f7a54b87bce119b7b569e
+folderAsset: yes
+timeCreated: 1508810112
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Undercover/Assets/Scenes/TEST.unity
+++ b/Undercover/Assets/Scenes/TEST.unity
--- a/Undercover/Assets/Scenes/TEST.unity.meta
+++ b/Undercover/Assets/Scenes/TEST.unity.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c9dc36444a5e1c64bb9a06e825c23fc5
+timeCreated: 1508809132
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Undercover/Assets/Scenes/TEST/NavMesh.asset
+++ b/Undercover/Assets/Scenes/TEST/NavMesh.asset
--- a/Undercover/Assets/Scenes/TEST/NavMesh.asset.meta
+++ b/Undercover/Assets/Scenes/TEST/NavMesh.asset.meta
@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 14079ed931b555c4abfc3a6895d12632
+timeCreated: 1508811259
+licenseType: Free
+NativeFormatImporter:
+  mainObjectFileID: 23800000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Undercover/Assets/Scripts/Lobby/LobbyManager.cs
+++ b/Undercover/Assets/Scripts/Lobby/LobbyManager.cs
@ -38,7 +38,7 @@ public class LobbyManager : Photon.PunBehaviour {
    public void StartGame()
    {
        if (PhotonNetwork.isMasterClient)
-            PhotonNetwork.LoadLevel("New Level");
+            PhotonNetwork.LoadLevel("TEST");
    }

    public override void OnPhotonPlayerConnected(PhotonPlayer other)
--- a/Undercover/ProjectSettings/EditorBuildSettings.asset
+++ b/Undercover/ProjectSettings/EditorBuildSettings.asset
@ -23,3 +23,6 @@ EditorBuildSettings:
  - enabled: 1
    path: Assets/Scenes/New Level.unity
    guid: 0697173d1a88eb54898d2cf63ceb7c5b
+  - enabled: 1
+    path: Assets/Scenes/TEST.unity
+    guid: c9dc36444a5e1c64bb9a06e825c23fc5
--- a/Undercover/ProjectSettings/ProjectVersion.txt
+++ b/Undercover/ProjectSettings/ProjectVersion.txt
@ -1 +1 @@
-m_EditorVersion: 2017.1.1f1
+m_EditorVersion: 2017.1.0f3