NerdNavis_AiDev
/
Project_WL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

미믹 던전 작업 중..., 던전 정보 테이블 추가

This commit is contained in:
Ino 2025-01-23 09:57:39 +09:00
parent abf433c6b1
commit 6ca24bc15c
23 changed files with 5571 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Ino_nerdnavis.txt
View File

@ -50,4 +50,4 @@ messageinfo 엄청 느린 버그
추가 컨텐츠 (미믹 던전)
- 추가 컨텐츠 서버 정보 (몇 스텝까지 클리어했는 가?)
- 인게임 UI (Common 끄기, MaiStatLvUp 끄기, Stage 끄기, Mimic 켜기)
- 입장권 매일 충전 : 2장까지 충전, 단 2장이상 가지고 있으면 충전 안됨

2
Assets/ResWork/Table/Export/BattleMapConfig.json
View File

@ -1 +1 @@
[{"n_MapID": "맵 ID", "n_Chapter": "챕터 정보", "e_MapType": "맵 타입", "s_Scene": "씬 정보", "s_BGM": "BGM 정보", "n_MapName": "맵 이름", "n_MapDesc": "맵 설명", "s_MapIcon": "맵 아이콘", "n_Portals": "연계 포탈 정보"}, {"n_MapID": "-1", "n_Chapter": "-1", "e_MapType": "Lobby", "s_Scene": "Lobby", "s_BGM": "Chapter1", "n_MapName": "1", "n_MapDesc": "0", "s_MapIcon": "Map1", "n_Portals": "0"}, {"n_MapID": "0", "n_Chapter": "0", "e_MapType": "MyFarm", "s_Scene": "MyFarm", "s_BGM": "Chapter1", "n_MapName": "1", "n_MapDesc": "0", "s_MapIcon": "Map2", "n_Portals": "0"}, {"n_MapID": "1", "n_Chapter": "1", "e_MapType": "Stage", "s_Scene": "Map_C01", "s_BGM": "Chapter1", "n_MapName": "1", "n_MapDesc": "0", "s_MapIcon": "Map3", "n_Portals": "1"}, {"n_MapID": "2", "n_Chapter": "2", "e_MapType": "Stage", "s_Scene": "Map_C02", "s_BGM": "Chapter2", "n_MapName": "1", "n_MapDesc": "0", "s_MapIcon": "Map4", "n_Portals": "1"}, {"n_MapID": "1001", "n_Chapter": "0", "e_MapType": "Dungeon", "s_Scene": "Map_Mimic", "s_BGM": "Chapter2", "n_MapName": "1001", "n_MapDesc": "1101", "s_MapIcon": "Map", "n_Portals": "1"}, {"n_MapID": "1002", "n_Chapter": "0", "e_MapType": "Dungeon", "s_Scene": "Map_Maze", "s_BGM": "Chapter2", "n_MapName": "1002", "n_MapDesc": "1102", "s_MapIcon": "Map", "n_Portals": "1"}, {"n_MapID": "1003", "n_Chapter": "0", "e_MapType": "Dungeon", "s_Scene": "Map_Nightmare", "s_BGM": "Chapter2", "n_MapName": "1003", "n_MapDesc": "1103", "s_MapIcon": "Map", "n_Portals": "1"}, {"n_MapID": "1004", "n_Chapter": "0", "e_MapType": "Dungeon", "s_Scene": "Map_Wave", "s_BGM": "Chapter2", "n_MapName": "1004", "n_MapDesc": "1104", "s_MapIcon": "Map", "n_Portals": "1"}]
[{"n_MapID": "맵 ID", "n_Chapter": "챕터 정보", "e_MapType": "맵 타입", "e_Dungeon": "던전 타입", "s_Scene": "씬 정보", "s_BGM": "BGM 정보", "n_MapName": "맵 이름", "n_MapDesc": "맵 설명", "s_MapIcon": "맵 아이콘", "n_Portals": "연계 포탈 정보"}, {"n_MapID": "-1", "n_Chapter": "-1", "e_MapType": "Lobby", "e_Dungeon": "None", "s_Scene": "Lobby", "s_BGM": "Chapter1", "n_MapName": "1", "n_MapDesc": "0", "s_MapIcon": "Map1", "n_Portals": "0"}, {"n_MapID": "0", "n_Chapter": "0", "e_MapType": "MyFarm", "e_Dungeon": "None", "s_Scene": "MyFarm", "s_BGM": "Chapter1", "n_MapName": "1", "n_MapDesc": "0", "s_MapIcon": "Map2", "n_Portals": "0"}, {"n_MapID": "1", "n_Chapter": "1", "e_MapType": "Stage", "e_Dungeon": "None", "s_Scene": "Map_C01", "s_BGM": "Chapter1", "n_MapName": "1", "n_MapDesc": "0", "s_MapIcon": "Map3", "n_Portals": "1"}, {"n_MapID": "2", "n_Chapter": "2", "e_MapType": "Stage", "e_Dungeon": "None", "s_Scene": "Map_C02", "s_BGM": "Chapter2", "n_MapName": "1", "n_MapDesc": "0", "s_MapIcon": "Map4", "n_Portals": "1"}, {"n_MapID": "1001", "n_Chapter": "0", "e_MapType": "Dungeon", "e_Dungeon": "d1_Mimic", "s_Scene": "Map_Mimic", "s_BGM": "Chapter2", "n_MapName": "1001", "n_MapDesc": "1101", "s_MapIcon": "Map", "n_Portals": "1"}, {"n_MapID": "1002", "n_Chapter": "0", "e_MapType": "Dungeon", "e_Dungeon": "d2_Maze", "s_Scene": "Map_Maze", "s_BGM": "Chapter2", "n_MapName": "1002", "n_MapDesc": "1102", "s_MapIcon": "Map", "n_Portals": "1"}, {"n_MapID": "1003", "n_Chapter": "0", "e_MapType": "Dungeon", "e_Dungeon": "d3_Nightmare", "s_Scene": "Map_Nightmare", "s_BGM": "Chapter2", "n_MapName": "1003", "n_MapDesc": "1103", "s_MapIcon": "Map", "n_Portals": "1"}, {"n_MapID": "1004", "n_Chapter": "0", "e_MapType": "Dungeon", "e_Dungeon": "d4_Wave", "s_Scene": "Map_Wave", "s_BGM": "Chapter2", "n_MapName": "1004", "n_MapDesc": "1104", "s_MapIcon": "Map", "n_Portals": "1"}]

