미믹 던전 인게임 내 정보
This commit is contained in:
parent
7e2df126c1
commit
27a6b995be
|
|
@ -51,3 +51,6 @@ messageinfo 엄청 느린 버그
|
||||||
추가 컨텐츠 (미믹 던전)
|
추가 컨텐츠 (미믹 던전)
|
||||||
- 추가 컨텐츠 서버 정보 (몇 스텝까지 클리어했는 가?)
|
- 추가 컨텐츠 서버 정보 (몇 스텝까지 클리어했는 가?)
|
||||||
- 입장권 매일 충전 : 2장까지 충전, 단 2장이상 가지고 있으면 충전 안됨
|
- 입장권 매일 충전 : 2장까지 충전, 단 2장이상 가지고 있으면 충전 안됨
|
||||||
|
- 기본 공격 시 주변에 몹이 있다면 몹을 바라보게
|
||||||
|
- 펫 왜 공격 안하냐
|
||||||
|
- 미믹 던전 클리어 후 다음 레벨로
|
||||||
|
|
@ -1779,10 +1779,10 @@ RectTransform:
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 5809321694354080930}
|
m_Father: {fileID: 5809321694354080930}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 100, y: 100}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!1 &207571553245711454
|
--- !u!1 &207571553245711454
|
||||||
GameObject:
|
GameObject:
|
||||||
|
|
@ -9055,7 +9055,7 @@ GameObject:
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 0
|
m_IsActive: 1
|
||||||
--- !u!224 &5809321694354080930
|
--- !u!224 &5809321694354080930
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -17296,6 +17296,9 @@ MonoBehaviour:
|
||||||
texts_base:
|
texts_base:
|
||||||
- {fileID: 3601867451939541280}
|
- {fileID: 3601867451939541280}
|
||||||
- {fileID: 730646458019674452}
|
- {fileID: 730646458019674452}
|
||||||
|
rewards:
|
||||||
|
- {fileID: 5889812883037066294}
|
||||||
|
- {fileID: 3893521988147105288}
|
||||||
texts_mimic:
|
texts_mimic:
|
||||||
- {fileID: 4312145534442857486}
|
- {fileID: 4312145534442857486}
|
||||||
--- !u!1 &1749035969668327883
|
--- !u!1 &1749035969668327883
|
||||||
|
|
@ -97913,6 +97916,18 @@ PrefabInstance:
|
||||||
m_AddedGameObjects: []
|
m_AddedGameObjects: []
|
||||||
m_AddedComponents: []
|
m_AddedComponents: []
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: 150bed98d110cb24292c78f18534decd, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: 150bed98d110cb24292c78f18534decd, type: 3}
|
||||||
|
--- !u!114 &3893521988147105288 stripped
|
||||||
|
MonoBehaviour:
|
||||||
|
m_CorrespondingSourceObject: {fileID: -6408983573810322809, guid: 150bed98d110cb24292c78f18534decd,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 1226710811256728719}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: b055af6abeefd104995ea4fdfcd9b939, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
--- !u!224 &8846535214480355421 stripped
|
--- !u!224 &8846535214480355421 stripped
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_CorrespondingSourceObject: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd,
|
m_CorrespondingSourceObject: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd,
|
||||||
|
|
@ -118659,6 +118674,18 @@ RectTransform:
|
||||||
type: 3}
|
type: 3}
|
||||||
m_PrefabInstance: {fileID: 8553011865608353457}
|
m_PrefabInstance: {fileID: 8553011865608353457}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!114 &5889812883037066294 stripped
|
||||||
|
MonoBehaviour:
|
||||||
|
m_CorrespondingSourceObject: {fileID: -6408983573810322809, guid: 150bed98d110cb24292c78f18534decd,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 8553011865608353457}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: b055af6abeefd104995ea4fdfcd9b939, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
--- !u!1001 &8595916662423615271
|
--- !u!1001 &8595916662423615271
|
||||||
PrefabInstance:
|
PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
||||||
|
|
@ -74,7 +74,7 @@ public partial class ServerData
|
||||||
public Dictionary<string, ObscuredDouble> MobKill = new Dictionary<string, ObscuredDouble>(); // 몬스터 id, 처치 수
|
public Dictionary<string, ObscuredDouble> MobKill = new Dictionary<string, ObscuredDouble>(); // 몬스터 id, 처치 수
|
||||||
public SD_Farm Farm;
|
public SD_Farm Farm;
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// { 던전타입, 0 Lv, 1 소탕값 }
|
/// { 던전타입, 0 Lv, 1 소탕값1, 2 소탕값2, 3 소탕값3 }
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public Dictionary<string, List<ObscuredInt>> Dungeon = new Dictionary<string, List<ObscuredInt>>();
|
public Dictionary<string, List<ObscuredInt>> Dungeon = new Dictionary<string, List<ObscuredInt>>();
|
||||||
|
|
||||||
|
|
@ -931,11 +931,6 @@ public partial class ServerData
|
||||||
Dictionary<eDungeon, string> dic_dungeonkey = new Dictionary<eDungeon, string>
|
Dictionary<eDungeon, string> dic_dungeonkey = new Dictionary<eDungeon, string>
|
||||||
{ { eDungeon.d1_Mimic, "d1_Mimic" }, { eDungeon.d2_Maze, "d2_Maze" }, { eDungeon.d3_Nightmare, "d3_Nightmare" },
|
{ { eDungeon.d1_Mimic, "d1_Mimic" }, { eDungeon.d2_Maze, "d2_Maze" }, { eDungeon.d3_Nightmare, "d3_Nightmare" },
|
||||||
{ eDungeon.d4_Wave, "d4_Wave" }, };
|
{ eDungeon.d4_Wave, "d4_Wave" }, };
|
||||||
public int Get_DungeonLv(eDungeon dungeon)
|
|
||||||
{
|
|
||||||
if (Dungeon.ContainsKey(dic_dungeonkey[dungeon])) return dic_dungeonkey[dungeon][0];
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
public void Init_DungeonTicket()
|
public void Init_DungeonTicket()
|
||||||
{
|
{
|
||||||
for (int i = 0; i < 3; i++)
|
for (int i = 0; i < 3; i++)
|
||||||
|
|
@ -947,6 +942,19 @@ public partial class ServerData
|
||||||
Add_Item(ticketid, limit - amount);
|
Add_Item(ticketid, limit - amount);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
public int Get_DungeonLv(eDungeon dungeon)
|
||||||
|
{
|
||||||
|
if (Dungeon.ContainsKey(dic_dungeonkey[dungeon]))
|
||||||
|
return Dungeon[dic_dungeonkey[dungeon]][0];
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
public void Add_DungeonLv(eDungeon dungeon)
|
||||||
|
{
|
||||||
|
if (!Dungeon.ContainsKey(dic_dungeonkey[dungeon]))
|
||||||
|
Dungeon.Add(dic_dungeonkey[dungeon], new List<ObscuredInt> { 0, 0, 0, 0 });
|
||||||
|
++Dungeon[dic_dungeonkey[dungeon]][0];
|
||||||
|
Dungeon[dic_dungeonkey[dungeon]][0].RandomizeCryptoKey();
|
||||||
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region Common
|
#region Common
|
||||||
|
|
|
||||||
|
|
@ -10,14 +10,15 @@ public class ArrowUI : MonoBehaviour
|
||||||
public TextMeshProUGUI label_count;
|
public TextMeshProUGUI label_count;
|
||||||
|
|
||||||
ObscuredInt m_TotalAmount, m_MaxCount;
|
ObscuredInt m_TotalAmount, m_MaxCount;
|
||||||
int m_Unit, m_UnitIndex = 0;
|
int m_Unit, m_UnitIndex = 0, m_MinValue;
|
||||||
Action<int> m_Act;
|
Action<int> m_Act;
|
||||||
|
|
||||||
public void Set(Action<int> _act, int _maxCount, bool _setMax = true)
|
public void Set(Action<int> _act, int _maxCount, bool _setMax = true, int _minvalue = 0)
|
||||||
{
|
{
|
||||||
m_Act = _act;
|
m_Act = _act;
|
||||||
m_MaxCount = _maxCount;
|
m_MaxCount = _maxCount;
|
||||||
m_MaxCount.RandomizeCryptoKey();
|
m_MaxCount.RandomizeCryptoKey();
|
||||||
|
m_MinValue = _minvalue;
|
||||||
OnClick_Unit(m_UnitIndex);
|
OnClick_Unit(m_UnitIndex);
|
||||||
if (_setMax) OnClick_RightMax();
|
if (_setMax) OnClick_RightMax();
|
||||||
else OnClick_LeftMax();
|
else OnClick_LeftMax();
|
||||||
|
|
@ -32,13 +33,14 @@ public class ArrowUI : MonoBehaviour
|
||||||
|
|
||||||
public void OnClick_LeftMax()
|
public void OnClick_LeftMax()
|
||||||
{
|
{
|
||||||
m_TotalAmount = 0;
|
m_TotalAmount = m_MinValue;
|
||||||
Set_Label();
|
Set_Label();
|
||||||
}
|
}
|
||||||
public void OnClick_Left()
|
public void OnClick_Left()
|
||||||
{
|
{
|
||||||
m_TotalAmount -= m_Unit;
|
m_TotalAmount -= m_Unit;
|
||||||
if (m_TotalAmount < 0) m_TotalAmount = 0;
|
if (m_TotalAmount < m_MinValue)
|
||||||
|
m_TotalAmount = m_MinValue;
|
||||||
Set_Label();
|
Set_Label();
|
||||||
}
|
}
|
||||||
public void OnClick_Right()
|
public void OnClick_Right()
|
||||||
|
|
|
||||||
|
|
@ -36,4 +36,14 @@ public class MoneyForm : MonoBehaviour
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void Set(int id, int count)
|
||||||
|
{
|
||||||
|
icon.sprite = UIAtlasMgr.Ins.Get_Sprite(id);
|
||||||
|
Set_Amount(count);
|
||||||
|
}
|
||||||
|
public void Set_Amount(int count)
|
||||||
|
{
|
||||||
|
amount.text = NumberFormatter.FormatNumber(count);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -4,13 +4,23 @@ using UnityEngine;
|
||||||
public class Ingame_DungeonBase : MonoBehaviour
|
public class Ingame_DungeonBase : MonoBehaviour
|
||||||
{
|
{
|
||||||
public TextMeshProUGUI[] texts_base; // 0 던전&Lv, 1 남은 시간
|
public TextMeshProUGUI[] texts_base; // 0 던전&Lv, 1 남은 시간
|
||||||
|
public MoneyForm[] rewards;
|
||||||
|
|
||||||
public virtual void Set(float time)
|
public virtual void Set(float time)
|
||||||
{
|
{
|
||||||
gameObject.SetActive(true);
|
gameObject.SetActive(true);
|
||||||
|
Set_DungeonNameLv();
|
||||||
Set_TextTime(time);
|
Set_TextTime(time);
|
||||||
DungeonInfo.Ins.m_Time = time;
|
DungeonInfo.Ins.m_Time = time;
|
||||||
DungeonInfo.Ins.act_Time = Set_TextTime;
|
DungeonInfo.Ins.act_Time = Set_TextTime;
|
||||||
|
// TODO 정인호 : 올바른 보상으로 변경 필요
|
||||||
|
rewards[0].Set(1, 0);
|
||||||
|
rewards[1].Set(2, 0);
|
||||||
|
}
|
||||||
|
public void Set_DungeonNameLv()
|
||||||
|
{
|
||||||
|
var mapData = table_battlemapconfig.Ins.Get_Data(MyValue.MyChoiceMapData.n_MapID);
|
||||||
|
texts_base[0].text = $"{mapData.Get_Name()} Lv {MyValue.MyChoiceMapData.n_DungeonLv}";
|
||||||
}
|
}
|
||||||
void Set_TextTime(float time) { texts_base[1].text = Mathf.Max(0f, time).ToString("F2"); }
|
void Set_TextTime(float time) { texts_base[1].text = Mathf.Max(0f, time).ToString("F2"); }
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -30,18 +30,17 @@ public class MapChoiceUI_Dungeon : uScrollViewMgr
|
||||||
MoneyForm_Ticket.Set(500 + MyEnumToInt.Ins.Get_Int(mapData.e_Dungeon));
|
MoneyForm_Ticket.Set(500 + MyEnumToInt.Ins.Get_Int(mapData.e_Dungeon));
|
||||||
texts[0].text = mapData.Get_Name();
|
texts[0].text = mapData.Get_Name();
|
||||||
var dungeonData = table_dungeonmapconfig.Ins.Get_Data_orNull(mapData.e_Dungeon, SelectLv);
|
var dungeonData = table_dungeonmapconfig.Ins.Get_Data_orNull(mapData.e_Dungeon, SelectLv);
|
||||||
var sdata = ServerInfo.Ins.m_ServerData;
|
|
||||||
// TODO 정인호 : 서버에 현재 클리어 정보 있어야 함
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Select_Dungeon(int mapid)
|
public void Select_Dungeon(int mapid)
|
||||||
{
|
{
|
||||||
SelectMapID = mapid; SelectMapID.RandomizeCryptoKey();
|
var sdata = ServerInfo.Ins.m_ServerData;
|
||||||
SelectLv = 1; // ServerInfo.Ins.get_ // TODO 정인호 : 던전 레벨
|
|
||||||
|
|
||||||
var mapData = table_battlemapconfig.Ins.Get_Data(SelectMapID);
|
var mapData = table_battlemapconfig.Ins.Get_Data(SelectMapID);
|
||||||
var datas = table_dungeonmapconfig.Ins.Get_DataList(mapData.e_Dungeon);
|
var datas = table_dungeonmapconfig.Ins.Get_DataList(mapData.e_Dungeon);
|
||||||
m_ArrowUI.Set(totalcount => { Select_Lv(totalcount); }, datas.Count);
|
SelectMapID = mapid; SelectMapID.RandomizeCryptoKey();
|
||||||
|
SelectLv = sdata.Get_DungeonLv(mapData.e_Dungeon) + 1;
|
||||||
|
|
||||||
|
m_ArrowUI.Set(totalcount => { Select_Lv(totalcount); }, SelectLv, true, 1);
|
||||||
|
|
||||||
Set_UI();
|
Set_UI();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue