PineappleTech/DefendNJ
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into main_ZYT

Browse Source
This commit is contained in:
ZYT
2025-10-15 16:36:11 +08:00
parent 3f0f8897f0 3887a2ee8f
commit 616e101c4b
4 changed files with 45 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Assets/_DefendNJ/Scenes/Company1Floor.unity
View File

@@ -9735,7 +9735,7 @@ MonoBehaviour:
IncludeChildColliders: 0
RuntimeFollower: {fileID: 0}
colliderMaxDistance: 100
lastTimeMaxDistanceCalced: 638956136852558838
lastTimeMaxDistanceCalced: 638960631992523781
--- !u!82 &675942809
AudioSource:
m_ObjectHideFlags: 0
@@ -11351,6 +11351,11 @@ PrefabInstance:
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 27150426729266445, guid: c5fa52ea1ed72de4599667fabbe4aaff,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 27150426729266445, guid: c5fa52ea1ed72de4599667fabbe4aaff,
type: 3}
propertyPath: m_StaticEditorFlags
@@ -11846,6 +11851,11 @@ PrefabInstance:
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 1376684161127838046, guid: c5fa52ea1ed72de4599667fabbe4aaff,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1376684161127838046, guid: c5fa52ea1ed72de4599667fabbe4aaff,
type: 3}
propertyPath: m_StaticEditorFlags
@@ -13916,6 +13926,11 @@ PrefabInstance:
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 6862993004157962700, guid: c5fa52ea1ed72de4599667fabbe4aaff,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6862993004157962700, guid: c5fa52ea1ed72de4599667fabbe4aaff,
type: 3}
propertyPath: m_StaticEditorFlags

16
Assets/_DefendNJ/Scripts/Manager/GameManager.cs
View File

@@ -423,10 +423,6 @@ public class GameManager : NetworkBehaviour
/// </summary>
public void CreatePlayerAi()
{
if (gameMode == GameMode.OnePlayer)
{
}
for (int i = 0; i < 2; i++)
{
GameObject playerAi = Instantiate(playerAiPres[i]);
@@ -634,10 +630,14 @@ public class GameManager : NetworkBehaviour
private void Update()
{
if (Input.GetKeyDown(KeyCode.Space))
{
StartSpecialEvent(GameEnemyEventType.CleanUp);
}
// if (Input.GetKeyDown(KeyCode.Space))
// {
// StartSpecialEvent(GameEnemyEventType.HelpNpc);
// CoroutineTaskManager.Instance.WaitSecondTodo(() =>
// {
// StartSpecialEvent(GameEnemyEventType.CleanUp);
// }, 5);
// }
}
IEnumerator CreateMortarBullet()

24
Assets/sucai/素材/PolygonWarMap/Materials/Misc/PolygonWarMap_FX_Emission.mat
View File

@@ -21,15 +21,14 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: PolygonWarMap_FX_Emission
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_Shader: {fileID: 4800000, guid: 050a1819cb9a36e4b8fefcefd0d896f7, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _ALPHAPREMULTIPLY_ON
- _EMISSION
- _SURFACE_TYPE_TRANSPARENT
m_InvalidKeywords:
- _ALPHABLEND_ON
- _FLIPBOOKBLENDING_OFF
m_LightmapFlags: 0
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
@@ -105,16 +104,27 @@ Material:
- _AlphaToMask: 0
- _Blend: 0
- _BlendModePreserveSpecular: 1
- _BlendOp: 0
- _BumpScale: 1
- _CameraFadingEnabled: 0
- _CameraFarFadeDistance: 2
- _CameraNearFadeDistance: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- _ColorMode: 0
- _Cull: 2
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DistortionBlend: 0.5
- _DistortionEnabled: 0
- _DistortionStrength: 1
- _DistortionStrengthScaled: 0.1
- _DstBlend: 10
- _DstBlendAlpha: 10
- _EnvironmentReflections: 1
- _FlipbookBlending: 0
- _FlipbookMode: 0
- _GlossMapScale: 1
- _Glossiness: 0
- _GlossyReflections: 1
@@ -126,8 +136,11 @@ Material:
- _ReceiveShadows: 1
- _Smoothness: 0
- _SmoothnessTextureChannel: 0
- _SoftParticlesEnabled: 0
- _SoftParticlesFarFadeDistance: 1
- _SoftParticlesNearFadeDistance: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _SrcBlend: 5
- _SrcBlendAlpha: 1
- _Surface: 1
- _UVSec: 0
@@ -135,7 +148,10 @@ Material:
- _ZWrite: 0
m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
- _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 3, g: 2.3470588, b: 1.3676472, a: 1}
- _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []

4
ProjectSettings/ProjectSettings.asset
View File

@@ -142,9 +142,7 @@ PlayerSettings:
visionOSBundleVersion: 1.0
tvOSBundleVersion: 1.0
bundleVersion: 1.0.0
preloadedAssets:
- {fileID: 1814176829808956018, guid: 58f40b12bbc864f3c96c6505a9a1e1e3, type: 2}
- {fileID: 11400000, guid: d0f8149c48842b4488cf6fb974cff9a2, type: 2}
preloadedAssets: []
metroInputSource: 0
wsaTransparentSwapchain: 0
m_HolographicPauseOnTrackingLoss: 1