1
Assets/ResWork/Table/Export/DungeonMapConfig.json Normal file
View File

@ -0,0 +1 @@
[{"e_DungeonType": "맵 종류", "n_MapLv": "맵 Lv", "n_MobCount": "등장 몬스터 수", "n_SpawnID": "AppearTable", "f_MakeGap": "생성 주기", "f_Time": "제한 시간(초)"}, {"e_DungeonType": "d1_Mimic", "n_MapLv": "1", "n_MobCount": "50", "n_SpawnID": "1", "f_MakeGap": "0.5", "f_Time": "30"}, {"e_DungeonType": "d2_Maze", "n_MapLv": "1", "n_MobCount": "0", "n_SpawnID": "1", "f_MakeGap": "0", "f_Time": "90"}, {"e_DungeonType": "d3_Nightmare", "n_MapLv": "1", "n_MobCount": "0", "n_SpawnID": "1", "f_MakeGap": "0", "f_Time": "90"}, {"e_DungeonType": "d4_Wave", "n_MapLv": "1", "n_MobCount": "0", "n_SpawnID": "1", "f_MakeGap": "0", "f_Time": "1800"}]

7
Assets/ResWork/Table/Export/DungeonMapConfig.json.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 6127a32d96327a14ea696f3467d84c4c
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/ResWork/Table/butler.xlsm
View File

Binary file not shown.

8
Assets/ResWork/UIPrefabs/Map/WorldMapDungeonCard.cs
View File

