diff --git a/Assets/Res_Addr/MainUI/NewGameUI.prefab b/Assets/Res_Addr/MainUI/NewGameUI.prefab index 63e52ef29..adbe18cea 100644 --- a/Assets/Res_Addr/MainUI/NewGameUI.prefab +++ b/Assets/Res_Addr/MainUI/NewGameUI.prefab @@ -41865,7 +41865,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6415367922768528216} - - component: {fileID: 3003035928386648149} + - component: {fileID: 669862290253167327} m_Layer: 5 m_Name: TopRightMoney m_TagString: Untagged @@ -41894,7 +41894,7 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &3003035928386648149 +--- !u!114 &669862290253167327 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -41903,10 +41903,10 @@ MonoBehaviour: m_GameObject: {fileID: 3340698869356713028} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cc30b105a4b475440840fcb059c719dc, type: 3} + m_Script: {fileID: 11500000, guid: e2c4ec8b65ce4c04e8c936b03041727d, type: 3} m_Name: m_EditorClassIdentifier: - moneyForms: + moneys: - {fileID: 5368538365786500580} - {fileID: 1765611427192416519} --- !u!1 &3352638603616735713 diff --git a/Assets/Script/Character/Mob/MobActor.cs b/Assets/Script/Character/Mob/MobActor.cs index 2b96e17fe..aa3ca5bb9 100644 --- a/Assets/Script/Character/Mob/MobActor.cs +++ b/Assets/Script/Character/Mob/MobActor.cs @@ -393,15 +393,7 @@ public class MobActor : Actor var sdata = ServerInfo.Ins.m_ServerData; if (n_Reincarnation <= 0) { - if (MyValue.MyChoiceMapData.Get_MapData().e_Dungeon == eDungeon.d4_Wave) - { - DungeonInfo.Ins.Add_WaveScore(1); // TODO 정인호 : 웨이브 점수 - DungeonInfo.Ins.Add_WaveGold(10); // TODO 정인호 : 웨이브 골드 - } - else - { - DropItemInfo.Ins.Drop_DropItem(2, m_MonsterAppearData.n_DropGold, Get_position()); - } + DropItemInfo.Ins.Drop_DropItem(2, m_MonsterAppearData.n_DropGold, Get_position()); sdata.Add_CollectionMobKill(m_MonsterTableData.n_MonsterID); } base.Set_Die(); diff --git a/Assets/Script/DropItem/DropItem.cs b/Assets/Script/DropItem/DropItem.cs index c329a9f89..5fa7a94c9 100644 --- a/Assets/Script/DropItem/DropItem.cs +++ b/Assets/Script/DropItem/DropItem.cs @@ -103,7 +103,21 @@ public class DropItem : ProjectileBase var sdata = ServerInfo.Ins.m_ServerData; var statdata = touchActor.Get_StatInfo(); - // TODO 정인호 : 아이템 지급 코드 필요 (웨이브와 아닌 경우) + if (MyValue.MyChoiceMapData.Get_MapData().e_Dungeon == eDungeon.d4_Wave) + { + DungeonInfo.Ins.Add_WaveScore(1); // TODO 정인호 : 웨이브 점수 + DungeonInfo.Ins.Add_WaveGold(10); // TODO 정인호 : 웨이브 골드 + } + else + { + if (m_itemid == 2) + { + m_itemamount += (int)statdata.Get_Stat(eStat.GOLD_INCREASE); + m_itemamount += (int)(m_itemamount * + (statdata.Get_Stat(eStat.GOLD_Multiplier) + statdata.Get_Stat(eStat.Battle_GOLD_Multiplier))); + } + sdata.Add_Item(m_itemid, _itemamount); + } InGameInfo.Ins.Show_Effect("Effect_GetCoin", transform.position); gameObject.SetActive(false); diff --git a/Assets/Script/Server/ServerClass.cs b/Assets/Script/Server/ServerClass.cs index 40c607489..ded828d36 100644 --- a/Assets/Script/Server/ServerClass.cs +++ b/Assets/Script/Server/ServerClass.cs @@ -1686,8 +1686,7 @@ public partial class ServerData Item[key][1].RandomizeCryptoKey(); } - if (!DSUtil.CheckNull(TopMoney.Ins)) - TopMoney.Ins.Set(); + if (TopMoney.isIns) TopMoney.Ins.Set(); } break; case eItem.Exp: @@ -1853,8 +1852,7 @@ public partial class ServerData Item[key][1].RandomizeCryptoKey(); } - if (!DSUtil.CheckNull(TopMoney.Ins)) - TopMoney.Ins.Set(); + if (TopMoney.isIns) TopMoney.Ins.Set(); break; case eItem.Weapon: @@ -1911,13 +1909,9 @@ public partial class ServerData Item[key][0].RandomizeCryptoKey(); Item[key][2] += amonut; Item[key][2].RandomizeCryptoKey(); - - if (!DSUtil.CheckNull(TopMoney.Ins)) - TopMoney.Ins.Set(); } - if (!DSUtil.CheckNull(TopMoney.Ins)) - TopMoney.Ins.Set(); + if (TopMoney.isIns) TopMoney.Ins.Set(); break; case eItem.Weapon: @@ -2028,8 +2022,7 @@ public partial class ServerData Item[key][2] += amonut; Item[key][2].RandomizeCryptoKey(); - if (!DSUtil.CheckNull(TopMoney.Ins)) - TopMoney.Ins.Set(); + if (TopMoney.isIns) TopMoney.Ins.Set(); } else if (Equipment.ContainsKey(key)) { diff --git a/Assets/Script/UI/Common/MoneyForm.cs b/Assets/Script/UI/Common/MoneyForm.cs index 26ee327f3..a2d2c7486 100644 --- a/Assets/Script/UI/Common/MoneyForm.cs +++ b/Assets/Script/UI/Common/MoneyForm.cs @@ -1,5 +1,3 @@ -using System.Collections; -using System.Collections.Generic; using TMPro; using UnityEngine; using UnityEngine.UI; diff --git a/Assets/Script/UI/Common/TopMoney.cs b/Assets/Script/UI/Common/TopMoney.cs index 0b222c77b..4e2b339dd 100644 --- a/Assets/Script/UI/Common/TopMoney.cs +++ b/Assets/Script/UI/Common/TopMoney.cs @@ -1,6 +1,4 @@ using System.Collections; -using System.Collections.Generic; -using TMPro; using UnityEngine; public class TopMoney : MonoBehaviourSingletonTemplate @@ -9,7 +7,16 @@ public class TopMoney : MonoBehaviourSingletonTemplate private void OnEnable() { - Set(); + StartCoroutine(Co_Update()); + } + + IEnumerator Co_Update() + { + while (true) + { + Set(); + yield return new WaitForSeconds(1f); + } } public void Set() diff --git a/Assets/Script/UI/Lobby.meta b/Assets/Script/UI/Lobby.meta deleted file mode 100644 index b16c6b34f..000000000 --- a/Assets/Script/UI/Lobby.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d42b2ef0b25cab94881b7731770e0bbe -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Script/UI/Lobby/Lobby_TopRightMoney.cs b/Assets/Script/UI/Lobby/Lobby_TopRightMoney.cs deleted file mode 100644 index 41792bfa7..000000000 --- a/Assets/Script/UI/Lobby/Lobby_TopRightMoney.cs +++ /dev/null @@ -1,16 +0,0 @@ -public class Lobby_TopRightMoney : MyCoroutine -{ - public MoneyForm[] moneyForms; - - private void Start() - { - Set_Money(); - Set_Repeat_for1sec(Set_Money); - } - - void Set_Money() - { - moneyForms[0].Set(1); - moneyForms[1].Set(2); - } -} \ No newline at end of file diff --git a/Assets/Script/UI/Lobby/Lobby_TopRightMoney.cs.meta b/Assets/Script/UI/Lobby/Lobby_TopRightMoney.cs.meta deleted file mode 100644 index 263f53783..000000000 --- a/Assets/Script/UI/Lobby/Lobby_TopRightMoney.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: cc30b105a4b475440840fcb059c719dc -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: