Commit c1cd6645 authored by Talita Halboth's avatar Talita Halboth

update de coisa

parent 84cfcea0
......@@ -13,7 +13,7 @@ SceneSettings:
--- !u!104 &2
RenderSettings:
m_ObjectHideFlags: 0
serializedVersion: 6
serializedVersion: 7
m_Fog: 0
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
m_FogMode: 3
......@@ -37,12 +37,12 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
--- !u!157 &3
LightmapSettings:
m_ObjectHideFlags: 0
serializedVersion: 6
serializedVersion: 7
m_GIWorkflowMode: 1
m_LightmapsMode: 1
m_GISettings:
serializedVersion: 2
m_BounceScale: 1
......@@ -53,17 +53,22 @@ LightmapSettings:
m_EnableBakedLightmaps: 0
m_EnableRealtimeLightmaps: 0
m_LightmapEditorSettings:
serializedVersion: 3
serializedVersion: 4
m_Resolution: 2
m_BakeResolution: 40
m_TextureWidth: 1024
m_TextureHeight: 1024
m_AO: 0
m_AOMaxDistance: 1
m_Padding: 2
m_CompAOExponent: 0
m_CompAOExponentDirect: 0
m_Padding: 2
m_LightmapParameters: {fileID: 0}
m_LightmapsBakeMode: 1
m_TextureCompression: 1
m_DirectLightInLightProbes: 1
m_FinalGather: 0
m_FinalGatherFiltering: 1
m_FinalGatherRayCount: 1024
m_ReflectionCompression: 2
m_LightingDataAsset: {fileID: 0}
......@@ -122,10 +127,10 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0.06932118, y: -0.002117101, z: -1}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 3
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &400216735
GameObject:
m_ObjectHideFlags: 0
......@@ -151,10 +156,10 @@ Transform:
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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_Children: []
m_Father: {fileID: 414162623}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &400216737
BoxCollider:
m_ObjectHideFlags: 0
......@@ -223,71 +228,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: ffb3e03940a9f4e39a39458d43b071cd, type: 3}
m_Name:
m_EditorClassIdentifier:
objeto: {fileID: 0}
aux: 0
--- !u!4 &414162623 stripped
Transform:
m_PrefabParentObject: {fileID: 400000, guid: bab18bce00c4249fbbd24a6f62f3e0e3, type: 3}
m_PrefabInternal: {fileID: 1866216550}
--- !u!1001 &987651222
Prefab:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 4000010103745192, guid: fe8c1b00786324cc59713cc646d720f1, type: 2}
propertyPath: m_LocalPosition.x
value: -0.05
objectReference: {fileID: 0}
- target: {fileID: 4000010103745192, guid: fe8c1b00786324cc59713cc646d720f1, type: 2}
propertyPath: m_LocalPosition.y
value: 3.96
objectReference: {fileID: 0}
- target: {fileID: 4000010103745192, guid: fe8c1b00786324cc59713cc646d720f1, type: 2}
propertyPath: m_LocalPosition.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4000010103745192, guid: fe8c1b00786324cc59713cc646d720f1, type: 2}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4000010103745192, guid: fe8c1b00786324cc59713cc646d720f1, type: 2}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4000010103745192, guid: fe8c1b00786324cc59713cc646d720f1, type: 2}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4000010103745192, guid: fe8c1b00786324cc59713cc646d720f1, type: 2}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4000010103745192, guid: fe8c1b00786324cc59713cc646d720f1, type: 2}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4000010103745192, guid: fe8c1b00786324cc59713cc646d720f1, type: 2}
propertyPath: m_LocalScale.x
value: 0.46493855
objectReference: {fileID: 0}
- target: {fileID: 4000010103745192, guid: fe8c1b00786324cc59713cc646d720f1, type: 2}
propertyPath: m_LocalScale.y
value: 0.46493855
objectReference: {fileID: 0}
- target: {fileID: 4000010103745192, guid: fe8c1b00786324cc59713cc646d720f1, type: 2}
propertyPath: m_LocalScale.z
value: 0.46493855
objectReference: {fileID: 0}
- target: {fileID: 54000010782994676, guid: fe8c1b00786324cc59713cc646d720f1,
type: 2}
propertyPath: m_Constraints
value: 120
objectReference: {fileID: 0}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: fe8c1b00786324cc59713cc646d720f1, type: 2}
m_IsPrefabParent: 0
--- !u!1 &1328688273
GameObject:
m_ObjectHideFlags: 0
......@@ -315,17 +259,20 @@ MeshRenderer:
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
m_SubsetIndices:
m_StaticBatchRoot: {fileID: 0}
m_UseLightProbes: 1
m_ReflectionProbeUsage: 1
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 1
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_SelectedWireframeHidden: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
......@@ -360,10 +307,10 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 10.3, y: 0, z: 0}
m_LocalScale: {x: 0.11949921, y: 9.981106, z: 1}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 5
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1344710801
GameObject:
m_ObjectHideFlags: 0
......@@ -447,10 +394,10 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 6
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
......@@ -481,10 +428,10 @@ Transform:
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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_Children: []
m_Father: {fileID: 414162623}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!135 &1564823361
SphereCollider:
m_ObjectHideFlags: 0
......@@ -509,6 +456,10 @@ GameObject:
- 92: {fileID: 1812353873}
- 124: {fileID: 1812353872}
- 81: {fileID: 1812353871}
- 114: {fileID: 1812353876}
- 114: {fileID: 1812353877}
- 114: {fileID: 1812353879}
- 114: {fileID: 1812353878}
m_Layer: 0
m_Name: Main Camera
m_TagString: MainCamera
......@@ -580,11 +531,65 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_Children:
- {fileID: 1820697328}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1812353876
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1812353870}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ebe4c219b1f58411f9a58b4920aa7857, type: 3}
m_Name:
m_EditorClassIdentifier:
prefabPolar: {fileID: 1000013075399310, guid: 508806c85c8aa473599687ab00aa740e,
type: 2}
prefabApolar: {fileID: 1000011450077182, guid: 188f10d2a24ff4033aaaa0576f866717,
type: 2}
instanciado: {fileID: 0}
--- !u!114 &1812353877
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1812353870}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7fcfa3e14704c42a3a63d36369b77949, type: 3}
m_Name:
m_EditorClassIdentifier:
cor: {r: 0, g: 0, b: 0, a: 0}
pontos: 0
a: 0
clock: 0
--- !u!114 &1812353878
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1812353870}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fce03a941554344d89c5017ccd77245a, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &1812353879
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1812353870}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0e031a8b7aae44224b8028eb742264ff, type: 3}
m_Name:
m_EditorClassIdentifier:
pontos: 0
--- !u!1 &1820697327
GameObject:
m_ObjectHideFlags: 0
......@@ -610,10 +615,10 @@ Transform:
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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_Children: []
m_Father: {fileID: 1812353875}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!108 &1820697329
Light:
m_ObjectHideFlags: 0
......@@ -621,7 +626,7 @@ Light:
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1820697327}
m_Enabled: 1
serializedVersion: 6
serializedVersion: 7
m_Type: 1
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Intensity: 1
......@@ -643,10 +648,10 @@ Light:
serializedVersion: 2
m_Bits: 4294967295
m_Lightmapping: 4
m_AreaSize: {x: 1, y: 1}
m_BounceIntensity: 1
m_ShadowRadius: 0
m_ShadowAngle: 0
m_AreaSize: {x: 1, y: 1}
--- !u!1001 &1866216550
Prefab:
m_ObjectHideFlags: 0
......@@ -684,7 +689,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: bab18bce00c4249fbbd24a6f62f3e0e3, type: 3}
propertyPath: m_RootOrder
value: 2
value: 1
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: bab18bce00c4249fbbd24a6f62f3e0e3, type: 3}
propertyPath: m_LocalScale.x
......@@ -736,17 +741,20 @@ MeshRenderer:
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
m_SubsetIndices:
m_StaticBatchRoot: {fileID: 0}
m_UseLightProbes: 1
m_ReflectionProbeUsage: 1
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 1
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_SelectedWireframeHidden: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
......@@ -781,7 +789,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -10.27, y: 0, z: 0}
m_LocalScale: {x: 0.11949921, y: 10.11318, z: 1}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 4
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -8,131 +8,120 @@ Material:
m_PrefabInternal: {fileID: 0}
m_Name: Oil
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 5
m_ShaderKeywords: _EMISSION
m_LightmapFlags: 1
m_CustomRenderQueue: -1
stringTagMap: {}
m_SavedProperties:
serializedVersion: 2
m_TexEnvs:
data:
first:
name: _MainTex
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
data:
first:
name: _BumpMap
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
data:
first:
name: _DetailNormalMap
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
data:
first:
name: _MetallicGlossMap
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
data:
first:
name: _ParallaxMap
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
data:
first:
name: _OcclusionMap
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
data:
first:
name: _EmissionMap
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
data:
first:
name: _DetailMask
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
data:
first:
name: _DetailAlbedoMap
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _BumpMap
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _DetailAlbedoMap
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _DetailMask
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _DetailNormalMap
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _EmissionMap
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _MainTex
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _MetallicGlossMap
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _OcclusionMap
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _ParallaxMap
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
data:
first:
name: _SrcBlend
second: 1
data:
first:
name: _DstBlend
second: 0
data:
first:
name: _Cutoff
second: 0.5
data:
first:
name: _ZWrite
second: 1
data:
first:
name: _Glossiness
second: 0.5
data:
first:
name: _Metallic
second: 0
data:
first:
name: _BumpScale
second: 1
data:
first:
name: _Parallax
second: 0.02
data:
first:
name: _OcclusionStrength
second: 1
data:
first:
name: _DetailNormalMapScale
second: 1
data:
first:
name: _UVSec
second: 0
data:
first:
name: _Mode
second: 0
- first:
name: _BumpScale
second: 1
- first:
name: _Cutoff
second: 0.5
- first:
name: _DetailNormalMapScale
second: 1
- first:
name: _DstBlend
second: 0
- first:
name: _GlossMapScale
second: 1
- first:
name: _Glossiness
second: 0.5
- first:
name: _GlossyReflections
second: 1
- first:
name: _Metallic
second: 0
- first:
name: _Mode
second: 0
- first:
name: _OcclusionStrength
second: 1
- first:
name: _Parallax
second: 0.02
- first:
name: _SmoothnessTextureChannel
second: 0
- first:
name: _SpecularHighlights
second: 1
- first:
name: _SrcBlend
second: 1
- first:
name: _UVSec
second: 0
- first:
name: _ZWrite
second: 1
m_Colors:
data:
first:
name: _EmissionColor
second: {r: 0, g: 0, b: 0, a: 1}
data:
first:
name: _Color
second: {r: 0.20112458, g: 0.21342319, b: 0.45588237, a: 1}
- first:
name: _Color
second: {r: 0, g: 0.543205, b: 0.7647059, a: 0.472}
- first:
name: _EmissionColor
second: {r: 0, g: 0, b: 0, a: 1}
#pragma strict
var bolinha: GameObject;
function Start () {
transform.position.x = (Random.value) * 10;
}
function Update () {
}
\ No newline at end of file
#pragma strict
#pragma strict
//var objeto: GameObject;
var a: float;
var rb: Rigidbody;
static var rb: Rigidbody;
static var molApolar: boolean ;
static var molPolar:boolean ;
var water : Material;
......@@ -11,8 +11,8 @@ var oil : Material;
// no prototipo a cor vermelha representa polar e a preta apolar
function Start () {
rb = GetComponent.<Rigidbody>();
rb.velocity = Vector3(0, -2, 0);
a = Random.value;
// rb.velocity = Vector3(0, -2, 0);
/*a = Random.value;
if (a < 0.5)
{