@ -6,21 +6,21 @@ public class WorldMapDungeonCard : CardBase
public Image[] images; // 0 던전 아이콘
public TextMeshProUGUI[] texts; // 0 던전이름, 1 던전 설명
eDungeon m_Dungeon;
int m_DungeonMapID;
public override void Set<T>(T _base)
{
base.Set(_base);
m_Dungeon = DSUtil.StringToEnum<eDungeon>(_base.ToString());
m_DungeonMapID = (int)m_Dungeon + 1001;
m_DungeonMapID = (int)DSUtil.StringToEnum<eDungeon>(_base.ToString()) + 1000;
var Tdata = table_battlemapconfig.Ins.Get_Data(m_DungeonMapID);
texts[0].text = Tdata.Get_Name();
texts[1].text = Tdata.Get_Desc();
}
public override int Get_IntData() { return m_DungeonMapID; }
public void OnClick_Card()
{
MapChoiceUI_Dungeon.Ins.Select_Dungeon(m_Dungeon, m_DungeonMapID);
MapChoiceUI_Dungeon.Ins.Select_Dungeon(m_DungeonMapID);
}
}

14
Assets/ResWork/UIPrefabs/Title/Tables.prefab
View File

@ -69,6 +69,7 @@ GameObject:
- component: {fileID: 3622786898951503231}
- component: {fileID: 1945925107405883718}
- component: {fileID: -4383278693134355230}
- component: {fileID: 3149704813866008907}
m_Layer: 0
m_Name: Tables
m_TagString: Untagged
@ -878,3 +879,16 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_json: {fileID: 4900000, guid: 641d07eeda1f52e42bcbc75a35b360ef, type: 3}
--- !u!114 &3149704813866008907
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5043163894663193716}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9fbc56a07056bc147a32654eb944dc72, type: 3}
m_Name:
m_EditorClassIdentifier:
m_json: {fileID: 4900000, guid: 6127a32d96327a14ea696f3467d84c4c, type: 3}

22
Assets/Res_Addr/MainUI/NewGameUI.prefab
View File

@ -17256,7 +17256,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &5608871440823519894
RectTransform:
m_ObjectHideFlags: 0
@ -17296,6 +17296,8 @@ MonoBehaviour:
texts_base:
- {fileID: 3601867451939541280}
- {fileID: 730646458019674452}
texts_mimic:
- {fileID: 4312145534442857486}
--- !u!1 &1749035969668327883
GameObject:
m_ObjectHideFlags: 0
@ -55033,7 +55035,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &5366708532861094367
RectTransform:
m_ObjectHideFlags: 0
@ -55072,7 +55074,7 @@ MonoBehaviour:
go_card: {fileID: 6812196077140225535, guid: addb3980a64d43045be5386b3f735ac3, type: 3}
texts:
- {fileID: 1134907645997091294}
m_ArrowUI: {fileID: 0}
m_ArrowUI: {fileID: 550472041806731591}
--- !u!1 &5415595708530692618
GameObject:
m_ObjectHideFlags: 0
@ -92778,7 +92780,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &6678857581749354256
RectTransform:
m_ObjectHideFlags: 0
@ -101079,6 +101081,18 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 741f139cbc7b708439dd195045c7d8a1, type: 3}
--- !u!114 &550472041806731591 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1978893489252551661, guid: 741f139cbc7b708439dd195045c7d8a1,
type: 3}
m_PrefabInstance: {fileID: 2077806784895505066}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c30eafdf04f82e849a02bfb263c45d0f, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!224 &2819497699184699550 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 4320364344018254388, guid: 741f139cbc7b708439dd195045c7d8a1,

5323
Assets/Res_Addr/Mobs/Monster/Mimic.prefab Normal file
View File

File diff suppressed because it is too large Load Diff

7
Assets/Res_Addr/Mobs/Monster/Mimic.prefab.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: b206aff2dcdf8ef4ebec08763a4d390d
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

6
Assets/Script/Info/InGameInfo.cs
View File

@ -20,7 +20,6 @@ public partial class InGameInfo : MyCoroutine
Dictionary<eEffect, List<GameObject>> dic_Skill = new Dictionary<eEffect, List<GameObject>>();
Dictionary<eObj, List<GameObject>> dic_Obj = new Dictionary<eObj, List<GameObject>>();
eGameMode m_GameMode;
public float m_Time { get; private set; }
List<GameObject> list_dropitems = new List<GameObject>();
List<ProjectileData> list_projectileData = new List<ProjectileData>();
@ -146,7 +145,7 @@ public partial class InGameInfo : MyCoroutine
public bool IsGameMode(eGameMode _mode) { return m_GameMode == _mode; }
/// <summary>
/// 1 로비, 2 농장, 3 스테이지
/// -1 로비, 0 농장, 1 스테이지, 2 던전
/// </summary>
/// <param name="id"></param>
public void Load_Map(int id)
@ -154,11 +153,10 @@ public partial class InGameInfo : MyCoroutine
MyValue.MyChoiceMapData.n_MapID = id;
var Tdata = table_battlemapconfig.Ins.Get_Data(MyValue.MyChoiceMapData.n_MapID);
m_GameMode = Tdata.e_MapType;
m_SceneInfo.Load_AddScene(Tdata, ()=>
m_SceneInfo.Load_AddScene(Tdata, () =>
{
StartCam();
NewGameUI.Ins.SetUI_byGameMode(m_GameMode);
m_Time = 0f;
});
}
public void StartCam() { StartCoroutine(Co_StartCam()); }

