diff --git a/Assets/PlayFabEditorExtensions/Editor/Resources/.CloudScript.js b/Assets/PlayFabEditorExtensions/Editor/Resources/.CloudScript.js
index 83747f3fc..acdd18255 100644
--- a/Assets/PlayFabEditorExtensions/Editor/Resources/.CloudScript.js
+++ b/Assets/PlayFabEditorExtensions/Editor/Resources/.CloudScript.js
@@ -2574,6 +2574,24 @@ handlers.Save_NightmareResult = function(args)
     Set_JsonUserData(urod);
     return Get_Return(0);
 }
+handlers.Save_WaveResult = function(args)
+{
+    var readonlydata = Get_UserReadOnlyData();
+    var error = Get_Error(readonlydata, args.Token);
+    if (error < 0) return Get_Return(error);
+
+    var urod = Get_JsonUserData(readonlydata);
+    var table = Get_MissionTable();
+
+    var key = "d3_Nightmare";
+    if (!urod.Dungeon[key]) urod.Dungeon[key] = [0, 0, 0, 0];
+    if (urod.Dungeon[key][2] < args.Point) urod.Dungeon[key][2] = args.Point;
+
+    Add_MissionCount(table, urod, "CONTENTS_CLEAR", 4, 1);
+        
+    Set_JsonUserData(urod);
+    return Get_Return(0);
+}
 
 handlers.Save_Farm_PlantSeed = function(args)
 {
diff --git a/Assets/Res_Addr/Map/Map_Wave.prefab b/Assets/Res_Addr/Map/Map_Wave.prefab
index 3b2693db0..58298d041 100644
--- a/Assets/Res_Addr/Map/Map_Wave.prefab
+++ b/Assets/Res_Addr/Map/Map_Wave.prefab
@@ -75,6 +75,124 @@ Transform:
   m_Children: []
   m_Father: {fileID: 6249302636439080431}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &2612479255870920128
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5554362839176334892}
+  - component: {fileID: 4751868001998382702}
+  - component: {fileID: 1415360319204999104}
+  m_Layer: 0
+  m_Name: Directional Light (3)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &5554362839176334892
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2612479255870920128}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 1, z: 0, w: -0.00000004371139}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 6249302636439080431}
+  m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
+--- !u!108 &4751868001998382702
+Light:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2612479255870920128}
+  m_Enabled: 1
+  serializedVersion: 10
+  m_Type: 1
+  m_Shape: 0
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Intensity: 1
+  m_Range: 10
+  m_SpotAngle: 30
+  m_InnerSpotAngle: 21.80208
+  m_CookieSize: 10
+  m_Shadows:
+    m_Type: 1
+    m_Resolution: -1
+    m_CustomResolution: -1
+    m_Strength: 1
+    m_Bias: 0.05
+    m_NormalBias: 0.4
+    m_NearPlane: 0.2
+    m_CullingMatrixOverride:
+      e00: 1
+      e01: 0
+      e02: 0
+      e03: 0
+      e10: 0
+      e11: 1
+      e12: 0
+      e13: 0
+      e20: 0
+      e21: 0
+      e22: 1
+      e23: 0
+      e30: 0
+      e31: 0
+      e32: 0
+      e33: 1
+    m_UseCullingMatrixOverride: 0
+  m_Cookie: {fileID: 0}
+  m_DrawHalo: 0
+  m_Flare: {fileID: 0}
+  m_RenderMode: 0
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 8
+  m_RenderingLayerMask: 1
+  m_Lightmapping: 4
+  m_LightShadowCasterMode: 0
+  m_AreaSize: {x: 1, y: 1}
+  m_BounceIntensity: 1
+  m_ColorTemperature: 6570
+  m_UseColorTemperature: 0
+  m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
+  m_UseBoundingSphereOverride: 0
+  m_UseViewFrustumForShadowCasterCull: 1
+  m_ShadowRadius: 0
+  m_ShadowAngle: 0
+--- !u!114 &1415360319204999104
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2612479255870920128}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Version: 3
+  m_UsePipelineSettings: 1
+  m_AdditionalLightsShadowResolutionTier: 2
+  m_LightLayerMask: 1
+  m_RenderingLayers: 1
+  m_CustomShadowLayers: 0
+  m_ShadowLayerMask: 1
+  m_ShadowRenderingLayers: 1
+  m_LightCookieSize: {x: 1, y: 1}
+  m_LightCookieOffset: {x: 0, y: 0}
+  m_SoftShadowQuality: 0
 --- !u!1 &3229164287380462031
 GameObject:
   m_ObjectHideFlags: 0
@@ -226,6 +344,8 @@ Transform:
   - {fileID: 393386680976237403}
   - {fileID: 5390939297647397200}
   - {fileID: 8134882710772103361}
+  - {fileID: 214849779293906476}
+  - {fileID: 5554362839176334892}
   - {fileID: 4342598722647036496}
   - {fileID: 7898436642533971844}
   m_Father: {fileID: 0}
@@ -244,7 +364,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   material_skybox: {fileID: 2100000, guid: 3f698c5d47507d54db2dcb930054532e, type: 2}
   gos_map: []
-  go_nextchapter: {fileID: 0}
+  m_ChapterPortal: {fileID: 0}
   m_MapZoneData:
   - go_portal: {fileID: 1121419285893260204}
     CamRot_Portal: 0
@@ -371,6 +491,124 @@ MonoBehaviour:
   m_LightCookieSize: {x: 1, y: 1}
   m_LightCookieOffset: {x: 0, y: 0}
   m_SoftShadowQuality: 0
+--- !u!1 &9182601497221858520
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 214849779293906476}
+  - component: {fileID: 6967158742349274876}
+  - component: {fileID: 3691370063184306894}
+  m_Layer: 0
+  m_Name: Directional Light (2)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &214849779293906476
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9182601497221858520}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 6249302636439080431}
+  m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
+--- !u!108 &6967158742349274876
+Light:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9182601497221858520}
+  m_Enabled: 1
+  serializedVersion: 10
+  m_Type: 1
+  m_Shape: 0
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Intensity: 1
+  m_Range: 10
+  m_SpotAngle: 30
+  m_InnerSpotAngle: 21.80208
+  m_CookieSize: 10
+  m_Shadows:
+    m_Type: 1
+    m_Resolution: -1
+    m_CustomResolution: -1
+    m_Strength: 1
+    m_Bias: 0.05
+    m_NormalBias: 0.4
+    m_NearPlane: 0.2
+    m_CullingMatrixOverride:
+      e00: 1
+      e01: 0
+      e02: 0
+      e03: 0
+      e10: 0
+      e11: 1
+      e12: 0
+      e13: 0
+      e20: 0
+      e21: 0
+      e22: 1
+      e23: 0
+      e30: 0
+      e31: 0
+      e32: 0
+      e33: 1
+    m_UseCullingMatrixOverride: 0
+  m_Cookie: {fileID: 0}
+  m_DrawHalo: 0
+  m_Flare: {fileID: 0}
+  m_RenderMode: 0
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 8
+  m_RenderingLayerMask: 1
+  m_Lightmapping: 4
+  m_LightShadowCasterMode: 0
+  m_AreaSize: {x: 1, y: 1}
+  m_BounceIntensity: 1
+  m_ColorTemperature: 6570
+  m_UseColorTemperature: 0
+  m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
+  m_UseBoundingSphereOverride: 0
+  m_UseViewFrustumForShadowCasterCull: 1
+  m_ShadowRadius: 0
+  m_ShadowAngle: 0
+--- !u!114 &3691370063184306894
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9182601497221858520}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Version: 3
+  m_UsePipelineSettings: 1
+  m_AdditionalLightsShadowResolutionTier: 2
+  m_LightLayerMask: 1
+  m_RenderingLayers: 1
+  m_CustomShadowLayers: 0
+  m_ShadowLayerMask: 1
+  m_ShadowRenderingLayers: 1
+  m_LightCookieSize: {x: 1, y: 1}
+  m_LightCookieOffset: {x: 0, y: 0}
+  m_SoftShadowQuality: 0
 --- !u!1001 &6560547417477919576
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -379,6 +617,186 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 6249302636439080431}
     m_Modifications:
+    - target: {fileID: 63710039096442744, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 126666265676881859, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 360014335285308406, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 422621286185153247, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 471367095268526957, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 490943795831316746, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 552992061147397012, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 593636463524273675, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 976957461525636100, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1004464736354189911, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1101191289352819948, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1149266981160020826, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1185685154488348279, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1188471741843715034, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1239766190022070297, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1241392983297004380, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1438633930920854644, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1752410827085552556, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1933392013186230648, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1965407459776767152, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2115194056130603171, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2193300128241159761, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2205995889883140271, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2338134968491178374, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2486093165784052391, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2502655636965074813, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2748650205715430648, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2822575616989145868, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3061884877488456007, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3088035208379685508, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3187650009042540558, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3525588986970422809, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3609370245891953978, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3725692175091264305, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3831832757295149148, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3842501493026165103, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 3933715443776890076, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -429,11 +847,266 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 4154228925490814231, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4186119071557254788, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4233021408815027982, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4377938163802567131, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4397268348434408161, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4638274213949302540, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4643981209976846375, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4724521780895568263, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4834626707344608693, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4853269745201178639, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5146586815187255253, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5157532068674677160, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5201504146381602689, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5449449925984310597, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5456794983573647714, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5459422070406695281, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5559012202776127623, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5982275597937233494, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6033928329271419317, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6145307528915165724, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6285044862678757595, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6332686337090716998, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6341022998445356209, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6348598759301163091, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 6519324125568224569, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
         type: 3}
       propertyPath: m_Name
       value: Map_Content_01_Obj
       objectReference: {fileID: 0}
