a bunch of stuff

2026-03-24 02:01:06 +00:00 · 2016-01-30 18:09:21 -05:00 · 2016-01-30 18:09:21 -05:00 · 072315abc3
commit 072315abc3
parent 307643d2f3
6 changed files with 108 additions and 76 deletions
--- a/Assets/materials/unnamed.mat
+++ b/Assets/materials/unnamed.mat
@ -98,19 +98,19 @@ Material:
      data:
        first:
          name: _Glossiness
-        second: .680999994
+        second: .368999988
      data:
        first:
          name: _Metallic
-        second: .209000006
+        second: .287999988
      data:
        first:
          name: _BumpScale
-        second: .25999999
+        second: 1.26999998
      data:
        first:
          name: _Parallax
-        second: .0136000002
+        second: .0185000002
      data:
        first:
          name: _OcclusionStrength
--- a/Assets/prefabs/basic_room.blend
+++ b/Assets/prefabs/basic_room.blend
--- a/Assets/prefabs/basic_room.blend1
+++ b/Assets/prefabs/basic_room.blend1
--- a/Assets/scenes/prototype.unity
+++ b/Assets/scenes/prototype.unity
@ -198,7 +198,7 @@ Transform:
  m_LocalScale: {x: .299224973, y: .299224973, z: .299224973}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 6
+  m_RootOrder: 7
 --- !u!1001 &671052551
 Prefab:
  m_ObjectHideFlags: 0
@ -236,8 +236,108 @@ Prefab:
      objectReference: {fileID: 0}
    - target: {fileID: 478470, guid: e7ae7646efd89449fb3df8181aee61b5, type: 2}
      propertyPath: m_RootOrder
+      value: 5
+      objectReference: {fileID: 0}
+    - target: {fileID: 433724, guid: e7ae7646efd89449fb3df8181aee61b5, type: 2}
+      propertyPath: m_LocalPosition.x
+      value: -1.32200003
+      objectReference: {fileID: 0}
+    - target: {fileID: 433724, guid: e7ae7646efd89449fb3df8181aee61b5, type: 2}
+      propertyPath: m_LocalPosition.y
+      value: -.75
+      objectReference: {fileID: 0}
+    - target: {fileID: 433724, guid: e7ae7646efd89449fb3df8181aee61b5, type: 2}
+      propertyPath: m_LocalPosition.z
+      value: -.963
+      objectReference: {fileID: 0}
+    - target: {fileID: 10890520, guid: e7ae7646efd89449fb3df8181aee61b5, type: 2}
+      propertyPath: m_Range
+      value: 30.8141403
+      objectReference: {fileID: 0}
+    - target: {fileID: 433724, guid: e7ae7646efd89449fb3df8181aee61b5, type: 2}
+      propertyPath: m_LocalRotation.x
+      value: -.231412336
+      objectReference: {fileID: 0}
+    - target: {fileID: 433724, guid: e7ae7646efd89449fb3df8181aee61b5, type: 2}
+      propertyPath: m_LocalRotation.y
+      value: .495825469
+      objectReference: {fileID: 0}
+    - target: {fileID: 433724, guid: e7ae7646efd89449fb3df8181aee61b5, type: 2}
+      propertyPath: m_LocalRotation.z
+      value: -.462227821
+      objectReference: {fileID: 0}
+    - target: {fileID: 433724, guid: e7ae7646efd89449fb3df8181aee61b5, type: 2}
+      propertyPath: m_LocalRotation.w
+      value: .697818637
+      objectReference: {fileID: 0}
+    - target: {fileID: 496960, guid: e7ae7646efd89449fb3df8181aee61b5, type: 2}
+      propertyPath: m_LocalPosition.x
+      value: .371987581
+      objectReference: {fileID: 0}
+    - target: {fileID: 496960, guid: e7ae7646efd89449fb3df8181aee61b5, type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 1.23599982
+      objectReference: {fileID: 0}
+    - target: {fileID: 496960, guid: e7ae7646efd89449fb3df8181aee61b5, type: 2}
+      propertyPath: m_LocalPosition.y
+      value: 1.58800006
+      objectReference: {fileID: 0}
+    - target: {fileID: 496960, guid: e7ae7646efd89449fb3df8181aee61b5, type: 2}
+      propertyPath: m_LocalRotation.x
+      value: .123710379
+      objectReference: {fileID: 0}
+    - target: {fileID: 496960, guid: e7ae7646efd89449fb3df8181aee61b5, type: 2}
+      propertyPath: m_LocalRotation.y
+      value: .966237128
+      objectReference: {fileID: 0}
+    - target: {fileID: 496960, guid: e7ae7646efd89449fb3df8181aee61b5, type: 2}
+      propertyPath: m_LocalRotation.z
+      value: -.216840908
+      objectReference: {fileID: 0}
+    - target: {fileID: 496960, guid: e7ae7646efd89449fb3df8181aee61b5, type: 2}
+      propertyPath: m_LocalRotation.w
+      value: .0637309179
+      objectReference: {fileID: 0}
+    - target: {fileID: 488486, guid: e7ae7646efd89449fb3df8181aee61b5, type: 2}
+      propertyPath: m_LocalRotation.x
+      value: -1.0898323e-07
+      objectReference: {fileID: 0}
+    - target: {fileID: 488486, guid: e7ae7646efd89449fb3df8181aee61b5, type: 2}
+      propertyPath: m_LocalRotation.y
+      value: .998868763
+      objectReference: {fileID: 0}
+    - target: {fileID: 488486, guid: e7ae7646efd89449fb3df8181aee61b5, type: 2}
+      propertyPath: m_LocalRotation.z
+      value: 2.39591856e-07
+      objectReference: {fileID: 0}
+    - target: {fileID: 488486, guid: e7ae7646efd89449fb3df8181aee61b5, type: 2}
+      propertyPath: m_LocalRotation.w
+      value: -.0475525707
+      objectReference: {fileID: 0}
+    - target: {fileID: 488486, guid: e7ae7646efd89449fb3df8181aee61b5, type: 2}
+      propertyPath: m_LocalPosition.x
+      value: .30399999
+      objectReference: {fileID: 0}
+    - target: {fileID: 488486, guid: e7ae7646efd89449fb3df8181aee61b5, type: 2}
+      propertyPath: m_LocalPosition.y
+      value: -.0350000001
+      objectReference: {fileID: 0}
+    - target: {fileID: 488486, guid: e7ae7646efd89449fb3df8181aee61b5, type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 1.27900004
+      objectReference: {fileID: 0}
+    - target: {fileID: 10883422, guid: e7ae7646efd89449fb3df8181aee61b5, type: 2}
+      propertyPath: m_Shadows.m_Type
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 10883422, guid: e7ae7646efd89449fb3df8181aee61b5, type: 2}
+      propertyPath: m_BounceIntensity
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 10883422, guid: e7ae7646efd89449fb3df8181aee61b5, type: 2}
+      propertyPath: m_SpotAngle
+      value: 56
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_ParentPrefab: {fileID: 100100000, guid: e7ae7646efd89449fb3df8181aee61b5, type: 2}
  m_IsPrefabParent: 0