28
Assets/Script/Map/MapData.cs
View File

@ -1,3 +1,4 @@
using CodeStage.AntiCheat.ObscuredTypes;
using System;
using System.Collections;
using System.Collections.Generic;
@ -33,7 +34,28 @@ public class MapZoneData
public class ChoiceMapData
{
public int n_Difficult;
public int n_MapID;
public int n_PortalIndex;
ObscuredInt _Difficult;
public int n_Difficult
{
get { return _Difficult; }
set { _Difficult = value; _Difficult.RandomizeCryptoKey(); }
}
ObscuredInt _MapID;
public int n_MapID
{
get { return _MapID; }
set { _MapID = value; _MapID.RandomizeCryptoKey(); }
}
ObscuredInt _PortalIndex;
public int n_PortalIndex
{
get { return _PortalIndex; }
set { _PortalIndex = value; _PortalIndex.RandomizeCryptoKey(); }
}
ObscuredInt _DungeonLv;
public int n_DungeonLv
{
get { return _DungeonLv; }
set { _DungeonLv = value; _DungeonLv.RandomizeCryptoKey(); }
}
}

8
Assets/Script/Table/Dungeon.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 646f155141eb25d4880b148301cf7b14
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

77
Assets/Script/Table/Dungeon/table_dungeonmapconfig.cs Normal file
View File

@ -0,0 +1,77 @@
using CodeStage.AntiCheat.ObscuredTypes;
using Newtonsoft.Json;
using System.Collections.Generic;
public class DungeonMapConfigTableData : TableDataBase
{
public eDungeon e_DungeonType;
ObscuredInt _MapLv;
public int n_MapLv
{
get { return _MapLv; }
set { _MapLv = value; _MapLv.RandomizeCryptoKey(); }
}
ObscuredInt _MobCount;
public int n_MobCount
{
get { return _MobCount; }
set { _MobCount = value; _MobCount.RandomizeCryptoKey(); }
}
ObscuredInt _SpawnID;
public int n_SpawnID
{
get { return _SpawnID; }
set { _SpawnID = value; _SpawnID.RandomizeCryptoKey(); }
}
ObscuredFloat _MakeGap;
public float f_MakeGap
{
get { return _MakeGap; }
set { _MakeGap = value; _MakeGap.RandomizeCryptoKey(); }
}
ObscuredFloat _Time;
public float f_Time
{
get { return _Time; }
set { _Time = value; _Time.RandomizeCryptoKey(); }
}
}
public class table_dungeonmapconfig : table_missionbase
{
public static table_dungeonmapconfig Ins;
List<DungeonMapConfigTableData> tableDatas;
Dictionary<eDungeon, List<DungeonMapConfigTableData>> dic_Data = new Dictionary<eDungeon, List<DungeonMapConfigTableData>>();
protected override void Awake()
{
base.Awake();
Ins = this;
}
protected override void Start()
{
tableDatas = JsonConvert.DeserializeObject<List<DungeonMapConfigTableData>>(json_last);
for (int i = 0; i < tableDatas.Count; i++)
{
var data = tableDatas[i];
if (!dic_Data.ContainsKey(data.e_DungeonType))
dic_Data.Add(data.e_DungeonType, new List<DungeonMapConfigTableData>());
dic_Data[data.e_DungeonType].Add(data);
}
base.Start();
}
public List<DungeonMapConfigTableData> Get_DataList() { return tableDatas; }
public List<DungeonMapConfigTableData> Get_DataList(eDungeon dungeon) { return dic_Data[dungeon]; }
public DungeonMapConfigTableData Get_Data_orNull(eDungeon dungeon, int lv)
{
return dic_Data[dungeon].Count <= lv ? dic_Data[dungeon][lv - 1] : null;
}
}

