gunnbr/PrincessLandVR
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of http://sakura:3030/gunnbr/PrincessLandVR

Browse Source
This commit is contained in:
gunnbr committed 2021-01-12 20:43:50 -08:00
2 parents 5c85a5db2a accdfe5019
commit 9c5d74f65f
8 files changed
+92 -150
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Scenes/PrincessLand.unity
+36 -29
View File
@@ -594,7 +594,7 @@ PrefabInstance:
- target: {fileID: 3419380671730723436, guid: 2405ec89026ce24488bdf9b73ba73229,
type: 3}
propertyPath: m_RootOrder
value: 11
value: 12
objectReference: {fileID: 0}
- target: {fileID: 3419380671730723436, guid: 2405ec89026ce24488bdf9b73ba73229,
type: 3}
@@ -1996,7 +1996,7 @@ Transform:
m_Children:
- {fileID: 1235649820}
m_Father: {fileID: 0}
m_RootOrder: 6
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &160123520
PrefabInstance:
@@ -2121,7 +2121,7 @@ PrefabInstance:
- target: {fileID: 2535473794561774150, guid: 628e2a0410032204785de27e4a6cbb3c,
type: 3}
propertyPath: m_RootOrder
value: 8
value: 9
objectReference: {fileID: 0}
- target: {fileID: 2535473794561774150, guid: 628e2a0410032204785de27e4a6cbb3c,
type: 3}
@@ -4597,7 +4597,7 @@ PrefabInstance:
- target: {fileID: 6367628354273301364, guid: 2a06588b2a6965e4bb22878e344fa32e,
type: 3}
propertyPath: m_RootOrder
value: 12
value: 13
objectReference: {fileID: 0}
- target: {fileID: 6367628354273301364, guid: 2a06588b2a6965e4bb22878e344fa32e,
type: 3}
@@ -4607,7 +4607,7 @@ PrefabInstance:
- target: {fileID: 6367628354273301364, guid: 2a06588b2a6965e4bb22878e344fa32e,
type: 3}
propertyPath: m_LocalPosition.y
value: 35.815254
value: 36.162
objectReference: {fileID: 0}
- target: {fileID: 6367628354273301364, guid: 2a06588b2a6965e4bb22878e344fa32e,
type: 3}
@@ -5067,7 +5067,7 @@ PrefabInstance:
- target: {fileID: 6565259026102315539, guid: 930395c10b17fcc469ce3f738d10fbd5,
type: 3}
propertyPath: m_RootOrder
value: 7
value: 8
objectReference: {fileID: 0}
- target: {fileID: 6565259026102315539, guid: 930395c10b17fcc469ce3f738d10fbd5,
type: 3}
@@ -5336,7 +5336,7 @@ Transform:
- {fileID: 1811955221}
- {fileID: 2067988149}
m_Father: {fileID: 0}
m_RootOrder: 14
m_RootOrder: 15
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &264104762
PrefabInstance:
@@ -6143,7 +6143,7 @@ Transform:
m_Children:
- {fileID: 1705947251}
m_Father: {fileID: 0}
m_RootOrder: 18
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &298121435
PrefabInstance:
@@ -10461,7 +10461,7 @@ PrefabInstance:
- target: {fileID: 6845963354267829052, guid: 796f4ee7253909f498dff415ec2534e8,
type: 3}
propertyPath: m_RootOrder
value: 2
value: 3
objectReference: {fileID: 0}
- target: {fileID: 6845963354267829052, guid: 796f4ee7253909f498dff415ec2534e8,
type: 3}
@@ -12483,7 +12483,7 @@ Transform:
m_LocalScale: {x: 10, y: 10, z: 10}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 13
m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &604397324
PrefabInstance:
@@ -16213,7 +16213,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 779035077}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -87.1, y: -0.83, z: 43.4}
m_LocalPosition: {x: -55.7, y: -0.83, z: 52.3}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1705947251}
@@ -17056,7 +17056,7 @@ PrefabInstance:
- target: {fileID: 3301982758317484751, guid: 3be228291c2777f4bb158a8f309acfcf,
type: 3}
propertyPath: m_RootOrder
value: 3
value: 4
objectReference: {fileID: 0}
- target: {fileID: 3301982758317484751, guid: 3be228291c2777f4bb158a8f309acfcf,
type: 3}
@@ -23632,7 +23632,7 @@ Transform:
- {fileID: 499475312}
- {fileID: 411303041}
m_Father: {fileID: 0}
m_RootOrder: 15
m_RootOrder: 16
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &965859544
GameObject:
@@ -24909,7 +24909,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 17
m_RootOrder: 18
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!136 &1007957010
CapsuleCollider:
@@ -27287,7 +27287,7 @@ Transform:
m_Children:
- {fileID: 1454683303}
m_Father: {fileID: 0}
m_RootOrder: 16
m_RootOrder: 17
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1050841375
PrefabInstance:
@@ -28354,7 +28354,7 @@ PrefabInstance:
- target: {fileID: 1848836457607822493, guid: 810faf30e433cb74fbecc70347f1bfb4,
type: 3}
propertyPath: m_RootOrder
value: 10
value: 11
objectReference: {fileID: 0}
- target: {fileID: 1848836457607822493, guid: 810faf30e433cb74fbecc70347f1bfb4,
type: 3}
@@ -40205,6 +40205,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c847780c843a61a40ae54c515ba77b1b, type: 3}
m_Name:
m_EditorClassIdentifier:
terainMask:
serializedVersion: 2
m_Bits: 1
--- !u!114 &1238994334
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -59452,7 +59455,7 @@ PrefabInstance:
- target: {fileID: 7763361116735412208, guid: 4732a9066c81e2445bf39d35c978aaf3,
type: 3}
propertyPath: m_RootOrder
value: 1
value: 2
objectReference: {fileID: 0}
- target: {fileID: 7763361116735412208, guid: 4732a9066c81e2445bf39d35c978aaf3,
type: 3}
@@ -59858,7 +59861,7 @@ PrefabInstance:
- target: {fileID: 4759011978276858401, guid: 00cf35c5d8315444cacbb611b11b2967,
type: 3}
propertyPath: m_RootOrder
value: 9
value: 10
objectReference: {fileID: 0}
- target: {fileID: 4759011978276858401, guid: 00cf35c5d8315444cacbb611b11b2967,
type: 3}
@@ -62137,7 +62140,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1705947250}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 286, y: 26, z: 227}
m_LocalPosition: {x: 272.44, y: 26, z: 220.99}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 115099253}
@@ -62281,7 +62284,7 @@ PrefabInstance:
- target: {fileID: -8679921383154817045, guid: ce372616532d17b49beb67d280603118,
type: 3}
propertyPath: m_RootOrder
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: ce372616532d17b49beb67d280603118,
type: 3}
@@ -64147,7 +64150,7 @@ PrefabInstance:
- target: {fileID: 6595420649996950820, guid: abfdab393729e9c4590e4d8100295a52,
type: 3}
propertyPath: m_RootOrder
value: 4
value: 5
objectReference: {fileID: 0}
- target: {fileID: 6595420649996950820, guid: abfdab393729e9c4590e4d8100295a52,
type: 3}
@@ -65694,7 +65697,7 @@ MonoBehaviour:
m_season: 0
m_windDirection: 0
m_lodBias: 2
m_kelvinTexture: {fileID: 0}
m_kelvinTexture: {fileID: 2800000, guid: 4bd5e15076bc61649a16cce53a3ca4f7, type: 3}
m_lightSystemMode: 0
m_thirdPartyLightObject: {fileID: 0}
DefaultLightingSet: 1
@@ -65703,7 +65706,7 @@ MonoBehaviour:
m_selectedLightingProfileValuesIndex: 1
m_profileType: 1
m_renamingProfile: 0
m_lightingEditSettings: 1
m_lightingEditSettings: 0
m_lightingBakeMode: 1
m_lightmappingMode: 2
m_masterSkyboxMaterial: {fileID: 2100000, guid: 11f9a890b6e86384aaf4d69fbe79a6c1,
@@ -65714,7 +65717,8 @@ MonoBehaviour:
m_userCustomProfile: 0
m_profileRename:
m_postProcessExposure: 1.25
m_postProcessProfileBuiltIn: {fileID: 0}
m_postProcessProfileBuiltIn: {fileID: 11400000, guid: 19774c7b570298d45a79f1009fae78d7,
type: 2}
m_postProcessingProfileGUIDBuiltIn: 19774c7b570298d45a79f1009fae78d7
m_directToCamera: 1
m_postProcessingProfileGUIDURP: f730ec2a2de88db4b80f44d5c13539b0
@@ -65726,7 +65730,7 @@ MonoBehaviour:
m_kelvinValue: 4583
m_sunRotation: 332
m_pwSkySunRotation: 0
m_sunPitch: 20.00001
m_sunPitch: 20.000013
m_sunColor: {r: 1, g: 0.72329617, b: 0.5128685, a: 1}
m_sunIntensity: 2
m_lWSunColor: {r: 1, g: 0.78823537, b: 0.5294118, a: 0}
@@ -67899,7 +67903,7 @@ MonoBehaviour:
m_hDMicroShadows: 1
m_hDMicroShadowOpacity: 1
m_skyboxHDRI: {fileID: 8900000, guid: 60995c357a320a4488263256076c8893, type: 3}
m_skyboxTint: {r: 0.6, g: 0.40540522, b: 0.3243242, a: 1}
m_skyboxTint: {r: 0.6, g: 0.4054052, b: 0.32432416, a: 1}
m_skyboxExposure: 1.1
m_skyboxRotationOffset: 0
m_sunSize: 0.04
@@ -73541,14 +73545,14 @@ MonoBehaviour:
m_cameraSensorSize: {x: 70.41, y: 52.63}
m_cameraFocalLength: 50
m_globalReflectionProbe: 0
m_isUserProfileSet: 1
m_isUserProfileSet: 0
m_enableAutoDOF: 1
m_dofLayerDetection:
serializedVersion: 2
m_Bits: 3585
m_depthOfFieldFocusDistance: 50
m_reflectionProbeData:
reflectionProbeMode: 1
reflectionProbeMode: 0
reflectionProbeRefresh: 0
reflectionCubemapCompression: 2
reflectionProbeTimeSlicingMode: 1
@@ -75600,7 +75604,7 @@ PrefabInstance:
- target: {fileID: 3301982758317484751, guid: 3be228291c2777f4bb158a8f309acfcf,
type: 3}
propertyPath: m_RootOrder
value: 5
value: 6
objectReference: {fileID: 0}
- target: {fileID: 3301982758317484751, guid: 3be228291c2777f4bb158a8f309acfcf,
type: 3}
@@ -79909,9 +79913,12 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _Exposure: 0.95
- _Rotation: -332
- _Exposure: 1.15
- _Rotation: -179.99997
m_Colors:
- _Tint: {r: 0.7333333, g: 0.7510563, b: 0.7921569, a: 1}
- _Tint: {r: 0.5143235, g: 0.5630954, b: 0.6029999, a: 1}
m_BuildTextureStacks: []
--- !u!1 &2128864641