This commit is contained in:
parent
d6bd00f8a6
commit
4151baf1aa
|
|
@ -198,6 +198,7 @@
|
|||
<Compile Include="Assets\Plugin\Standard Assets\Effects\ImageEffects\Scripts\ColorCorrectionLookup.cs" />
|
||||
<Compile Include="Assets\UTS\Scripts\Street And Concert\ShfuffleExtension.cs" />
|
||||
<Compile Include="Assets\Plugin\Standard Assets\Effects\ImageEffects\Scripts\Twirl.cs" />
|
||||
<Compile Include="Assets\GameAssets\Art\建筑模型\建筑\Buildings\shaders\Vintage\Vintage.cs" />
|
||||
<Compile Include="Assets\Script\Objective\trigger\Trigger_Introduce.cs" />
|
||||
<Compile Include="Assets\UTS\Scripts\Paths\PathType.cs" />
|
||||
<Compile Include="Assets\EVP5\Scripts\VehicleVisualEffects.cs" />
|
||||
|
|
@ -460,6 +461,7 @@
|
|||
<None Include="Assets\Plugin\Hard Surface Pro\HardSurface Shaders\HardSurfacePro Hidden Front Transparent Bump.shader" />
|
||||
<None Include="Assets\Plugin\Hard Surface Pro\HardSurface Shaders\HardSurfacePro Hidden Front Transparent.shader" />
|
||||
<None Include="Assets\Plugin\Standard Assets\Effects\Projectors\Guidelines.txt" />
|
||||
<None Include="Assets\GameAssets\Art\建筑模型\建筑\Buildings\shaders\Filmic\Filmic.shader" />
|
||||
<None Include="Assets\Plugin\Hard Surface Pro\HardSurface Shaders\HardSurface Pro Opaque Bump.shader" />
|
||||
<None Include="Assets\BOXOPHOBIC\Atmospheric Height Fog\Core\Shaders\UI Default (Height Fog Support).shader" />
|
||||
<None Include="Assets\Plugin\Hard Surface Pro\HardSurface Shaders\HardSurface SFX Depth Write Only.shader" />
|
||||
|
|
@ -513,6 +515,7 @@
|
|||
<None Include="Assets\Plugin\Standard Assets\Vehicles\Car\CarGuidelines.txt" />
|
||||
<None Include="Assets\Plugin\Hard Surface Pro\HardSurface Shaders\HardSurfacePro Hidden Front Opaque Diffuse.shader" />
|
||||
<None Include="Assets\Plugin\Standard Assets\Effects\ImageEffects\Shaders\ColorCorrectionSelective.shader" />
|
||||
<None Include="Assets\GameAssets\Art\建筑模型\建筑\Buildings\shaders\glass.shader" />
|
||||
<None Include="Assets\Plugin\Standard Assets\Effects\ImageEffects\Shaders\RadialBlur.shader" />
|
||||
<None Include="Assets\Plugin\Hard Surface Pro\HardSurface Shaders\HardSurfaceProScreenSpaceRefraction.cginc" />
|
||||
<None Include="Assets\Plugin\Standard Assets\Vehicles\Aircraft\AircraftGuidelines.txt" />
|
||||
|
|
@ -527,6 +530,7 @@
|
|||
<None Include="Assets\Plugin\Standard Assets\Effects\ImageEffects\Shaders\ColorCorrection3DLut.shader" />
|
||||
<None Include="Assets\Plugin\Standard Assets\Effects\ImageEffects\Shaders\SimpleClear.shader" />
|
||||
<None Include="Assets\EVP5\car-wiper-master\Assets\CarWiper\Arts\NormalRaindrop.shader" />
|
||||
<None Include="Assets\GameAssets\Art\建筑模型\建筑\Buildings\shaders\glass_02.shader" />
|
||||
<None Include="Assets\Plugin\Standard Assets\Effects\ImageEffects\Shaders\ContrastComposite.shader" />
|
||||
<None Include="Assets\EVP5\car-wiper-master\Assets\CarWiper\Arts\NormalSnowdrop.shader" />
|
||||
<None Include="Assets\Plugin\Standard Assets\Vehicles\Car\Shaders\ReflectiveDiffuseSpecTransp.shader" />
|
||||
|
|
@ -564,6 +568,7 @@
|
|||
<None Include="Assets\TextMesh Pro\Resources\LineBreaking Leading Characters.txt" />
|
||||
<None Include="Assets\Plugin\Hard Surface Pro\HardSurface Shaders\HardSurfacePro Hidden Back Transparent Specular.shader" />
|
||||
<None Include="Assets\Plugin\Hard Surface Pro\HardSurface Shaders\HardSurface Free Opaque Diffuse.shader" />
|
||||
<None Include="Assets\GameAssets\Art\建筑模型\建筑\Buildings\shaders\Chromatic\AdvancedCA.shader" />
|
||||
<None Include="Assets\Plugin\Standard Assets\ParticleSystems\ParticleSystemsGuidelines.txt" />
|
||||
<None Include="Assets\Plugin\Standard Assets\Effects\TessellationShaders\Shaders\BumpedSpecularSmooth.shader" />
|
||||
<None Include="Assets\TextMesh Pro\Resources\Shaders\TMPro_Properties.cginc" />
|
||||
|
|
@ -571,10 +576,12 @@
|
|||
<None Include="Assets\BOXOPHOBIC\Atmospheric Height Fog\Demo\Shaders\My Transparent Shader.shader" />
|
||||
<None Include="Assets\Plugin\FXVShieldEffect\Shaders\FXVShieldEffect.shader" />
|
||||
<None Include="Assets\Plugin\Standard Assets\ParticleSystems\Shaders\PriorityParticleAddSoft.shader" />
|
||||
<None Include="Assets\GameAssets\Art\建筑模型\建筑\Buildings\shaders\Vintage\Vintage.shader" />
|
||||
<None Include="Assets\Plugin\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\SeparableBlurPlus.shader" />
|
||||
<None Include="Assets\TextMesh Pro\Resources\Shaders\TMPro_Surface.cginc" />
|
||||
<None Include="Assets\Plugin\Standard Assets\Effects\ImageEffects\Shaders\MotionBlur.shader" />
|
||||
<None Include="Assets\Plugin\Standard Assets\Effects\ImageEffects\Shaders\_DepthOfField\SeparableBlur.shader" />
|
||||
<None Include="Assets\GameAssets\Art\建筑模型\建筑\Buildings\shaders\Normal-Bumped-DoubleSided.shader" />
|
||||
<None Include="Assets\Plugin\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\MobileBlur.shader" />
|
||||
<None Include="Assets\Plugin\Standard Assets\Environment\Water\DO_NOT_WORK_IN_VR.txt" />
|
||||
<None Include="Assets\Plugin\Hard Surface Pro\HardSurface Shaders\HardSurface Cut Out Specular.shader" />
|
||||
|
|
@ -607,6 +614,7 @@
|
|||
<None Include="Assets\Plugin\Standard Assets\Effects\ImageEffects\Shaders\NoiseAndGrainDX11.shader" />
|
||||
<None Include="Assets\Plugin\Standard Assets\Effects\ImageEffects\Shaders\_DepthOfField\SeparableWeightedBlurDof34.shader" />
|
||||
<None Include="Assets\Plugin\Standard Assets\Effects\ImageEffects\Readme.txt" />
|
||||
<None Include="Assets\GameAssets\Art\建筑模型\建筑\Buildings\shaders\Normal-BumpSpec.shader" />
|
||||
<None Include="Assets\Plugin\Standard Assets\Characters\RollerBall\RollerBallGuidelines.txt" />
|
||||
<None Include="Assets\Plugin\Standard Assets\Environment\Water\Water\Shaders\FXWaterPro.shader" />
|
||||
<None Include="Assets\EVP5\Visual Effects\Shaders\EVP Tire Marks Bump.shader" />
|
||||
|
|
|
|||
|
|
@ -702991,20 +702991,55 @@ PrefabInstance:
|
|||
m_Modification:
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 1303664639005768057, guid: d11d4175e1d087d46872bb1f74c1ef8a,
|
||||
type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1303664639063796504, guid: d11d4175e1d087d46872bb1f74c1ef8a,
|
||||
type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1303664639136272891, guid: d11d4175e1d087d46872bb1f74c1ef8a,
|
||||
type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1303664639142592820, guid: d11d4175e1d087d46872bb1f74c1ef8a,
|
||||
type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1303664639186110145, guid: d11d4175e1d087d46872bb1f74c1ef8a,
|
||||
type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1303664639251386691, guid: d11d4175e1d087d46872bb1f74c1ef8a,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 6.75
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1303664639262365245, guid: d11d4175e1d087d46872bb1f74c1ef8a,
|
||||
type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1303664639329604544, guid: d11d4175e1d087d46872bb1f74c1ef8a,
|
||||
type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1303664639452378569, guid: d11d4175e1d087d46872bb1f74c1ef8a,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 8.78
|
||||
value: 8.06
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1303664639452378569, guid: d11d4175e1d087d46872bb1f74c1ef8a,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 8.23
|
||||
value: 7.16
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1303664639491420886, guid: d11d4175e1d087d46872bb1f74c1ef8a,
|
||||
type: 3}
|
||||
|
|
@ -703021,6 +703056,36 @@ PrefabInstance:
|
|||
propertyPath: m_LocalPosition.z
|
||||
value: -6.2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1303664639535111537, guid: d11d4175e1d087d46872bb1f74c1ef8a,
|
||||
type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1303664639610586935, guid: d11d4175e1d087d46872bb1f74c1ef8a,
|
||||
type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1303664639622270894, guid: d11d4175e1d087d46872bb1f74c1ef8a,
|
||||
type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1303664639632544028, guid: d11d4175e1d087d46872bb1f74c1ef8a,
|
||||
type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1303664639635843497, guid: d11d4175e1d087d46872bb1f74c1ef8a,
|
||||
type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1303664639639174439, guid: d11d4175e1d087d46872bb1f74c1ef8a,
|
||||
type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1303664639781610758, guid: d11d4175e1d087d46872bb1f74c1ef8a,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
|
|
@ -703036,6 +703101,41 @@ PrefabInstance:
|
|||
propertyPath: m_LocalPosition.x
|
||||
value: 1.11
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1303664639893559970, guid: d11d4175e1d087d46872bb1f74c1ef8a,
|
||||
type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1303664639896230431, guid: d11d4175e1d087d46872bb1f74c1ef8a,
|
||||
type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1303664639916241404, guid: d11d4175e1d087d46872bb1f74c1ef8a,
|
||||
type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1303664639954686877, guid: d11d4175e1d087d46872bb1f74c1ef8a,
|
||||
type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1303664639983560924, guid: d11d4175e1d087d46872bb1f74c1ef8a,
|
||||
type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1303664639998409346, guid: d11d4175e1d087d46872bb1f74c1ef8a,
|
||||
type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1303664640014652480, guid: d11d4175e1d087d46872bb1f74c1ef8a,
|
||||
type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1303664640060517005, guid: d11d4175e1d087d46872bb1f74c1ef8a,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
|
|
@ -703074,7 +703174,7 @@ PrefabInstance:
|
|||
- target: {fileID: 1303664640135412809, guid: d11d4175e1d087d46872bb1f74c1ef8a,
|
||||
type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 55
|
||||
value: 53
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1303664640135412809, guid: d11d4175e1d087d46872bb1f74c1ef8a,
|
||||
type: 3}
|
||||
|
|
@ -703146,6 +703246,61 @@ PrefabInstance:
|
|||
propertyPath: yellowTime
|
||||
value: 3
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1303664640166995176, guid: d11d4175e1d087d46872bb1f74c1ef8a,
|
||||
type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1303664640208024195, guid: d11d4175e1d087d46872bb1f74c1ef8a,
|
||||
type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1303664640329476060, guid: d11d4175e1d087d46872bb1f74c1ef8a,
|
||||
type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1303664640497436324, guid: d11d4175e1d087d46872bb1f74c1ef8a,
|
||||
type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1303664640564013316, guid: d11d4175e1d087d46872bb1f74c1ef8a,
|
||||
type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1303664640580723600, guid: d11d4175e1d087d46872bb1f74c1ef8a,
|
||||
type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1303664640584264751, guid: d11d4175e1d087d46872bb1f74c1ef8a,
|
||||
type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1303664640644324050, guid: d11d4175e1d087d46872bb1f74c1ef8a,
|
||||
type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1303664640718544514, guid: d11d4175e1d087d46872bb1f74c1ef8a,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -23.22
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1303664640718544514, guid: d11d4175e1d087d46872bb1f74c1ef8a,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: -23.39
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1303664640751491024, guid: d11d4175e1d087d46872bb1f74c1ef8a,
|
||||
type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1303664640770295010, guid: d11d4175e1d087d46872bb1f74c1ef8a,
|
||||
type: 3}
|
||||
propertyPath: m_Size.x
|
||||
|
|
@ -703166,6 +703321,41 @@ PrefabInstance:
|
|||
propertyPath: m_LocalPosition.z
|
||||
value: 21.88
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1303664640794201855, guid: d11d4175e1d087d46872bb1f74c1ef8a,
|
||||
type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1303664640819586988, guid: d11d4175e1d087d46872bb1f74c1ef8a,
|
||||
type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1303664640845308184, guid: d11d4175e1d087d46872bb1f74c1ef8a,
|
||||
type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1303664641000316644, guid: d11d4175e1d087d46872bb1f74c1ef8a,
|
||||
type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1303664641097387860, guid: d11d4175e1d087d46872bb1f74c1ef8a,
|
||||
type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1303664641105848674, guid: d11d4175e1d087d46872bb1f74c1ef8a,
|
||||
type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1303664641112222053, guid: d11d4175e1d087d46872bb1f74c1ef8a,
|
||||
type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1389253434666983256, guid: d11d4175e1d087d46872bb1f74c1ef8a,
|
||||
type: 3}
|
||||
propertyPath: lightGroups.Array.size
|
||||
|
|
@ -739116,7 +739306,7 @@ PrefabInstance:
|
|||
- target: {fileID: 1303664640135412809, guid: d11d4175e1d087d46872bb1f74c1ef8a,
|
||||
type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 53
|
||||
value: 54
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1303664640135412809, guid: d11d4175e1d087d46872bb1f74c1ef8a,
|
||||
type: 3}
|
||||
|
|
@ -1018489,7 +1018679,7 @@ PrefabInstance:
|
|||
- target: {fileID: 1303664640135412809, guid: d11d4175e1d087d46872bb1f74c1ef8a,
|
||||
type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 54
|
||||
value: 55
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1303664640135412809, guid: d11d4175e1d087d46872bb1f74c1ef8a,
|
||||
type: 3}
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ public class TrafficLightManager : MonoBehaviour
|
|||
currentState = startsWithGreen ? TrafficLightState.Green : TrafficLightState.Red;
|
||||
previousState = currentState; // 初始化时,之前的状态与当前状态相同
|
||||
|
||||
timer = startsWithGreen ? 10f : 39;
|
||||
timer = startsWithGreen ? 6f : 16;
|
||||
}
|
||||
|
||||
public void UpdateTrafficLightTexture(TrafficLightState state)
|
||||
|
|
@ -146,13 +146,13 @@ public class TrafficLightManager : MonoBehaviour
|
|||
|
||||
case TrafficLightState.Yellow:
|
||||
group.currentState = TrafficLightState.Red;
|
||||
group.timer = group.startsWithGreen ? 39 : 20; // 黄灯到红灯的持续时间
|
||||
group.timer = group.startsWithGreen ? 31 : 31; // 黄灯到红灯的持续时间
|
||||
break;
|
||||
|
||||
case TrafficLightState.Red:
|
||||
group.previousState = TrafficLightState.Red;
|
||||
group.currentState = TrafficLightState.Green;
|
||||
group.timer = 10f; // 红灯到绿灯的持续时间
|
||||
group.timer = 6; // 红灯到绿灯的持续时间
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -105,7 +105,7 @@ public class StandardSemaphoreSystem : OneWaySemaphoreSystem
|
|||
protected override void EndFlick()
|
||||
{
|
||||
greenFlicking = false;
|
||||
|
||||
|
||||
switch (flickType)
|
||||
{
|
||||
case FlickType.CarGreen:
|
||||
|
|
|
|||
|
|
@ -21,6 +21,9 @@ EditorUserSettings:
|
|||
value: 22424703114646680e0b0227036c52151802563f22213229
|
||||
flags: 0
|
||||
RecentlyUsedScenePath-5:
|
||||
value: 224247031146466e393d43111326511505582b3e2d2622313f2d2210f0ef272bf0e837eda92f31352d1b
|
||||
flags: 0
|
||||
RecentlyUsedScenePath-6:
|
||||
value: 22424703114646680e0b0227036c52111f19276439262f2434
|
||||
flags: 0
|
||||
vcSharedLogLevel:
|
||||
|
|
|
|||
Loading…
Reference in New Issue