11
Assets/Script/Table/Dungeon/table_dungeonmapconfig.cs.meta Normal file
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 9fbc56a07056bc147a32654eb944dc72
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

1
Assets/Script/Table/IngameStage/table_battlemapconfig.cs
View File

@ -19,6 +19,7 @@ public class BattleMapConfigTableData : TableDataBase
} // 챕터 구분자
public eGameMode e_MapType; // 맵 화면 연출 구분을 위한 정보 (enum 값은 변경하지 않음)
public eDungeon e_Dungeon;
public string s_Scene;
ObscuredString _BGM;

4
Assets/Script/UI/Common/IngameObtainUI.cs
View File

@ -13,7 +13,7 @@ public class IngameObtainUI : ScrollViewArrMgr
// 골드, 경험치 등
labels[1].text = NumberFormatter.FormatNumber(GameUI.Ins.IngameUI.m_StageResult.Get_Gold());
labels[2].text = NumberFormatter.FormatNumber(GameUI.Ins.IngameUI.m_StageResult.Get_Exp());
labels[3].text = DSUtil.Get_TimeText_MSms(InGameInfo.Ins.m_Time);
//labels[3].text = DSUtil.Get_TimeText_MSms(InGameInfo.Ins.m_Time);
// 획득 아이템
Set_Item();
@ -24,7 +24,7 @@ public class IngameObtainUI : ScrollViewArrMgr
protected override void Update()
{
labels[3].text = DSUtil.Get_TimeText_MSms(InGameInfo.Ins.m_Time);
//labels[3].text = DSUtil.Get_TimeText_MSms(InGameInfo.Ins.m_Time);
}
public void Set_Chapter()

3
Assets/Script/UI/Ingame/Dungeon/Ingame_DungeonBase.cs
View File

@ -30,4 +30,7 @@ public class Ingame_DungeonBase : MonoBehaviour
}
}
}
public virtual void Set_MaxMobCount(int maxCount) { }
public virtual void Add_MobCount() { }
}

21
Assets/Script/UI/Ingame/Dungeon/Ingame_Mimic.cs
View File

@ -1,8 +1,23 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using CodeStage.AntiCheat.ObscuredTypes;
using TMPro;
public class Ingame_Mimic : Ingame_DungeonBase
{
public TextMeshProUGUI[] texts_mimic; // 0 몹 수
ObscuredInt MaxMobCount, MobCount;
public override void Set_MaxMobCount(int maxCount)
{
MaxMobCount = maxCount;
MaxMobCount.RandomizeCryptoKey();
MobCount = -1;
Add_MobCount();
}
public override void Add_MobCount()
{
++MobCount;
MobCount.RandomizeCryptoKey();
texts_mimic[0].text = DSUtil.Format("{0}/{1}", MobCount, MaxMobCount);
}
}

28
Assets/Script/UI/Map/MapChoiceUI_Dungeon.cs
View File