+    - target: {fileID: 6550812870561137740, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6748482970190544209, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6797968326507596683, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6972485286546614412, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7014704487289530609, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7073785086218734772, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7178709181960938464, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7300440600160938795, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7348560519952595207, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7415597206323128710, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7419136559730554382, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7427231781359992437, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7540480920204481325, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7541856832508001157, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7694801771901702968, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7845709816880052582, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8037139832886391191, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8220995661856228787, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8304141820199321011, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8780551112266866477, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8807981798559839649, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8847882545149953046, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8881949754193391000, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8887011816631641612, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8994093484634101737, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 9131658006117143418, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 9157912050309679219, guid: 8b4429e019ad2cb4b81c3f413ae9aa98,
+        type: 3}
+      propertyPath: m_NavMeshLayer
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
diff --git a/Assets/Scenes/Map_Wave.unity b/Assets/Scenes/Map_Wave.unity
index 0cbfafd8e..788e43c0e 100644
--- a/Assets/Scenes/Map_Wave.unity
+++ b/Assets/Scenes/Map_Wave.unity
@@ -153,7 +153,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 257fffff46c7ccd4294e887c06fc9c5a, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  go_Camera: {fileID: 0}
   LoadSceneName: Map_Wave
   LoadMapPrefab: Assets/Res_Addr/Map/Map_Wave.prefab
 --- !u!4 &723760620
diff --git a/Assets/Scenes/Map_Wave/NavMesh.asset b/Assets/Scenes/Map_Wave/NavMesh.asset
index f1b96e79c..f7d7e0fd8 100644
Binary files a/Assets/Scenes/Map_Wave/NavMesh.asset and b/Assets/Scenes/Map_Wave/NavMesh.asset differ
diff --git a/Assets/Script/Server/ServerInfo.cs b/Assets/Script/Server/ServerInfo.cs
index 83994f177..b8784b107 100644
--- a/Assets/Script/Server/ServerInfo.cs
+++ b/Assets/Script/Server/ServerInfo.cs
@@ -992,6 +992,36 @@ public class ServerInfo : MyCoroutine
                 Set_Coroutine(() => { Save_NightmareResult(dmg, _act); }, 2f);
             });
     }
+    public void Save_WaveResult(int point, Action _act)
+    {
+        NetWait.Ins.Set(true);
+        PlayFabClientAPI.ExecuteCloudScript(new ExecuteCloudScriptRequest
+        {
+            FunctionName = MethodBase.GetCurrentMethod().Name,
+            GeneratePlayStreamEvent = true,
+            FunctionParameter = new
+            {
+                Token = m_LoginInfo.EntityToken.EntityToken,
+                Point = point,
+            }
+        },
+            result =>
+            {
+                if (result.Error == null)
+                {
+                    NetWait.Ins.Set(false);
+                    var str_result = result.FunctionResult.ToString();
+                    var error = MyErrorCheck(str_result);
+                    _act?.Invoke();
+                }
+                else
+                    Set_Coroutine(() => { Save_WaveResult(point, _act); }, 2f);
+            },
+            fail =>
+            {
+                Set_Coroutine(() => { Save_WaveResult(point, _act); }, 2f);
+            });
+    }
 
     public void Save_PC_MenuBack(int costumeid, int workerid, int jobid, CS_AwakenData awakenData,
                                  LimitSlotChangeData limitslotData, Action<SC_PCMenuBackResult> _act)
diff --git a/Assets/Script/UI/Ingame/Dungeon/DungeonResult_Wave.cs b/Assets/Script/UI/Ingame/Dungeon/DungeonResult_Wave.cs
index 3061c82af..9c554d8bf 100644
--- a/Assets/Script/UI/Ingame/Dungeon/DungeonResult_Wave.cs
+++ b/Assets/Script/UI/Ingame/Dungeon/DungeonResult_Wave.cs
@@ -19,6 +19,9 @@ public class DungeonResult_Wave : DungeonResultBase
         }
 
         sdata.Add_MissionCount(ePurpose.CONTENTS_CLEAR, 4);
-        ServerInfo.Ins.Write(null);
+        ServerInfo.Ins.Save_WaveResult(afterpoint, () =>
+        {
+            gos[0].SetActive(true);
+        });
     }
 }
\ No newline at end of file