浏览代码
Merge branch 'demo-work-temp' into demo-work
Merge branch 'demo-work-temp' into demo-work
# Conflicts: # ProjectSettings/GraphicsSettings.asset/demo-work
André McGrail
5 年前
当前提交
a60e6f47
共有 771 个文件被更改，包括 4480 次插入 和 4895 次删除
-
4.gitignore
-
11Assets/Data/InputControls.inputactions
-
28Assets/Data/UniversalRP/BoatDemoRenderer.asset
-
10Assets/Data/UniversalRP/PipelineAsset_High.asset
-
2Assets/Data/UniversalRP/PipelineAsset_Low.asset
-
8Assets/Data/UniversalRP/PipelineAsset_Medium.asset
-
5Assets/Data/UniversalRP/PlanarReflectionRenderer.asset
-
63Assets/Data/Volumes/HighQuality.asset
-
63Assets/Data/Volumes/MediumQuality.asset
-
4Assets/Data/WaterSettingsData.asset
-
20Assets/Data/WaterSurfaceData.asset
-
2Assets/Materials/BushTest.mat
-
4Assets/Materials/Sky.mat
-
128Assets/Objects/Levels/Island/Audio.prefab
-
10Assets/Objects/Levels/Island/ClearSky/ClearSky.mat
-
6Assets/Objects/Levels/Island/ClearSky/Island_Post_Clear.asset
-
298Assets/Objects/Levels/Island/Dynamic Objects.prefab
-
993Assets/Objects/Levels/Island/Environment Objects Prefabs/Buildings.prefab
-
6Assets/Objects/Levels/Island/Environment Objects Prefabs/Env_Seaweed.prefab
-
998Assets/Objects/Levels/Island/Environment Objects Prefabs/Props_Floating.prefab
-
963Assets/Objects/Levels/Island/Environment Objects.prefab
-
2Assets/Objects/Levels/Island/FX.prefab
-
271Assets/Objects/Levels/Island/Island Level.prefab
-
48Assets/Objects/Levels/Island/Lighting.prefab
-
617Assets/Objects/Levels/Island/Logic.prefab
-
38Assets/Objects/boats/Interceptor/MSLL.tif.meta
-
44Assets/Objects/boats/Interceptor/Normal.tif.meta
-
5Assets/Objects/boats/Prefabs/Wake.prefab.meta
-
457Assets/Objects/boats/Prefabs/_BoatBase.prefab
-
5Assets/Objects/boats/Prefabs/_BoatBase.prefab.meta
-
104Assets/Objects/boats/Prefabs/_Renegade.prefab
-
183Assets/Objects/boats/Speedboat/BoatSpeedboat.fbx
-
44Assets/Objects/boats/Speedboat/Normal.tif.meta
-
2Assets/Objects/boats/_waterFoam.mat
-
7Assets/Objects/environment/Cliffs/Env_Hero_Mountain.fbx.meta
-
54Assets/Objects/environment/Cliffs/Maps/Cave_defaultMat_AONormal.tif.meta
-
50Assets/Objects/environment/Cliffs/Maps/Cave_defaultMat_BaseCurvature.tif.meta
-
50Assets/Objects/environment/Cliffs/Maps/Cliff_Full_01_defaultMat_AONormal.tif.meta
-
54Assets/Objects/environment/Cliffs/Maps/Cliff_Full_01_defaultMat_BaseCurvature.tif.meta
-
50Assets/Objects/environment/Cliffs/Maps/Cliff_defaultMat_AONormal.tif.meta
-
54Assets/Objects/environment/Cliffs/Maps/Cliff_defaultMat_BaseCurvature.tif.meta
-
54Assets/Objects/environment/Cliffs/Maps/Hero_defaultMat_AONormal.tif.meta
-
50Assets/Objects/environment/Cliffs/Maps/Hero_defaultMat_BaseCurvature.tif.meta
-
50Assets/Objects/environment/Cliffs/Maps/Rocks_defaultMat_AONormal.tif.meta
-
54Assets/Objects/environment/Cliffs/Maps/Rocks_defaultMat_BaseCurvature.tif.meta
-
108Assets/Objects/environment/Cliffs/Materials/Env_Cliff_Full_01.mat
-
108Assets/Objects/environment/Cliffs/Materials/Env_Cliffs.mat
-
94Assets/Objects/environment/Cliffs/Materials/Env_HeroCave.mat
-
101Assets/Objects/environment/Cliffs/Materials/Env_HeroLarge.mat
-
137Assets/Objects/environment/Cliffs/Materials/Env_Rocks.mat
-
17Assets/Objects/environment/Cliffs/Prefabs/Cliff_Wall_02.prefab
-
16Assets/Objects/environment/Cliffs/Prefabs/Cliff_Wall_03.prefab
-
11Assets/Objects/environment/Cliffs/Prefabs/Rock_Small_04.prefab
-
19Assets/Objects/environment/Clouds/Clouds.fbx.meta
-
4Assets/Objects/environment/Clouds/Clouds.mat
-
26Assets/Objects/environment/Clouds/Clouds.tif.meta
-
24Assets/Objects/environment/Trees/Maps/TreeBillBoards_Normal_Smoothness.tif.meta
-
28Assets/Objects/environment/Trees/Maps/TreeBillBoards_albedo.png.meta
-
16Assets/Objects/environment/Trees/Maps/Trees_Albedo.png.meta
-
24Assets/Objects/environment/Trees/Maps/Trees_Normal_Smoothness.tif.meta
-
114Assets/Objects/environment/Trees/Meshes/Bush_Large_01.fbx
-
12Assets/Objects/environment/Trees/Meshes/Bush_Large_01.fbx.meta
-
255Assets/Objects/environment/Trees/Meshes/PalmB_02.fbx
-
15Assets/Objects/environment/Trees/Meshes/PalmB_02_tmp.fbx.meta
-
43Assets/Objects/props/houses/Maps/HousesJetty_LOW_Matr_BuildingsJettys_AlbedoTransparency.tif.meta
-
48Assets/Objects/props/houses/Maps/HousesJetty_LOW_Matr_BuildingsJettys_Emission.tif.meta
-
44Assets/Objects/props/houses/Maps/HousesJetty_LOW_Matr_BuildingsJettys_MetallicSmoothness.tif.meta
-
37Assets/Objects/props/houses/Maps/HousesJetty_LOW_Matr_BuildingsJettys_Normal.tif.meta
-
51Assets/Objects/props/props/Maps/Props_LOW_Matr_Props_AO.png.meta
-
63Assets/Objects/props/props/Maps/Props_LOW_Matr_Props_AlbedoTransparency.tif.meta
-
29Assets/Objects/props/props/Maps/Props_LOW_Matr_Props_MetallicSmoothness.tif.meta
-
65Assets/Objects/props/props/Maps/Props_LOW_Matr_Props_Normal.tif.meta
-
2Assets/Objects/props/props/Matr_Props.mat
-
23Assets/Objects/props/props/Prefabs/Props_ArrowSign.prefab
-
68Assets/Objects/props/props/Prefabs/Props_Paraglider.prefab
-
6Assets/Objects/props/props/Prefabs/Windsurfer.prefab
-
61Assets/Scripts/Boat/Engine.cs
-
53Assets/Scripts/Boat/HumanController.cs
-
5Assets/Scripts/Camera/CameraManager.cs
-
16Assets/Scripts/Camera/LODTweaker.cs
-
3Assets/Scripts/Editor/CreateTexture2DArrayAsset.cs
-
8Assets/Scripts/Editor/DirectionalLightmapperCorrector.cs
-
49Assets/Scripts/Effects/BoatFoamGenerator.cs
-
40Assets/Scripts/Effects/RandomHue.cs
-
111Assets/Scripts/Effects/WakeGenerator.cs
-
75Assets/Scripts/Environment/BuoyManager.cs
-
44Assets/Scripts/Environment/CloudManager.cs
-
72Assets/Scripts/Environment/DayNightController.cs
-
14Assets/Scripts/Environment/FogOverride.cs
-
19Assets/Scripts/Environment/VegetationSystem.cs
-
47Assets/Scripts/Environment/WindsurferManager.cs
-
228Assets/Scripts/GameSystem/AppSettings.cs
-
188Assets/Scripts/GameSystem/Editor/WaypointGroupEditor.cs
-
100Assets/Scripts/GameSystem/InputControls.cs
-
306Assets/Scripts/GameSystem/RaceManager.cs
-
4Assets/Scripts/GameSystem/RaceManager.cs.meta
-
310Assets/Scripts/GameSystem/WaypointGroup.cs
-
26Assets/Scripts/System/MaxLodOption.cs
-
9Assets/Scripts/System/PerfomanceStats.cs
-
6Assets/Scripts/Utility/GenericRotation.cs
993
Assets/Objects/Levels/Island/Environment Objects Prefabs/Buildings.prefab
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
998
Assets/Objects/Levels/Island/Environment Objects Prefabs/Props_Floating.prefab
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
963
Assets/Objects/Levels/Island/Environment Objects.prefab
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
|
|||
fileFormatVersion: 2 |
|||
guid: dd07c82db50e943ca8314f2c407ea841 |
|||
NativeFormatImporter: |
|||
labels: |
|||
- Effect |
|||
PrefabImporter: |
|||
mainObjectFileID: 100100000 |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
|||
|
|||
fileFormatVersion: 2 |
|||
guid: fc3ffb83d6eafb1489a5b23bc82d25b6 |
|||
NativeFormatImporter: |
|||
labels: |
|||
- Boat |
|||
PrefabImporter: |
|||
mainObjectFileID: 100100000 |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
|||
183
Assets/Objects/boats/Speedboat/BoatSpeedboat.fbx
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
114
Assets/Objects/environment/Trees/Meshes/Bush_Large_01.fbx
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
255
Assets/Objects/environment/Trees/Meshes/PalmB_02.fbx
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
|
|||
using System.Collections; |
|||
using System.Collections.Generic; |
|||
using UnityEngine; |
|||
using UnityEngine; |
|||
public class BoatFoamGenerator : MonoBehaviour |
|||
namespace BoatAttack |
|||
public Transform boatTransform; |
|||
private ParticleSystem.MainModule module; |
|||
public ParticleSystem ps; |
|||
public float waterLevel = 0; |
|||
private Vector3 offset; |
|||
public class BoatFoamGenerator : MonoBehaviour |
|||
{ |
|||
public Transform boatTransform; |
|||
private ParticleSystem.MainModule _module; |
|||
public ParticleSystem ps; |
|||
public float waterLevel = 0; |
|||
private Vector3 _offset; |
|||
private void Start() |
|||
{ |
|||
module = ps.main; |
|||
offset = transform.localPosition; |
|||
} |
|||
private void Start() |
|||
{ |
|||
_module = ps.main; |
|||
_offset = transform.localPosition; |
|||
} |
|||
// Update is called once per frame
|
|||
void Update() |
|||
{ |
|||
var pos = boatTransform.TransformPoint(offset); |
|||
pos.y = waterLevel; |
|||
transform.position = pos; |
|||
// Update is called once per frame
|
|||
private void Update() |
|||
{ |
|||
var pos = boatTransform.TransformPoint(_offset); |
|||
pos.y = waterLevel; |
|||
transform.position = pos; |
|||
var fwd = boatTransform.forward; |
|||
fwd.y = 0; |
|||
var angle = Vector3.Angle(fwd.normalized, Vector3.forward); |
|||
module.startRotation = angle * Mathf.Deg2Rad; |
|||
var fwd = boatTransform.forward; |
|||
fwd.y = 0; |
|||
var angle = Vector3.Angle(fwd.normalized, Vector3.forward); |
|||
_module.startRotation = angle * Mathf.Deg2Rad; |
|||
} |
|||
} |
|||
} |
|||
|
|||
using Unity.Collections; |
|||
using UnityEngine; |
|||
using UnityEngine; |
|||
using UnityEngine.Serialization; |
|||
using Unity.Collections; |
|||
public ParticleSystem particleSystem; |
|||
public ParticleSystem.ShapeModule particleShape; |
|||
[FormerlySerializedAs("particleSystem")] public ParticleSystem ps; |
|||
private ParticleSystem.ShapeModule _particleShape; |
|||
private Vector3[] verts; |
|||
private Transform[] buoys; |
|||
private NativeArray<float3> samplePoints; // sample points for height calc
|
|||
private float3[] heights; // water height array(only size of 1 when simple or non-physical)
|
|||
private float3[] normals; // water normal array(only used when non-physical and size of 1 also when simple)
|
|||
private Vector3[] _vertices; |
|||
private Transform[] _buoys; |
|||
private NativeArray<float3> _samplePoints; // sample points for height calc
|
|||
private float3[] _heights; // water height array(only size of 1 when simple or non-physical)
|
|||
private float3[] _normals; // water normal array(only used when non-physical and size of 1 also when simple)
|
|||
void Start() |
|||
private void Start() |
|||
buoys = new Transform[transform.childCount]; |
|||
_buoys = new Transform[transform.childCount]; |
|||
int[] triangles = new int[buoys.Length * 3]; |
|||
verts = new Vector3[buoys.Length]; |
|||
samplePoints = new NativeArray<float3>(buoys.Length, Allocator.Persistent); |
|||
heights = new float3[buoys.Length]; |
|||
normals = new float3[buoys.Length]; |
|||
var triangles = new int[_buoys.Length * 3]; |
|||
_vertices = new Vector3[_buoys.Length]; |
|||
_samplePoints = new NativeArray<float3>(_buoys.Length, Allocator.Persistent); |
|||
_heights = new float3[_buoys.Length]; |
|||
_normals = new float3[_buoys.Length]; |
|||
for (int i = 0; i < buoys.Length; i++) |
|||
for (var i = 0; i < _buoys.Length; i++) |
|||
buoys[i] = transform.GetChild(i); |
|||
samplePoints[i] = buoys[i].position; |
|||
verts[i] = samplePoints[i]; |
|||
_buoys[i] = transform.GetChild(i); |
|||
_samplePoints[i] = _buoys[i].position; |
|||
_vertices[i] = _samplePoints[i]; |
|||
triangles[3 * i + 1] = (int)Mathf.Repeat(i + 1, buoys.Length); |
|||
triangles[3 * i + 2] = (int)Mathf.Repeat(i + 2, buoys.Length); |
|||
triangles[3 * i + 1] = (int)Mathf.Repeat(i + 1, _buoys.Length); |
|||
triangles[3 * i + 2] = (int)Mathf.Repeat(i + 2, _buoys.Length); |
|||
_mesh.vertices = verts; |
|||
_mesh.vertices = _vertices; |
|||
if (particleSystem) |
|||
if (ps) |
|||
particleShape = particleSystem.shape; |
|||
particleShape.mesh = _mesh; |
|||
_particleShape = ps.shape; |
|||
_particleShape.mesh = _mesh; |
|||
samplePoints.Dispose(); |
|||
_samplePoints.Dispose(); |
|||
void Update() |
|||
private void Update() |
|||
GerstnerWavesJobs.UpdateSamplePoints(ref samplePoints, _guid); |
|||
GerstnerWavesJobs.GetData(_guid, ref heights, ref normals); |
|||
GerstnerWavesJobs.UpdateSamplePoints(ref _samplePoints, _guid); |
|||
GerstnerWavesJobs.GetData(_guid, ref _heights, ref _normals); |
|||
for (int i = 0; i < buoys.Length; i++) |
|||
for (var i = 0; i < _buoys.Length; i++) |
|||
Vector3 vec = buoys[i].position; |
|||
vec.y = heights[i].y; |
|||
buoys[i].position = vec; |
|||
verts[i] = vec; |
|||
buoys[i].up = Vector3.Slerp(buoys[i].up, normals[i], Time.deltaTime); |
|||
var vec = _buoys[i].position; |
|||
vec.y = _heights[i].y; |
|||
_buoys[i].position = vec; |
|||
_vertices[i] = vec; |
|||
_buoys[i].up = Vector3.Slerp(_buoys[i].up, _normals[i], Time.deltaTime); |
|||
_mesh.vertices = verts; |
|||
_mesh.vertices = _vertices; |
|||
} |
|||
} |
|||
|
|||
using System; |
|||
using System.Collections; |
|||
using System.Collections.Generic; |
|||
using UnityEditor; |
|||
using UnityEngine; |
|||
using UnityEngine; |
|||
public Color m_FogColor = Color.white; |
|||
// Update is called once per frame
|
|||
void LateUpdate() |
|||
public Color mFogColor = Color.white; |
|||
|
|||
private void LateUpdate() |
|||
RenderSettings.fogColor = m_FogColor; |
|||
RenderSettings.fogColor = mFogColor; |
|||
} |
|||
} |
|||
|
|||
using System.Collections; |
|||
using System.Collections.Generic; |
|||
using UnityEngine; |
|||
using UnityEngine; |
|||
private int curlevel; |
|||
private int _currentLevel; |
|||
curlevel = (int)QualitySettings.lodBias; |
|||
displayText.text = curlevel.ToString(); |
|||
_currentLevel = (int)QualitySettings.lodBias; |
|||
displayText.text = _currentLevel.ToString(); |
|||
if(curlevel < 7) |
|||
curlevel++; |
|||
QualitySettings.lodBias = curlevel; |
|||
displayText.text = curlevel.ToString(); |
|||
if(_currentLevel < 7) |
|||
_currentLevel++; |
|||
QualitySettings.lodBias = _currentLevel; |
|||
displayText.text = _currentLevel.ToString(); |
|||
if (curlevel > 0) |
|||
curlevel--; |
|||
QualitySettings.lodBias = curlevel; |
|||
displayText.text = curlevel.ToString(); |
|||
if (_currentLevel > 0) |
|||
_currentLevel--; |
|||
QualitySettings.lodBias = _currentLevel; |
|||
displayText.text = _currentLevel.ToString(); |
|||
} |
|||
} |
|||
|
|||
using UnityEngine; |
|||
using System.Collections; |
|||
// Update is called once per frame
|
|||
void Update () { |
|||
|
|||
private void Update () |
|||
{ |
|||
transform.localEulerAngles += rotationVector * Time.deltaTime; |
|||
} |
|||
} |
|||
部分文件因为文件数量过多而无法显示
撰写
预览
正在加载...
取消
保存
Reference in new issue