@ -1,3 +1,4 @@
using CodeStage.AntiCheat.ObscuredTypes;
using System.Collections.Generic;
using TMPro;
@ -9,13 +10,11 @@ public class MapChoiceUI_Dungeon : uScrollViewMgr
public ArrowUI m_ArrowUI;
List<eDungeon> dungeons = new List<eDungeon> { eDungeon.d1_Mimic, eDungeon.d2_Maze, eDungeon.d3_Nightmare, eDungeon.d4_Wave };
eDungeon SelectDungeon = eDungeon.d1_Mimic;
int SelectMapID = 1001;
private void Start() { Ins = this; }
ObscuredInt SelectMapID = 1001, SelectLv;
private void OnEnable()
{
Ins = this;
Set_UI();
Set_ScrollView(dungeons);
for (int i = 0; i < list_CardBase.Count; i++)
@ -27,18 +26,28 @@ public class MapChoiceUI_Dungeon : uScrollViewMgr
public override void Set_UI()
{
texts[0].text = table_battlemapconfig.Ins.Get_Data(SelectMapID).Get_Name();
var mapData = table_battlemapconfig.Ins.Get_Data(SelectMapID);
texts[0].text = mapData.Get_Name();
var dungeonData = table_dungeonmapconfig.Ins.Get_Data_orNull(mapData.e_Dungeon, SelectLv);
var sdata = ServerInfo.Ins.m_ServerData;
// TODO 정인호 : 서버에 현재 클리어 정보 있어야 함
//m_ArrowUI.Set(totalcount => { }, )
}
public void Select_Dungeon(eDungeon d, int mapid)
public void Select_Dungeon(int mapid)
{
SelectDungeon = d;
SelectMapID = mapid;
SelectMapID = mapid; SelectMapID.RandomizeCryptoKey();
SelectLv = 1; // ServerInfo.Ins.get_ // TODO 정인호 : 던전 레벨
var mapData = table_battlemapconfig.Ins.Get_Data(SelectMapID);
var datas = table_dungeonmapconfig.Ins.Get_DataList(mapData.e_Dungeon);
m_ArrowUI.Set(totalcount => { Select_Lv(totalcount); }, datas.Count);
Set_UI();
}
public void Select_Lv(int lv)
{
SelectLv = lv; SelectLv.RandomizeCryptoKey();
}
public void OnClick_GoDungeon()
{
@ -47,6 +56,7 @@ public class MapChoiceUI_Dungeon : uScrollViewMgr
MyValue.MyChoiceMapData.n_Difficult = 1; // TODO 정인호 : 나중에 선택한 난이도 넣어줄 것
MyValue.MyChoiceMapData.n_MapID = SelectMapID;
MyValue.MyChoiceMapData.n_PortalIndex = 0;
MyValue.MyChoiceMapData.n_DungeonLv = SelectLv;
InGameInfo.Ins.Load_Map(SelectMapID);
}

5
Assets/Script/UI/NewGameUI.cs
View File

@ -63,7 +63,10 @@ public class NewGameUI : MonoBehaviourSingletonTemplate<NewGameUI>
DSUtil.InActivateGameObjects(gos, 2);
gos_etc[0].SetActive(false);
DSUtil.InActivateGameObjects(gos_ingame, 1);
ingame_Dungeons[0].Set(30f);
var mapData = table_battlemapconfig.Ins.Get_Data(MyValue.MyChoiceMapData.n_MapID);
var dungeonData = table_dungeonmapconfig.Ins.Get_Data_orNull(mapData.e_Dungeon, MyValue.MyChoiceMapData.n_DungeonLv);
ingame_Dungeons[0].Set(dungeonData.f_Time);
ingame_Dungeons[0].Set_MaxMobCount(dungeonData.n_MobCount);
break;
}

48
Assets/Script/UI/Stage/StageResult.cs
View File