@ -325,7 +425,7 @@ Transform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 5
+  m_RootOrder: 6
 --- !u!1 &1109130832
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/textures/basic_room_normal.png
+++ b/Assets/textures/basic_room_normal.png
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@ -8,7 +8,6 @@ PlayerSettings:
  defaultScreenOrientation: 4
  targetDevice: 2
  targetResolution: 0
-  useOnDemandResources: 0
  accelerometerFrequency: 60
  companyName: DefaultCompany
  productName: GameJamProject
@ -29,7 +28,6 @@ PlayerSettings:
  androidShowActivityIndicatorOnLoading: -1
  iosAppInBackgroundBehavior: 0
  displayResolutionDialog: 1
-  iosAllowHTTPDownload: 1
  allowedAutorotateToPortrait: 1
  allowedAutorotateToPortraitUpsideDown: 1
  allowedAutorotateToLandscapeRight: 1
@ -62,23 +60,11 @@ PlayerSettings:
  xboxSpeechDB: 0
  xboxEnableHeadOrientation: 0
  xboxEnableGuest: 0
-  n3dsDisableStereoscopicView: 0
-  n3dsEnableSharedListOpt: 1
-  n3dsEnableVSync: 0
  xboxOneResolution: 0
  ps3SplashScreen: {fileID: 0}
  videoMemoryForVertexBuffers: 0
  psp2PowerMode: 0
  psp2AcquireBGM: 1
-  wiiUTVResolution: 0
-  wiiUGamePadMSAA: 1
-  wiiUSupportsNunchuk: 0
-  wiiUSupportsClassicController: 0
-  wiiUSupportsBalanceBoard: 0
-  wiiUSupportsMotionPlus: 0
-  wiiUSupportsProController: 0
-  wiiUAllowScreenCapture: 1
-  wiiUControllerCount: 0
  m_SupportedAspectRatios:
    4:3: 1
    5:4: 1
@ -91,26 +77,20 @@ PlayerSettings:
  metroEnableIndependentInputSource: 0
  metroEnableLowLatencyPresentationAPI: 0
  xboxOneDisableKinectGpuReservation: 0
-  virtualRealitySupported: 0
  productGUID: dbca7936984e94248bf9f90833bc0c3a
  AndroidBundleVersionCode: 1
  AndroidMinSdkVersion: 9
  AndroidPreferredInstallLocation: 1
  aotOptions: 
  apiCompatibilityLevel: 2
-  stripEngineCode: 1
  iPhoneStrippingLevel: 0
  iPhoneScriptCallOptimization: 0
-  iPhoneBuildNumber: 0
  ForceInternetPermission: 0
  ForceSDCardPermission: 0
  CreateWallpaper: 0
  APKExpansionFiles: 0
  preloadShaders: 0
  StripUnusedMeshComponents: 0
