merge commit
This commit is contained in:
parent
6f7c3eaa9b
commit
82b7e7fbb2
|
@ -122,7 +122,7 @@ Material:
|
|||
- _WavingTint: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _Wind: {r: 1, g: 1, b: 4, a: 8}
|
||||
m_BuildTextureStacks: []
|
||||
--- !u!114 &2922953866860586845
|
||||
--- !u!114 &3157072690679539847
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 11
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
|
|
|
@ -1,5 +1,18 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!114 &-5181856834859275866
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 11
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
version: 5
|
||||
--- !u!21 &2100000
|
||||
Material:
|
||||
serializedVersion: 6
|
||||
|
@ -123,16 +136,3 @@ Material:
|
|||
- _WavingTint: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _Wind: {r: 1, g: 1, b: 4, a: 8}
|
||||
m_BuildTextureStacks: []
|
||||
--- !u!114 &4662822464971472953
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 11
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
version: 5
|
||||
|
|
|
@ -1,18 +1,5 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!114 &-4224080419335077331
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 11
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
version: 5
|
||||
--- !u!21 &2100000
|
||||
Material:
|
||||
serializedVersion: 6
|
||||
|
@ -95,3 +82,16 @@ Material:
|
|||
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
m_BuildTextureStacks: []
|
||||
--- !u!114 &5603016075464539001
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 11
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
version: 5
|
||||
|
|
|
@ -1,18 +1,5 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!114 &-8754062780661562915
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 11
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
version: 5
|
||||
--- !u!21 &2100000
|
||||
Material:
|
||||
serializedVersion: 6
|
||||
|
@ -178,3 +165,16 @@ Material:
|
|||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
- _SpecColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_BuildTextureStacks: []
|
||||
--- !u!114 &2903791061945988491
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 11
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
version: 5
|
||||
|
|
|
@ -181,7 +181,7 @@ Material:
|
|||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
- _SpecColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_BuildTextureStacks: []
|
||||
--- !u!114 &2452446718102520243
|
||||
--- !u!114 &6902619616048362596
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 11
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
|
|
|
@ -173,7 +173,7 @@ Material:
|
|||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
- _SpecColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_BuildTextureStacks: []
|
||||
--- !u!114 &6932485102031202044
|
||||
--- !u!114 &379573167805043484
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 11
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
|
|
|
@ -1,5 +1,18 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!114 &-5269009578845786356
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 11
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
version: 5
|
||||
--- !u!21 &2100000
|
||||
Material:
|
||||
serializedVersion: 6
|
||||
|
@ -97,16 +110,3 @@ Material:
|
|||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
- _SpecColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_BuildTextureStacks: []
|
||||
--- !u!114 &2068806285344847222
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 11
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
version: 5
|
||||
|
|
|
@ -1,5 +1,18 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!114 &-1803904315105783093
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 11
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
version: 5
|
||||
--- !u!21 &2100000
|
||||
Material:
|
||||
serializedVersion: 6
|
||||
|
@ -80,16 +93,3 @@ Material:
|
|||
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
m_BuildTextureStacks: []
|
||||
--- !u!114 &2706972101473297510
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 11
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
version: 5
|
||||
|
|
|
@ -15,13 +15,13 @@ public class CuttableTree : MonoBehaviour
|
|||
// Start is called before the first frame update
|
||||
void Start()
|
||||
{
|
||||
|
||||
|
||||
}
|
||||
|
||||
// Update is called once per frame
|
||||
void Update()
|
||||
{
|
||||
|
||||
|
||||
}
|
||||
|
||||
void OnTriggerEnter(Collider other)
|
||||
|
@ -31,9 +31,22 @@ public class CuttableTree : MonoBehaviour
|
|||
rotation = transform.rotation;
|
||||
rotation *= Quaternion.AngleAxis(20, Vector3.up);
|
||||
Instantiate(stumpPrefab, transform.position, rotation);
|
||||
Instantiate(logPrefab, transform.position+new Vector3(0, 1, 0), rotation);
|
||||
Instantiate(logPrefab, transform.position + new Vector3(0, 1, 0), rotation);
|
||||
onCut.Invoke();
|
||||
Destroy(gameObject);
|
||||
}
|
||||
}
|
||||
void OnCollisionEnter(Collision collision)
|
||||
{
|
||||
if (collision.gameObject.tag == "Cutter")
|
||||
{
|
||||
rotation = transform.rotation;
|
||||
rotation *= Quaternion.AngleAxis(20, Vector3.up);
|
||||
Instantiate(stumpPrefab, transform.position, rotation);
|
||||
Instantiate(logPrefab, transform.position + new Vector3(0, 1, 0), rotation);
|
||||
onCut.Invoke();
|
||||
Destroy(gameObject);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
@ -49,7 +49,7 @@ public class PortalTeleporter : MonoBehaviour
|
|||
Debug.Log(_enabled);
|
||||
if (_portalCanBeUsed && !_justUsed && _enabled)
|
||||
{
|
||||
if (other.name.StartsWith("Holster") || other.tag.Contains(""))
|
||||
if (other.name.StartsWith("Holster") || other.tag.Contains("Holster"))
|
||||
{
|
||||
Debug.Log("holster");
|
||||
}
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -15,7 +15,7 @@ RenderSettings:
|
|||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 9
|
||||
m_Fog: 0
|
||||
m_FogColor: {r: 0.87746114, g: 0.7956361, b: 0.74937975, a: 1}
|
||||
m_FogColor: {r: 0.41592866, g: 0.36391953, b: 0.5471698, a: 1}
|
||||
m_FogMode: 3
|
||||
m_FogDensity: 0.01
|
||||
m_LinearFogStart: 0
|
||||
|
@ -26,8 +26,7 @@ RenderSettings:
|
|||
m_AmbientIntensity: 1
|
||||
m_AmbientMode: 0
|
||||
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
|
||||
m_SkyboxMaterial: {fileID: 3754961556890611794, guid: acded0c84d73b454aa0f31e93a7a47f6,
|
||||
type: 2}
|
||||
m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_HaloStrength: 0.5
|
||||
m_FlareStrength: 1
|
||||
m_FlareFadeSpeed: 3
|
||||
|
@ -39,7 +38,7 @@ RenderSettings:
|
|||
m_ReflectionIntensity: 1
|
||||
m_CustomReflection: {fileID: 0}
|
||||
m_Sun: {fileID: 0}
|
||||
m_IndirectSpecularColor: {r: 0.25923243, g: 0.2534048, b: 0.27568978, a: 1}
|
||||
m_IndirectSpecularColor: {r: 0.12731749, g: 0.13414757, b: 0.1210787, a: 1}
|
||||
m_UseRadianceAmbientProbe: 0
|
||||
--- !u!157 &3
|
||||
LightmapSettings:
|
||||
|
@ -18256,7 +18255,7 @@ PrefabInstance:
|
|||
- target: {fileID: 4755647111779244945, guid: 4dc735765de3bfb43825d37a57707441,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 19.895
|
||||
value: 19.944
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4755647111779244945, guid: 4dc735765de3bfb43825d37a57707441,
|
||||
type: 3}
|
||||
|
@ -33361,7 +33360,7 @@ PrefabInstance:
|
|||
- target: {fileID: 4755647111779244945, guid: 4dc735765de3bfb43825d37a57707441,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
value: -0.006
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4755647111779244945, guid: 4dc735765de3bfb43825d37a57707441,
|
||||
type: 3}
|
||||
|
@ -34425,7 +34424,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!114 &1634078368
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -44916,7 +44915,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!114 &2097260270
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -90,19 +90,19 @@ Material:
|
|||
- _HorizonCloudSize: 4.91
|
||||
- _HorizonCloudStartPosition: -0.1
|
||||
- _HorizonCloudStep: 25
|
||||
- _HorizonExponent: 3.5466661
|
||||
- _HorizonExponent: 3.3921747
|
||||
- _HorizonStep: 500
|
||||
- _HorizonThickness: 1
|
||||
- _MoonGlow: 0
|
||||
- _MoonLightIntensity: 0.0000007231308
|
||||
- _MoonLightIntensity: 0.00034078956
|
||||
- _MoonSize: 0
|
||||
- _MoonSoftEdge: 0
|
||||
- _OverheadCloudAltitude: 1000
|
||||
- _OverheadCloudAnimationSpeed: 50
|
||||
- _OverheadCloudFlowDirectionX: 1
|
||||
- _OverheadCloudFlowDirectionZ: 1
|
||||
- _OverheadCloudRemapMax: 1.1412175
|
||||
- _OverheadCloudRemapMin: 0.1597577
|
||||
- _OverheadCloudRemapMax: 1.074074
|
||||
- _OverheadCloudRemapMin: 0.111940965
|
||||
- _OverheadCloudSize: 10
|
||||
- _OverheadCloudStep: 2
|
||||
- _StarsDensity0: 0.4
|
||||
|
@ -112,7 +112,7 @@ Material:
|
|||
- _StarsGlow0: 0.01
|
||||
- _StarsGlow1: 0.01
|
||||
- _StarsGlow2: 0.01
|
||||
- _StarsOpacity: 0
|
||||
- _StarsOpacity: 0.0009148121
|
||||
- _StarsSize0: 0.42
|
||||
- _StarsSize1: 0.53
|
||||
- _StarsSize2: 0.46
|
||||
|
@ -121,25 +121,25 @@ Material:
|
|||
- _StarsTwinkle1: 6
|
||||
- _StarsTwinkle2: 2
|
||||
- _SunGlow: 0.45
|
||||
- _SunLightIntensity: 0.3000374
|
||||
- _SunLightIntensity: 0.22252172
|
||||
- _SunSize: 0.1
|
||||
- _SunSoftEdge: 0.5
|
||||
m_Colors:
|
||||
- _DetailOverlayTintColor: {r: 0, g: 0, b: 0, a: 0}
|
||||
- _FogColor: {r: 0, g: 0, b: 0, a: 0}
|
||||
- _GroundColor: {r: 0.417616, g: 0.398888, b: 0.43516326, a: 1}
|
||||
- _GroundColor: {r: 0.4100945, g: 0.38965663, b: 0.42924377, a: 1}
|
||||
- _HorizonCloudColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _HorizonColor: {r: 0.90228546, g: 0.8623009, b: 0.76094025, a: 1}
|
||||
- _HorizonColor: {r: 0.9055729, g: 0.85231304, b: 0.741789, a: 1}
|
||||
- _MoonColor: {r: 1, g: 1, b: 1, a: 0}
|
||||
- _MoonDirection: {r: 1, g: 1, b: 1, a: 0}
|
||||
- _MoonLightColor: {r: 0, g: 0, b: 0, a: 0}
|
||||
- _OverheadCloudColor: {r: 1, g: 1, b: 1, a: 0.97479546}
|
||||
- _SkyColor: {r: 0.21923709, g: 0.39015797, b: 0.62960136, a: 1}
|
||||
- _OverheadCloudColor: {r: 1, g: 1, b: 1, a: 0.9640542}
|
||||
- _SkyColor: {r: 0.20533016, g: 0.35421106, b: 0.5882197, a: 1}
|
||||
- _StarsColor0: {r: 0.96470594, g: 0.9450981, b: 0.76470596, a: 1}
|
||||
- _StarsColor1: {r: 1, g: 0.5294118, b: 0.93725497, a: 1}
|
||||
- _StarsColor2: {r: 0, g: 0.92549026, b: 1, a: 1}
|
||||
- _SunColor: {r: 0.97271293, g: 0.9276878, b: 0.85339636, a: 1}
|
||||
- _SunDirection: {r: 0, g: -0.3628407, b: 0.9318512, a: 0}
|
||||
- _SunColor: {r: 0.9742516, g: 0.93176544, b: 0.86166334, a: 1}
|
||||
- _SunDirection: {r: 0, g: -0.258819, b: 0.9659258, a: 0}
|
||||
- _SunLightColor: {r: 1, g: 0.9929226, b: 0.9009434, a: 1}
|
||||
m_BuildTextureStacks: []
|
||||
--- !u!114 &11400000
|
||||
|
|
|
@ -181,11 +181,11 @@ Material:
|
|||
- _HorizonCloudSize: 5
|
||||
- _HorizonCloudStartPosition: 0
|
||||
- _HorizonCloudStep: 25
|
||||
- _HorizonExponent: 4.9867373
|
||||
- _HorizonExponent: 4.9805226
|
||||
- _HorizonStep: 500
|
||||
- _HorizonThickness: 1
|
||||
- _MoonGlow: 0.24
|
||||
- _MoonLightIntensity: 0.1494839
|
||||
- _MoonLightIntensity: 0.14924046
|
||||
- _MoonSize: 0.07
|
||||
- _MoonSoftEdge: 0.22
|
||||
- _OverheadCloudAltitude: 1000
|
||||
|
@ -203,7 +203,7 @@ Material:
|
|||
- _StarsGlow0: 0.01
|
||||
- _StarsGlow1: 0.01
|
||||
- _StarsGlow2: 0.01
|
||||
- _StarsOpacity: 0.9950686
|
||||
- _StarsOpacity: 0.99275
|
||||
- _StarsSize0: 0.42
|
||||
- _StarsSize1: 0.53
|
||||
- _StarsSize2: 0.46
|
||||
|
@ -212,24 +212,24 @@ Material:
|
|||
- _StarsTwinkle1: 6
|
||||
- _StarsTwinkle2: 2
|
||||
- _SunGlow: 0.45
|
||||
- _SunLightIntensity: 0.0000058357195
|
||||
- _SunLightIntensity: 0.000008530984
|
||||
- _SunSize: 0.07
|
||||
- _SunSoftEdge: 0.5
|
||||
m_Colors:
|
||||
- _DetailOverlayTintColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _FogColor: {r: 0.4159287, g: 0.36391956, b: 0.5471698, a: 1}
|
||||
- _GroundColor: {r: 0.28866658, g: 0.24062498, b: 0.3336792, a: 1}
|
||||
- _GroundColor: {r: 0.28962553, g: 0.24180192, b: 0.3344339, a: 1}
|
||||
- _HorizonCloudColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _HorizonColor: {r: 0.4159287, g: 0.36391956, b: 0.5471698, a: 1}
|
||||
- _MoonColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _MoonDirection: {r: 1, g: 1, b: 1, a: 0}
|
||||
- _MoonLightColor: {r: 0.8431373, g: 0.9843138, b: 1, a: 1}
|
||||
- _OverheadCloudColor: {r: 1, g: 1, b: 1, a: 0.08649225}
|
||||
- _OverheadCloudColor: {r: 1, g: 1, b: 1, a: 0.08823514}
|
||||
- _SkyColor: {r: 0.08056989, g: 0.03172837, b: 0.21698111, a: 1}
|
||||
- _StarsColor0: {r: 0.96470594, g: 0.9450981, b: 0.76470596, a: 1}
|
||||
- _StarsColor1: {r: 1, g: 0.5294118, b: 0.93725497, a: 1}
|
||||
- _StarsColor2: {r: 0, g: 0.92549026, b: 1, a: 1}
|
||||
- _SunColor: {r: 0.9990927, g: 0.99759555, b: 0.9951253, a: 0}
|
||||
- _SunColor: {r: 0.9988965, g: 0.9970757, b: 0.9940713, a: 0}
|
||||
- _SunDirection: {r: 0, g: 0, b: 1, a: 0}
|
||||
- _SunLightColor: {r: 1, g: 0.9921569, b: 0.90196085, a: 1}
|
||||
m_BuildTextureStacks: []
|
||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -27,17 +27,17 @@ Material:
|
|||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _ColorBlend:
|
||||
m_Texture: {fileID: 3169759487905746956, guid: b6bbea2e1167a7346822545139402874,
|
||||
m_Texture: {fileID: 567659264843545098, guid: b6bbea2e1167a7346822545139402874,
|
||||
type: 2}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _ColorByHeight:
|
||||
m_Texture: {fileID: 8080748522712846612, guid: b6bbea2e1167a7346822545139402874,
|
||||
m_Texture: {fileID: 5600802747215712828, guid: b6bbea2e1167a7346822545139402874,
|
||||
type: 2}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _ColorByNormal:
|
||||
m_Texture: {fileID: -8809925349446740742, guid: b6bbea2e1167a7346822545139402874,
|
||||
m_Texture: {fileID: 4387930893138807582, guid: b6bbea2e1167a7346822545139402874,
|
||||
type: 2}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
|
|
|
@ -40,17 +40,17 @@ Material:
|
|||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _ColorBlend:
|
||||
m_Texture: {fileID: -5816349128987467882, guid: 726ce83d589353742be6b48ff467fc48,
|
||||
m_Texture: {fileID: -8225046794103038699, guid: 726ce83d589353742be6b48ff467fc48,
|
||||
type: 2}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _ColorByHeight:
|
||||
m_Texture: {fileID: 248416167985974953, guid: 726ce83d589353742be6b48ff467fc48,
|
||||
m_Texture: {fileID: 6831111675755459306, guid: 726ce83d589353742be6b48ff467fc48,
|
||||
type: 2}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _ColorByNormal:
|
||||
m_Texture: {fileID: -3256142748054330089, guid: 726ce83d589353742be6b48ff467fc48,
|
||||
m_Texture: {fileID: 165637708112304383, guid: 726ce83d589353742be6b48ff467fc48,
|
||||
type: 2}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
|
|
|
@ -40,17 +40,17 @@ Material:
|
|||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _ColorBlend:
|
||||
m_Texture: {fileID: -5733606487837795199, guid: 7f589c682d367b442b8cf75918f5aa55,
|
||||
m_Texture: {fileID: 3234995293974440031, guid: 7f589c682d367b442b8cf75918f5aa55,
|
||||
type: 2}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _ColorByHeight:
|
||||
m_Texture: {fileID: -4942859769579248395, guid: 7f589c682d367b442b8cf75918f5aa55,
|
||||
m_Texture: {fileID: 7438741728987644076, guid: 7f589c682d367b442b8cf75918f5aa55,
|
||||
type: 2}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _ColorByNormal:
|
||||
m_Texture: {fileID: -5686912380915963795, guid: 7f589c682d367b442b8cf75918f5aa55,
|
||||
m_Texture: {fileID: -7540841678319409431, guid: 7f589c682d367b442b8cf75918f5aa55,
|
||||
type: 2}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
|
|
Loading…
Reference in New Issue