Save_MazeResult

Assets/PlayFabEditorExtensions/Editor/Resources/.CloudScript.js

@@ -2508,7 +2508,7 @@ handlers.Save_MimicResult = function(args)
             if (!urod.Dungeon[key]) urod.Dungeon[key] = [0, 0, 0, 0];
             if (urod.Dungeon[key][0] < args.Lv) ++urod.Dungeon[key][0];
 
-            Add_MissionCount(table, urod, "CONTENTS_CLEAR", 0, 1);
+            Add_MissionCount(table, urod, "CONTENTS_CLEAR", 1, 1);
         }
         
         Set_JsonUserData(urod);
@@ -2516,6 +2516,28 @@ handlers.Save_MimicResult = function(args)
     }
     return Get_Return(1);
 }
+handlers.Save_MazeResult = 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();
+
+    if (Use_Item(table, urod, 502, 1))
+    {
+        var key = "d2_Maze";
+        if (!urod.Dungeon[key]) urod.Dungeon[key] = [0, 0, 0, 0];
+        if (urod.Dungeon[key][0] < args.NextFloor) urod.Dungeon[key][0] = args.NextFloor;
+
+        Add_MissionCount(table, urod, "CONTENTS_CLEAR", 2, 1);
+        
+        Set_JsonUserData(urod);
+        return Get_Return(0);
+    }
+    return Get_Return(1);
+}
 
 handlers.Save_Farm_PlantSeed = function(args)
 {

Assets/Script/Character/Actor.cs

@@ -328,6 +328,8 @@ public class Actor : MyCoroutine
     public virtual void Set_Stat_SelectSkill(SelectSkillTableData _sstd) { }
 
     public virtual void Stop(bool _stop)
+    {
+        if (gameObject.activeInHierarchy)
         {
             if (IsStop && !_stop)
             {
@@ -342,6 +344,7 @@ public class Actor : MyCoroutine
                 Play_Idle();
             }
         }
+    }
 
     public void Set_AttackCoolTime(float _rate)
     {

Assets/Script/Character/Mob/BossMobActor.cs

@@ -85,7 +85,6 @@ public class BossMobActor : MobActor
 
     protected override void Set_Die()
     {
-        base.Set_Die();
         Init(true, true);
         if (n_Reincarnation <= 0)
         {
@@ -93,6 +92,7 @@ public class BossMobActor : MobActor
             foreach (var item in dic_indicator) // 모든 인디케이터 끄기
                 item.Value.SetActive(false);
         }
+        base.Set_Die();
     }
 
     protected override void On_NavMeshAgent()

Assets/Script/Character/Projectile/Projectile/ProjectileWaveControl.cs

@@ -7,8 +7,12 @@ public class ProjectileWaveControl : MonoBehaviour
 
     private void OnEnable()
     {
-        Debug.Log("웨이브 시작 1");
+        //Debug.Log("웨이브 시작 1");
         DSUtil.InActivateGameObjects(gos_wave, 0);
-        CoroutineMgr.Ins.Set_Coroutine(() => { Debug.Log("웨이브 시작 2"); gos_wave[1].SetActive(true); }, nextWaveDelayTime);
+        CoroutineMgr.Ins.Set_Coroutine(() =>
+        {
+            //Debug.Log("웨이브 시작 2");
+            gos_wave[1].SetActive(true);
+        }, nextWaveDelayTime);
     }
 }

Assets/Script/Info/DungeonInfo.cs

@@ -111,7 +111,7 @@ public class DungeonInfo : MonoBehaviourSingletonTemplate<DungeonInfo>
     void Set_MobDie(int mobid)
     {
         ++m_DieCount;
-        act_MobDieCount?.Invoke(m_DieCount);
+        act_MobDieCount?.Invoke(mobid);
         if (m_DieCount == m_MaxDieMobCount)
         {
             bTotalTimeUpdate = false;

Assets/Script/Server/ServerInfo.cs

@@ -894,6 +894,40 @@ public class ServerInfo : MyCoroutine
                 Set_Coroutine(() => { Save_MimicResult(win, lv, _act); }, 2f);
             });
     }