-  VertexChannelCompressionMask:
-    serializedVersion: 2
-    m_Bits: 238
  iPhoneSdkVersion: 988
  iPhoneTargetOSVersion: 22
  uIPrerenderedIcon: 0
@ -137,15 +117,6 @@ PlayerSettings:
  iOSLaunchScreenFillPct: 100
  iOSLaunchScreenSize: 100
  iOSLaunchScreenCustomXibPath: 
-  iOSLaunchScreeniPadType: 0
-  iOSLaunchScreeniPadImage: {fileID: 0}
-  iOSLaunchScreeniPadBackgroundColor:
-    serializedVersion: 2
-    rgba: 0
-  iOSLaunchScreeniPadFillPct: 100
-  iOSLaunchScreeniPadSize: 100
-  iOSLaunchScreeniPadCustomXibPath: 
-  iOSDeviceRequirements: []
  AndroidTargetDevice: 0
  AndroidSplashScreenScale: 0
  androidSplashScreen: {fileID: 0}
@ -165,23 +136,6 @@ PlayerSettings:
  m_BuildTargetGraphicsAPIs: []
  webPlayerTemplate: APPLICATION:Default
  m_TemplateCustomTags: {}
-  wiiUTitleID: 0005000011000000
-  wiiUGroupID: 00010000
-  wiiUCommonSaveSize: 4096
-  wiiUAccountSaveSize: 2048
-  wiiUOlvAccessKey: 0
-  wiiUTinCode: 0
-  wiiUJoinGameId: 0
-  wiiUJoinGameModeMask: 0000000000000000
-  wiiUCommonBossSize: 0
-  wiiUAccountBossSize: 0
-  wiiUAddOnUniqueIDs: []
-  wiiUMainThreadStackSize: 3072
-  wiiULoaderThreadStackSize: 1024
-  wiiUSystemHeapSize: 128
-  wiiUTVStartupScreen: {fileID: 0}
-  wiiUGamePadStartupScreen: {fileID: 0}
-  wiiUProfilerLibPath: 
  actionOnDotNetUnhandledException: 1
  enableInternalProfiler: 0
  logObjCUncaughtExceptions: 1
@ -232,20 +186,15 @@ PlayerSettings:
  ps4BackgroundImagePath: 
  ps4StartupImagePath: 
  ps4SaveDataImagePath: 
-  ps4SdkOverride: 
  ps4BGMPath: 
  ps4ShareFilePath: 
-  ps4ShareOverlayImagePath: 
-  ps4PrivacyGuardImagePath: 
  ps4NPtitleDatPath: 
  ps4RemotePlayKeyAssignment: -1
-  ps4RemotePlayKeyMappingDir: 
  ps4EnterButtonAssignment: 1
  ps4ApplicationParam1: 0
  ps4ApplicationParam2: 0
  ps4ApplicationParam3: 0
  ps4ApplicationParam4: 0
-  ps4DownloadDataSize: 0
  ps4GarlicHeapSize: 2048
  ps4Passcode: 3mJ7tLHOsT9jNvqC8LNjpnotcWDQLy4O
  ps4pnSessions: 1
@ -253,14 +202,6 @@ PlayerSettings:
  ps4pnFriends: 1
  ps4pnGameCustomData: 1
  playerPrefsSupport: 0
-  ps4ReprojectionSupport: 0
-  ps4UseAudio3dBackend: 0
-  ps4Audio3dVirtualSpeakerCount: 14
-  ps4attribUserManagement: 0
-  ps4attribMoveSupport: 0
-  ps4attrib3DSupport: 0
-  ps4attribShareSupport: 0
-  ps4IncludedModules: []
  monoEnv: 
  psp2Splashimage: {fileID: 0}
  psp2NPTrophyPackPath: 
@ -309,6 +250,7 @@ PlayerSettings:
  psp2InfoBarOnStartup: 0
  psp2InfoBarColor: 0
  psmSplashimage: {fileID: 0}
+  virtualRealitySupported: 0
  spritePackerPolicy: 
  scriptingDefineSymbols: {}
  metroPackageName: GameJamProject
@ -400,17 +342,6 @@ PlayerSettings:
  tizenSigningProfileName: 
  tizenGPSPermissions: 0
  tizenMicrophonePermissions: 0
-  n3dsUseExtSaveData: 0
-  n3dsCompressStaticMem: 1
-  n3dsExtSaveDataNumber: 0x12345
-  n3dsStackSize: 131072
-  n3dsTargetPlatform: 2
-  n3dsRegion: 7
-  n3dsMediaSize: 0
-  n3dsLogoStyle: 3
-  n3dsTitle: GameName
-  n3dsProductCode: 
-  n3dsApplicationId: 0xFF3FF
  stvDeviceAddress: 
  stvProductDescription: 
  stvProductAuthor: 
@ -476,6 +407,7 @@ PlayerSettings:
  additionalIl2CppArgs::additionalIl2CppArgs: 
  firstStreamedSceneWithResources: 0
  cloudProjectId: 
+  projectId: 
  projectName: 
  organizationId: 
  cloudEnabled: 0