@ -73,7 +73,7 @@ public class StageResult : BackKeyAdd
{ // 스테이지 챕터
SoundInfo.Ins.Play_OneShot(eSound.s019_Win);
Set_Coroutine(() => { SoundInfo.Ins.Play_OneShot(eSound.s025_Win2, 0.25f); }, 1f);
ServerInfo.Ins.Save_Rank(DSUtil.Format("TimeAttack_Chapter_{0}", chapter), int.MaxValue - (int)(InGameInfo.Ins.m_Time * 100f));
//ServerInfo.Ins.Save_Rank(DSUtil.Format("TimeAttack_Chapter_{0}", chapter), int.MaxValue - (int)(InGameInfo.Ins.m_Time * 100f));
//sdata.Add_Item(new ItemData(eItem.RoulletteTicket, 0, 1, "", eUICardType.GetItem));
@ -84,29 +84,29 @@ public class StageResult : BackKeyAdd
sdata.Add_MissionCount(MyValue.arr_Mission[0], 1);
sdata.Add_MissionCount(MyValue.arr_Mission[2], achi.Find(f => f.e_Purpose == ePurpose.ChapterClear).n_MissionIndex);
if (InGameInfo.Ins.m_Time <= 300f)
{
var data = achi.Find(f => f.e_Purpose == ePurpose.Time5Min);
if (data != null) sdata.Add_MissionCount(MyValue.arr_Mission[2], data.n_MissionIndex);
}
if (InGameInfo.Ins.m_Time <= 600f)
{
var data = achi.Find(f => f.e_Purpose == ePurpose.Time10Min);
if (data != null) sdata.Add_MissionCount(MyValue.arr_Mission[2], data.n_MissionIndex);
GameUI.Ins.IngameUI.m_ChapterQuest.Add_PurposeCount(new ChapterQuestAddData { purpose = ePurpose.Time10Min, addcount = (int)InGameInfo.Ins.m_Time });
}
if (InGameInfo.Ins.m_Time <= 900f)
{
var data = achi.Find(f => f.e_Purpose == ePurpose.Time15Min);
if (data != null) sdata.Add_MissionCount(MyValue.arr_Mission[2], data.n_MissionIndex);
GameUI.Ins.IngameUI.m_ChapterQuest.Add_PurposeCount(new ChapterQuestAddData { purpose = ePurpose.Time15Min, addcount = (int)InGameInfo.Ins.m_Time });
}
if (InGameInfo.Ins.m_Time <= 1200f)
{
var data = achi.Find(f => f.e_Purpose == ePurpose.Time20Min);
if (data != null) sdata.Add_MissionCount(MyValue.arr_Mission[2], data.n_MissionIndex);
GameUI.Ins.IngameUI.m_ChapterQuest.Add_PurposeCount(new ChapterQuestAddData { purpose = ePurpose.Time20Min, addcount = (int)InGameInfo.Ins.m_Time });
}
//if (InGameInfo.Ins.m_Time <= 300f)
//{
// var data = achi.Find(f => f.e_Purpose == ePurpose.Time5Min);
// if (data != null) sdata.Add_MissionCount(MyValue.arr_Mission[2], data.n_MissionIndex);
//}
//if (InGameInfo.Ins.m_Time <= 600f)
//{
// var data = achi.Find(f => f.e_Purpose == ePurpose.Time10Min);
// if (data != null) sdata.Add_MissionCount(MyValue.arr_Mission[2], data.n_MissionIndex);
// GameUI.Ins.IngameUI.m_ChapterQuest.Add_PurposeCount(new ChapterQuestAddData { purpose = ePurpose.Time10Min, addcount = (int)InGameInfo.Ins.m_Time });
//}
//if (InGameInfo.Ins.m_Time <= 900f)
//{
// var data = achi.Find(f => f.e_Purpose == ePurpose.Time15Min);
// if (data != null) sdata.Add_MissionCount(MyValue.arr_Mission[2], data.n_MissionIndex);
// GameUI.Ins.IngameUI.m_ChapterQuest.Add_PurposeCount(new ChapterQuestAddData { purpose = ePurpose.Time15Min, addcount = (int)InGameInfo.Ins.m_Time });
//}
//if (InGameInfo.Ins.m_Time <= 1200f)
//{
// var data = achi.Find(f => f.e_Purpose == ePurpose.Time20Min);
// if (data != null) sdata.Add_MissionCount(MyValue.arr_Mission[2], data.n_MissionIndex);
// GameUI.Ins.IngameUI.m_ChapterQuest.Add_PurposeCount(new ChapterQuestAddData { purpose = ePurpose.Time20Min, addcount = (int)InGameInfo.Ins.m_Time });
//}
sdata.Add_TitleCondition(50, 51, 52); // 칭호 : 찬란한 승리, 승리의 마녀, 근면한
if (MyValue.MyPC.Get_RealDamage() < 1) sdata.Add_Item(new ItemData(eItem.Title, 56, 1)); // 칭호 : 땡땡이 치는

2
Assets/Script/Util/MyEnum.cs
View File

@ -1,5 +1,5 @@
public enum eGameMode { Lobby, Stage, MyFarm, Dungeon, Max } // list 순서
public enum eDungeon { d1_Mimic, d2_Maze, d3_Nightmare, d4_Wave }
public enum eDungeon { None, d1_Mimic, d2_Maze, d3_Nightmare, d4_Wave }
public enum eDifficult { Normal, Hard, NightMare, Hell, Max }
public enum eUnlockCondition { None, BossKill, GetItem, SealBreaking, ChapterClear, }
public enum eRole { Mob, Boss, Pet, PC, Fairy, EnemyPC, Farmer, Summon, BattleNPC, OBJ, QuestMob, MemoryMob, EnemyPet, EnemySummon }