+    public void Save_MazeResult(int nextfloor, Action<int> _act)
+    {
+        NetWait.Ins.Set(true);
+        PlayFabClientAPI.ExecuteCloudScript(new ExecuteCloudScriptRequest
+        {
+            FunctionName = MethodBase.GetCurrentMethod().Name,
+            GeneratePlayStreamEvent = true,
+            FunctionParameter = new
+            {
+                Token = m_LoginInfo.EntityToken.EntityToken,
+                NextFloor = nextfloor,
+            }
+        },
+            result =>
+            {
+                if (result.Error == null)
+                {
+                    NetWait.Ins.Set(false);
+                    var str_result = result.FunctionResult.ToString();
+                    var error = MyErrorCheck(str_result);
+                    switch (error)
+                    {
+                        case 1: ToastUI.Ins.Set(999900045); break;
+                    }
+                    _act?.Invoke(error);
+                }
+                else
+                    Set_Coroutine(() => { Save_MazeResult(nextfloor, _act); }, 2f);
+            },
+            fail =>
+            {
+                Set_Coroutine(() => { Save_MazeResult(nextfloor, _act); }, 2f);
+            });
+    }
 
     public void Save_PC_MenuBack(int costumeid, int workerid, int jobid, CS_AwakenData awakenData,
                                  LimitSlotChangeData limitslotData, Action<SC_PCMenuBackResult> _act)

Assets/Script/UI/Ingame/Dungeon/DungeonResult_Maze.cs

@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using TMPro;
 
 public class DungeonResult_Maze : DungeonResultBase
 {
@@ -15,9 +14,12 @@ public class DungeonResult_Maze : DungeonResultBase
         rewards[0].Set(list_reward[0]);
         rewards[1].Set(list_reward[1]);
 
-        if (nextFloor > curFloor)
+        ServerInfo.Ins.Save_MazeResult(nextFloor, error =>
+        {
+            if (error == 0 && nextFloor > curFloor)
             {
                 sdata.Set_DungeonLv(eDungeon.d2_Maze, nextFloor);
+                sdata.Add_MissionCount(ePurpose.CONTENTS_CLEAR, 2);
 
                 var maxTime = MyValue.MyChoiceMapData.Get_DungeonMapData_orNull().f_Time;
                 var floorTime = DungeonInfo.Ins.Get_Time(nextFloor);
@@ -25,7 +27,7 @@ public class DungeonResult_Maze : DungeonResultBase
                     new List<string> { nextFloor.ToString(), ((int)(maxTime - floorTime)).ToString(), "0" });
             }
 
-        sdata.Add_MissionCount(ePurpose.CONTENTS_CLEAR, 2);
+            gos[0].SetActive(true);
-        ServerInfo.Ins.Write(null, false);
+        });
     }
 }

Assets/Script/UI/Ingame/Dungeon/Ingame_Maze.cs

@@ -1,4 +1,5 @@
 using TMPro;
+using UnityEngine;
 
 public class Ingame_Maze : Ingame_DungeonBase
 {
@@ -12,6 +13,8 @@ public class Ingame_Maze : Ingame_DungeonBase
 
     public override void Add_MobCount(int mobid)
     {
+        //var mobdata = table_monsterlist.Ins.Get_Data_orNull(mobid);
+        //Debug.Log(mobdata.e_MonsterType + " : " + mobdata.Get_Name());
         ++MobCount;
         texts[0].text = (MaxMobCount - MobCount).ToString();
     }

Assets/Script/UI/Ingame/MonsterSimpleInfo.cs

@@ -15,7 +15,17 @@ public class MonsterSimpleInfo : MonoBehaviourSingletonTemplate<MonsterSimpleInf
     Actor m_Actor;
 
     private void Start() { Off(); }
-    public void Off() { go_child.SetActive(false); m_Actor = null; isActor = false; m_IngameBuffDebuffBase.AllOff(); }
+    public void Off()
+    {
+        if (isActor && m_Actor.IsRole(eRole.Mob) && m_Actor.IsSubRole(eSubRol.Boss))
+            MyValue.m_RealCamera.Set_LockTarget(null);
+
+        go_child.SetActive(false);
+        m_Actor = null;
+        isActor = false;
+        m_IngameBuffDebuffBase.AllOff();
+        
+    }
 
     public void Set(Actor actor)
     {

Assets/Script/Util/MyValue.cs

@@ -964,11 +964,15 @@ public class ActorStatInfo
             var keys = dic_StatValue.Keys.ToList();
             foreach (var key in keys)
             {
-                dic_StatValue[key] += dic_StatValue[key] * (lv * MyValue.MyChoiceMapData.Get_DungeonMapData_orNull().f_Increase);
+                if (key == eStat.ATK_Multiplier || key == eStat.HP_Multiplier)
+                {
+                    //dic_StatValue[key] += dic_StatValue[key] * (lv * MyValue.MyChoiceMapData.Get_DungeonMapData_orNull().f_Increase);
+                    dic_StatValue[key] += lv * MyValue.MyChoiceMapData.Get_DungeonMapData_orNull().f_Increase;
                     dic_StatValue[key].RandomizeCryptoKey();
                 }
             }
         }
+    }
     public void Set_Wave(int iteration)
     {
         if (MyValue.MyChoiceMapData.Get_MapData().e_Dungeon == eDungeon.d4_Wave)