diff --git a/Assets/Plugins/Android/AndroidManifest.xml b/Assets/Plugins/Android/AndroidManifest.xml
index 0fe48e1a..c90ede3b 100644
--- a/Assets/Plugins/Android/AndroidManifest.xml
+++ b/Assets/Plugins/Android/AndroidManifest.xml
@@ -9,7 +9,7 @@
-
+
diff --git a/Assets/_DefendNJ/Scenes/Zhejiang_Shaoxing_Shengzhou_WuyueGuangchang.unity b/Assets/_DefendNJ/Scenes/Zhejiang_Shaoxing_Shengzhou_WuyueGuangchang.unity
index 0f51159a..77555ac8 100644
--- a/Assets/_DefendNJ/Scenes/Zhejiang_Shaoxing_Shengzhou_WuyueGuangchang.unity
+++ b/Assets/_DefendNJ/Scenes/Zhejiang_Shaoxing_Shengzhou_WuyueGuangchang.unity
@@ -3325,6 +3325,16 @@ PrefabInstance:
propertyPath: m_StaticEditorFlags
value: 2147483647
objectReference: {fileID: 0}
+ - target: {fileID: 1220422095220402961, guid: a10f9fe5b3ccfcb4e8d0c9fb8aadf1ad,
+ type: 3}
+ propertyPath: InitialModule.maxNumParticles
+ value: 50
+ objectReference: {fileID: 0}
+ - target: {fileID: 1325110847513241004, guid: a10f9fe5b3ccfcb4e8d0c9fb8aadf1ad,
+ type: 3}
+ propertyPath: InitialModule.maxNumParticles
+ value: 50
+ objectReference: {fileID: 0}
- target: {fileID: 1575143325444183624, guid: a10f9fe5b3ccfcb4e8d0c9fb8aadf1ad,
type: 3}
propertyPath: m_Layer
@@ -3405,6 +3415,11 @@ PrefabInstance:
propertyPath: m_StaticEditorFlags
value: 2147483647
objectReference: {fileID: 0}
+ - target: {fileID: 1971723251520884368, guid: a10f9fe5b3ccfcb4e8d0c9fb8aadf1ad,
+ type: 3}
+ propertyPath: InitialModule.maxNumParticles
+ value: 50
+ objectReference: {fileID: 0}
- target: {fileID: 2100161447396344709, guid: a10f9fe5b3ccfcb4e8d0c9fb8aadf1ad,
type: 3}
propertyPath: m_Layer
@@ -3435,6 +3450,11 @@ PrefabInstance:
propertyPath: m_StaticEditorFlags
value: 2147483647
objectReference: {fileID: 0}
+ - target: {fileID: 2211416402427301060, guid: a10f9fe5b3ccfcb4e8d0c9fb8aadf1ad,
+ type: 3}
+ propertyPath: InitialModule.maxNumParticles
+ value: 50
+ objectReference: {fileID: 0}
- target: {fileID: 2213579068706666570, guid: a10f9fe5b3ccfcb4e8d0c9fb8aadf1ad,
type: 3}
propertyPath: m_Layer
@@ -3465,6 +3485,11 @@ PrefabInstance:
propertyPath: m_StaticEditorFlags
value: 2147483647
objectReference: {fileID: 0}
+ - target: {fileID: 2502749921124910745, guid: a10f9fe5b3ccfcb4e8d0c9fb8aadf1ad,
+ type: 3}
+ propertyPath: InitialModule.maxNumParticles
+ value: 50
+ objectReference: {fileID: 0}
- target: {fileID: 2522729981789860693, guid: a10f9fe5b3ccfcb4e8d0c9fb8aadf1ad,
type: 3}
propertyPath: m_Layer
@@ -3495,6 +3520,11 @@ PrefabInstance:
propertyPath: m_StaticEditorFlags
value: 2147483647
objectReference: {fileID: 0}
+ - target: {fileID: 2643746472421588985, guid: a10f9fe5b3ccfcb4e8d0c9fb8aadf1ad,
+ type: 3}
+ propertyPath: InitialModule.maxNumParticles
+ value: 50
+ objectReference: {fileID: 0}
- target: {fileID: 2726915014723381028, guid: a10f9fe5b3ccfcb4e8d0c9fb8aadf1ad,
type: 3}
propertyPath: m_Layer
@@ -3560,6 +3590,11 @@ PrefabInstance:
propertyPath: m_StaticEditorFlags
value: 2147483647
objectReference: {fileID: 0}
+ - target: {fileID: 2995653907225604758, guid: a10f9fe5b3ccfcb4e8d0c9fb8aadf1ad,
+ type: 3}
+ propertyPath: InitialModule.maxNumParticles
+ value: 50
+ objectReference: {fileID: 0}
- target: {fileID: 3032231123671698354, guid: a10f9fe5b3ccfcb4e8d0c9fb8aadf1ad,
type: 3}
propertyPath: m_Layer
@@ -3580,6 +3615,16 @@ PrefabInstance:
propertyPath: m_StaticEditorFlags
value: 2147483647
objectReference: {fileID: 0}
+ - target: {fileID: 3111290401281313933, guid: a10f9fe5b3ccfcb4e8d0c9fb8aadf1ad,
+ type: 3}
+ propertyPath: InitialModule.maxNumParticles
+ value: 50
+ objectReference: {fileID: 0}
+ - target: {fileID: 3189745538538973858, guid: a10f9fe5b3ccfcb4e8d0c9fb8aadf1ad,
+ type: 3}
+ propertyPath: InitialModule.maxNumParticles
+ value: 50
+ objectReference: {fileID: 0}
- target: {fileID: 3195705942048136131, guid: a10f9fe5b3ccfcb4e8d0c9fb8aadf1ad,
type: 3}
propertyPath: m_Layer
@@ -3745,6 +3790,11 @@ PrefabInstance:
propertyPath: m_StaticEditorFlags
value: 2147483647
objectReference: {fileID: 0}
+ - target: {fileID: 4281449299923232189, guid: a10f9fe5b3ccfcb4e8d0c9fb8aadf1ad,
+ type: 3}
+ propertyPath: InitialModule.maxNumParticles
+ value: 50
+ objectReference: {fileID: 0}
- target: {fileID: 4336807597110765197, guid: a10f9fe5b3ccfcb4e8d0c9fb8aadf1ad,
type: 3}
propertyPath: m_Layer
@@ -3820,6 +3870,11 @@ PrefabInstance:
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
+ - target: {fileID: 5275817385415783309, guid: a10f9fe5b3ccfcb4e8d0c9fb8aadf1ad,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 5275817385415783309, guid: a10f9fe5b3ccfcb4e8d0c9fb8aadf1ad,
type: 3}
propertyPath: m_StaticEditorFlags
@@ -4065,6 +4120,11 @@ PrefabInstance:
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
+ - target: {fileID: 7039734615616457527, guid: a10f9fe5b3ccfcb4e8d0c9fb8aadf1ad,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 7039734615616457527, guid: a10f9fe5b3ccfcb4e8d0c9fb8aadf1ad,
type: 3}
propertyPath: m_StaticEditorFlags
@@ -4185,6 +4245,11 @@ PrefabInstance:
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
+ - target: {fileID: 7503390424723436801, guid: a10f9fe5b3ccfcb4e8d0c9fb8aadf1ad,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 7503390424723436801, guid: a10f9fe5b3ccfcb4e8d0c9fb8aadf1ad,
type: 3}
propertyPath: m_StaticEditorFlags
@@ -4230,6 +4295,11 @@ PrefabInstance:
propertyPath: m_StaticEditorFlags
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 7769262952445371902, guid: a10f9fe5b3ccfcb4e8d0c9fb8aadf1ad,
+ type: 3}
+ propertyPath: InitialModule.maxNumParticles
+ value: 50
+ objectReference: {fileID: 0}
- target: {fileID: 7843896366877314018, guid: a10f9fe5b3ccfcb4e8d0c9fb8aadf1ad,
type: 3}
propertyPath: m_Layer
@@ -4280,6 +4350,11 @@ PrefabInstance:
propertyPath: m_StaticEditorFlags
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 8195461555316360515, guid: a10f9fe5b3ccfcb4e8d0c9fb8aadf1ad,
+ type: 3}
+ propertyPath: InitialModule.maxNumParticles
+ value: 50
+ objectReference: {fileID: 0}
- target: {fileID: 8212658914311620834, guid: a10f9fe5b3ccfcb4e8d0c9fb8aadf1ad,
type: 3}
propertyPath: m_Layer
@@ -4300,6 +4375,11 @@ PrefabInstance:
propertyPath: m_StaticEditorFlags
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 8285253963061482965, guid: a10f9fe5b3ccfcb4e8d0c9fb8aadf1ad,
+ type: 3}
+ propertyPath: InitialModule.maxNumParticles
+ value: 50
+ objectReference: {fileID: 0}
- target: {fileID: 8319417507571259705, guid: a10f9fe5b3ccfcb4e8d0c9fb8aadf1ad,
type: 3}
propertyPath: m_Layer
@@ -4320,6 +4400,11 @@ PrefabInstance:
propertyPath: m_StaticEditorFlags
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 8393405327078615634, guid: a10f9fe5b3ccfcb4e8d0c9fb8aadf1ad,
+ type: 3}
+ propertyPath: InitialModule.maxNumParticles
+ value: 50
+ objectReference: {fileID: 0}
- target: {fileID: 8393567289626639227, guid: a10f9fe5b3ccfcb4e8d0c9fb8aadf1ad,
type: 3}
propertyPath: m_Layer
@@ -4345,6 +4430,11 @@ PrefabInstance:
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
+ - target: {fileID: 8565888180607937789, guid: a10f9fe5b3ccfcb4e8d0c9fb8aadf1ad,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 8565888180607937789, guid: a10f9fe5b3ccfcb4e8d0c9fb8aadf1ad,
type: 3}
propertyPath: m_StaticEditorFlags
@@ -4395,6 +4485,11 @@ PrefabInstance:
propertyPath: m_StaticEditorFlags
value: 2147483647
objectReference: {fileID: 0}
+ - target: {fileID: 9164280407553040373, guid: a10f9fe5b3ccfcb4e8d0c9fb8aadf1ad,
+ type: 3}
+ propertyPath: InitialModule.maxNumParticles
+ value: 50
+ objectReference: {fileID: 0}
- target: {fileID: 9219434466564881889, guid: a10f9fe5b3ccfcb4e8d0c9fb8aadf1ad,
type: 3}
propertyPath: m_Layer
@@ -6743,7 +6838,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!4 &486593705
Transform:
m_ObjectHideFlags: 0
@@ -19208,6 +19303,7 @@ MonoBehaviour:
doorPos: {fileID: 1128989868}
pkPos: {fileID: 107388154}
gQPos: {fileID: 508421177}
+ endPkPos: []
doorAnim: {fileID: 330818048}
--- !u!1 &1318686166
GameObject:
diff --git a/Assets/_DefendNJ/Scripts/Manager/GameManager.cs b/Assets/_DefendNJ/Scripts/Manager/GameManager.cs
index 5df2546b..3b214551 100644
--- a/Assets/_DefendNJ/Scripts/Manager/GameManager.cs
+++ b/Assets/_DefendNJ/Scripts/Manager/GameManager.cs
@@ -506,7 +506,7 @@ public class GameManager : NetworkBehaviour
// curRoundIndex=5;
// roundInfo= RoundInfos[curRoundIndex];
StartEvent(roundInfo);
- if (roundIndex%5==0&&roundIndex!=0)
+ if (roundIndex==5)
{
CoroutineTaskManager.Instance.WaitSecondTodo(() =>
{
diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset
index 7f2d0ef5..44c18ac8 100644
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@@ -5,7 +5,7 @@ EditorBuildSettings:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Scenes:
- - enabled: 1
+ - enabled: 0
path: Assets/_DefendNJ/Scenes/Company1Floor.unity
guid: 386a8fdea01af8a4e8d4a9835407ddec
- enabled: 0
@@ -62,6 +62,9 @@ EditorBuildSettings:
- enabled: 0
path: Assets/_DefendNJ/Scenes/Yangzhou_Hanjiang_TansuoZhongxin_Waidai.unity
guid: 0fe651c1fb955904688361a328dc07f7
+ - enabled: 1
+ path: Assets/_DefendNJ/Scenes/Zhejiang_Shaoxing_Shengzhou_WuyueGuangchang.unity
+ guid: 526bb168d35701b4e93732c35c91281f
m_configObjects:
Unity.XR.PXR.Settings: {fileID: 11400000, guid: d0f8149c48842b4488cf6fb974cff9a2,
type: 2}
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index 8b02016c..d42a01c3 100644
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -13,7 +13,7 @@ PlayerSettings:
useOnDemandResources: 0
accelerometerFrequency: 60
companyName: pineappletech
- productName: "\u4FDD\u536B\u91D1\u9675_\u4F53\u9A8C"
+ productName: "\u4FDD\u536B\u91D1\u9675"
defaultCursor: {fileID: 0}
cursorHotspot: {x: 0, y: 0}
m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
@@ -163,7 +163,7 @@ PlayerSettings:
androidSupportedAspectRatio: 1
androidMaxAspectRatio: 2.1
applicationIdentifier:
- Android: com.pineappletech.defendnj.gongsi1lou
+ Android: com.pineappletech.defendnj.zhejiangshaoxingshengzhouwuyueguangchang
Standalone: com.DefaultCompany.com.unity.template.ar
buildNumber:
Standalone: 0