V34

.gitignore

@@ -116,4 +116,5 @@ nekoyume/Assets/PackageExtensions/Mixpanel/Resources/MixpanelClientHost.txt
 nekoyume/Assets/PackageExtensions/Mixpanel/Resources/MixpanelClientHost.txt.meta
 
 # Extra Assets
-/nekoyume/Assets/JMO Assets*
+/nekoyume/Assets/JMO Assets*
+/nekoyume/Assets/_Scripts/PandoraBox/Scripts/DataBase/*

nekoyume/Assets/_Scripts/Game/Game.cs

@@ -73,7 +73,7 @@ public class Game : MonoSingleton<Game>
 
         public NineChroniclesAPIClient ApiClient => _apiClient;
 
-        private CommandLineOptions _options;
+        public CommandLineOptions _options;
 
         private AmazonCloudWatchLogsClient _logsClient;
 

nekoyume/Assets/_Scripts/Lib9c/Lib9c.asmdef

@@ -3,8 +3,7 @@
     "rootNamespace": "",
     "references": [
         "GUID:560b04d1a97f54a4e82edc0cbbb69285",
-        "GUID:58d90f5b41017bf73b0b911dff04815c",
-        "GUID:ead4dbbb3a716294291e45b1699f2611"
+        "GUID:58d90f5b41017bf73b0b911dff04815c"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

nekoyume/Assets/_PandoraBox/Prefabs/GameMain/PandoraSettingsLayer.prefab → nekoyume/Assets/_Scripts/PandoraBox/Prefabs/GameMain/PandoraSettingsLayer.prefab

@@ -2288,6 +2288,141 @@ MonoBehaviour:
   m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!1 &4695569190555683005
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5880170458917370526}
+  - component: {fileID: 3396486394464258520}
+  - component: {fileID: 7430147703619415695}
+  m_Layer: 5
+  m_Name: TitleText (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5880170458917370526
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4695569190555683005}
+  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_Children: []
+  m_Father: {fileID: 8152066484925709660}
+  m_RootOrder: 6
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -12, y: -412}
+  m_SizeDelta: {x: -84, y: 24}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &3396486394464258520
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4695569190555683005}
+  m_CullTransparentMesh: 0
+--- !u!114 &7430147703619415695
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4695569190555683005}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_text: 'Connected Node: '
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: 8a682b7747d4a664089b7b1065aa0035, type: 2}
+  m_sharedMaterial: {fileID: -2364689171920820918, guid: 8a682b7747d4a664089b7b1065aa0035,
+    type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 4287146495
+  m_fontColor: {r: 1, g: 0.66400135, b: 0.5330188, a: 1}
+  m_enableVertexGradient: 0
+  m_colorMode: 3
+  m_fontColorGradient:
+    topLeft: {r: 1, g: 1, b: 1, a: 1}
+    topRight: {r: 1, g: 1, b: 1, a: 1}
+    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+    bottomRight: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColorGradientPreset: {fileID: 0}
+  m_spriteAsset: {fileID: 0}
+  m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: -1183493901
+  m_overrideHtmlColors: 0
+  m_faceColor:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontSize: 15
+  m_fontSizeBase: 15
+  m_fontWeight: 400
+  m_enableAutoSizing: 0
+  m_fontSizeMin: 8
+  m_fontSizeMax: 32
+  m_fontStyle: 33
+  m_HorizontalAlignment: 1
+  m_VerticalAlignment: 512
+  m_textAlignment: 65535
+  m_characterSpacing: 0
+  m_wordSpacing: 0
+  m_lineSpacing: 0
+  m_lineSpacingMax: 0
+  m_paragraphSpacing: 0
+  m_charWidthMaxAdj: 0
+  m_enableWordWrapping: 1
+  m_wordWrappingRatios: 0.4
+  m_overflowMode: 0
+  m_linkedTextComponent: {fileID: 0}
+  parentLinkedComponent: {fileID: 0}
+  m_enableKerning: 1
+  m_enableExtraPadding: 0
+  checkPaddingRequired: 0
+  m_isRichText: 1
+  m_parseCtrlCharacters: 1
+  m_isOrthographic: 1
+  m_isCullingEnabled: 0
+  m_horizontalMapping: 0
+  m_verticalMapping: 0
+  m_uvLineOffset: 0
+  m_geometrySortingOrder: 0
+  m_IsTextObjectScaleStatic: 0
+  m_VertexBufferAutoSizeReduction: 1
+  m_useMaxVisibleDescender: 1
+  m_pageToDisplay: 1
+  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_isUsingLegacyAnimationComponent: 0
+  m_isVolumetricText: 0
+  m_hasFontAssetChanged: 0
+  m_baseMaterial: {fileID: 0}
+  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
 --- !u!1 &4816873231728102636
 GameObject:
   m_ObjectHideFlags: 0
@@ -5490,6 +5625,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 08aa69525c3b06c4191127c316a07cf3, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  nodeText: {fileID: 7430147703619415695}
   timeImage: {fileID: 8152066483889542889}
   blockImage: {fileID: 8152066484379650476}
   bothImage: {fileID: 954842211711085118}
@@ -6829,6 +6965,7 @@ RectTransform:
   - {fileID: 8152066484581777565}
   - {fileID: 8152066485282711691}
   - {fileID: 8152066483933935737}
+  - {fileID: 5880170458917370526}
   m_Father: {fileID: 8152066484397960445}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

nekoyume/Assets/_PandoraBox/Scripts/IntroCheck.cs → nekoyume/Assets/_Scripts/PandoraBox/Scripts/IntroCheck.cs

@@ -3,7 +3,7 @@
 using UnityEngine;
 using TMPro;
 
-namespace PandoraBox
+namespace Nekoyume.PandoraBox
 {
     public class IntroCheck : MonoBehaviour
     {

nekoyume/Assets/_PandoraBox/PandoraRaid.cs → nekoyume/Assets/_Scripts/PandoraBox/Scripts/PandoRaid/PandoraRaid.cs

@@ -1,20 +1,19 @@
-using System;
 using System.Collections;
 using System.Linq;
 using Nekoyume.BlockChain;
-using Nekoyume.Game;
-using Nekoyume.Game.Character;
 using Nekoyume.State;
 using TMPro;
 using UnityEngine;
-using Nekoyume.Model.Mail;
-using Nekoyume.UI;
-using Nekoyume.UI.Tween;
 using UnityEngine.UI;
-using Nekoyume.UI.Scroller;
+using Nekoyume.Model.Mail;
 
-namespace PandoraBox
+namespace Nekoyume.PandoraBox
 {
+    using Nekoyume.UI;
+    using Nekoyume.UI.Scroller;
+    using Nekoyume.UI.Tween;
+    using UniRx;
+
     public class PandoraRaid : MonoBehaviour
     {
         [SerializeField]
@@ -35,7 +34,7 @@ public class PandoraRaid : MonoBehaviour
         [SerializeField]
         TextMeshProUGUI CurrentTriesText = null;
 
-        private Player _player;
+        private Game.Character.Player _player;
 
         bool isBusy = false;
 
@@ -109,7 +108,7 @@ public void StartRaid()
                 int tries = ((int)(States.Instance.CurrentAvatarState.actionPoint / 5));
 
                 PandoraBoxMaster.CurrentPanPlayer = PandoraBoxMaster.GetPanPlayer(States.Instance.CurrentAvatarState.agentAddress.ToString());
-                if (PandoraBoxMaster.CurrentPanPlayer.PremiumEndBlock > Game.instance.Agent.BlockIndex)
+                if (PandoraBoxMaster.CurrentPanPlayer.PremiumEndBlock > Game.Game.instance.Agent.BlockIndex)
                 {
                     StartCoroutine(Raid(int.Parse(CurrentTriesManual.text)));
                 }
@@ -128,17 +127,18 @@ public void StartRaid()
 
         IEnumerator Raid(int count)
         {
+
             isBusy = true;
             RotateShape.SetActive(true);
             StageIDText.interactable = false;
             RaidButton.GetComponent<Image>().color = Color.red;
             RaidButtonText.text = "Cancel!";
             float AllowedCooldown = 3f; //save it to settings
 
+            //yield return new WaitForSeconds(AllowedCooldown);
             yield return new WaitForSeconds(AllowedCooldown);
-            _player = Game.instance.Stage.GetPlayer();
-            yield return new WaitForSeconds(AllowedCooldown);
-            var stage = Game.instance.TableSheets.StageSheet.Values.FirstOrDefault(i => i.Id == int.Parse(StageIDText.text));
+            _player = Game.Game.instance.Stage.GetPlayer();
+            var stage = Game.Game.instance.TableSheets.StageSheet.Values.FirstOrDefault(i => i.Id == int.Parse(StageIDText.text));
 
             int worldID = 0;
             if (stage.Id < 51)
@@ -155,14 +155,18 @@ IEnumerator Raid(int count)
             int _requiredCost = stage.CostAP;
 
 
-            bool RaidMethodIsSweep = Convert.ToBoolean(PlayerPrefs.GetInt("_PandoraBox_PVE_RaidMethodIsSweep", 0));
+            //bool RaidMethodIsSweep = Convert.ToBoolean(PlayerPrefs.GetInt("_PandoraBox_PVE_RaidMethodIsSweep", 0));
+            bool RaidMethodIsSweep = PandoraBoxMaster.Instance.Settings.RaidMethodIsSweep;
 
             if (!isBusy)
                 yield break;
 
             if (!RaidMethodIsSweep)
             {
-                Game.instance.ActionManager.HackAndSlash(_player, worldID, stage.Id, count).Subscribe();
+                LocalLayerModifier.ModifyAvatarActionPoint(States.Instance.CurrentAvatarState.address, -_requiredCost);
+                ActionRenderHandler.Instance.Pending = true;
+                Game.Game.instance.ActionManager.HackAndSlash(_player, worldID, stage.Id, count).Subscribe();
+                //Game.instance.ActionManager.HackAndSlash(_player, worldID, stage.Id, count).Subscribe();
                 OneLineSystem.Push(MailType.System, "<color=green>Pandora Box</color>: Raiding Stage <color=red>" + stage.Id
                 + "</color> (<color=green>" + count + "</color>) times Completed!", NotificationCell.NotificationType.Information);
             }
@@ -173,7 +177,9 @@ IEnumerator Raid(int count)
                     if (!isBusy)
                         yield break;
                     RaidButtonText.text = $"(<color=green>{count- (i+1)}</color>)Cancel!";
-                    Game.instance.ActionManager.HackAndSlash(_player, worldID, stage.Id, 1).Subscribe();
+                    LocalLayerModifier.ModifyAvatarActionPoint(States.Instance.CurrentAvatarState.address,-_requiredCost);
+                    ActionRenderHandler.Instance.Pending = true;
+                    Game.Game.instance.ActionManager.HackAndSlash(_player, worldID, stage.Id, 1).Subscribe();
 
                     OneLineSystem.Push(MailType.System, "<color=green>Pandora Box</color>: Raiding Stage <color=red>" + stage.Id
                         + "</color> <color=green>" + (i + 1) + "</color>/" + count + "...", NotificationCell.NotificationType.Information);