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

가이드 퀘스트 작업 중... 2

This commit is contained in:
Ino 2025-03-24 08:44:09 +09:00
parent f7acafbc5f
commit 469b937b10
6 changed files with 88 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -85242,11 +85242,11 @@ MonoBehaviour:
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacing: -25
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}

72
Assets/Script/Table/Mission/table_missionlist.cs
View File

@ -63,6 +63,78 @@ public class MissionListTableData : TableDataBase
}
public bool b_RepeatMission;
public string Get_Desc()
{
switch (e_MissionConditionType)
{
case ePurpose.KILL_MONSTER:
var mob = table_monsterlist.Ins.Get_Data_orNull(n_MissionConditionValue);
return DSUtil.Format(n_MissionDesc, l_MissionConditionCount, mob.Get_Name());
case ePurpose.KILL_MONSTER_GRADE:
case ePurpose.KILL_MONSTER_GRADE_ACC:
switch (n_MissionConditionValue)
{
case 1: return DSUtil.Format(n_MissionDesc, l_MissionConditionCount, table_localtext.Ins.Get_Text(297));
case 2: return DSUtil.Format(n_MissionDesc, l_MissionConditionCount, table_localtext.Ins.Get_Text(298));
case 3: return DSUtil.Format(n_MissionDesc, l_MissionConditionCount, table_localtext.Ins.Get_Text(299));
}
break;
case ePurpose.TAKE_GOODS:
case ePurpose.TAKE_GOODS_ACC:
case ePurpose.TAKE_GOODS_LIMIT:
case ePurpose.CONSUME_GOODS:
case ePurpose.CONSUME_GOODS_ACC:
case ePurpose.EAT_FRUIT_TYPE_ACC:
{
var item = table_itemlist.Ins.Get_Data(n_MissionConditionValue);
return DSUtil.Format(n_MissionDesc, l_MissionConditionCount, item.Get_Name());
}
case ePurpose.ARRIVAL_MAP_LIMIT:
var map = table_battlemapconfig.Ins.Get_Data(n_MissionConditionValue);
return DSUtil.Format(n_MissionDesc, map.Get_Name());
case ePurpose.HERO_ABILITY_UPGRADE_CLASS_LIMIT:
//switch (m_Data.n_MissionConditionValue)
//{
// case 1: texts[0].text = DSUtil.Format(m_Data.n_MissionDesc, table_localtext.Ins.Get_Text(1001)); break;
// case 2: texts[0].text = DSUtil.Format(m_Data.n_MissionDesc, table_localtext.Ins.Get_Text(1011)); break;
// case 3: texts[0].text = DSUtil.Format(m_Data.n_MissionDesc, table_localtext.Ins.Get_Text(1021)); break;
// case 4: texts[0].text = DSUtil.Format(m_Data.n_MissionDesc, table_localtext.Ins.Get_Text(1031)); break;
// case 5: texts[0].text = DSUtil.Format(m_Data.n_MissionDesc, table_localtext.Ins.Get_Text(1021)); break;
// case 6: texts[0].text = DSUtil.Format(m_Data.n_MissionDesc, table_localtext.Ins.Get_Text(1031)); break;
//}
return DSUtil.Format(n_MissionDesc, l_MissionConditionCount, (eBattleType)n_MissionConditionValue);
case ePurpose.CLASS_OPEN_LIMIT:
var classData = table_classopencondition.Ins.Get_MissionData(n_MissionConditionValue);
return DSUtil.Format(n_MissionDesc, classData.Get_Name());
case ePurpose.HERO_AWAKEN_ACC:
case ePurpose.HERO_BASE_STAT_LIMIT:
return DSUtil.Format(n_MissionDesc, l_MissionConditionCount, (eMainStatType)(n_MissionConditionValue - 1));
case ePurpose.GET_EQUIP_ITEM_GRADE_ACC:
case ePurpose.PLANTING_CROPS_GRADE_ACC:
return DSUtil.Format(n_MissionDesc, l_MissionConditionCount, MyText.Get_GradeName(n_MissionConditionValue));
case ePurpose.EQUIP_ITEM_MOUNT_PARTS_LIMIT:
return DSUtil.Format(n_MissionDesc, table_localtext.Ins.Get_Text(30100 + n_MissionConditionValue));
case ePurpose.TAKE_RELIC_GRADE_ACC:
return DSUtil.Format(n_MissionDesc, l_MissionConditionCount, n_MissionConditionValue);
case ePurpose.SKILL_UPGRADE_LIMIT:
return DSUtil.Format(n_MissionDesc, n_MissionConditionValue);
case ePurpose.CONTENTS_CLEAR:
switch (n_MissionConditionValue)
{
case 1: return DSUtil.Format(n_MissionDesc, l_MissionConditionCount, table_localtext.Ins.Get_Text(1001));
case 2: return DSUtil.Format(n_MissionDesc, l_MissionConditionCount, table_localtext.Ins.Get_Text(1011));
case 3: return DSUtil.Format(n_MissionDesc, l_MissionConditionCount, table_localtext.Ins.Get_Text(1021));
case 4: return DSUtil.Format(n_MissionDesc, l_MissionConditionCount, table_localtext.Ins.Get_Text(1031));
}
break;
case ePurpose.GET_ESSENCE_GRADE_ACC:
return DSUtil.Format(n_MissionDesc, l_MissionConditionCount, table_localtext.Ins.Get_Text(3340 + n_MissionConditionValue));
default:
return DSUtil.Format(n_MissionDesc, l_MissionConditionCount);
}
return "no mission desc";
}
}
public class table_missionlist : table_missionbase

2
Assets/Script/Table/table_chapterquest.cs
View File

@ -71,7 +71,7 @@ public class table_chapterquest : MonoBehaviour
var curChapter = MyValue.MyChoiceMapData.n_MapID;
//return Get_DataList(curChapter)[chap++] as ChapterQuestTableData; // 테스트 : 챕터 퀘스트
if (sdata.Get_Common(eCommon.GuideStep) <= 2 && sdata.Get_Common(eCommon.GuideClear) < 1)
if (sdata.Get_Common(eCommon.GuideStep) <= 2 && sdata.Get_Common(eCommon.GuideCount) < 1)
return list_Data[0] as ChapterQuestTableData;
//var maxchapter = sdata.Get_Common(eCommon.MaxMapID);

24
Assets/Script/UI/Common/GuideQuestUI.cs
View File

@ -41,16 +41,14 @@ public class GuideQuestUI : MonoBehaviour
gameObject.SetActive(false);
else
{
// //GuideQuestArrow.Ins.Set(Tdata.ID, sdata.Get_Common(eCommon.GuideClear) == 0);
// sprite[0].sprite = UIAtlasMgr.Ins.Get_Sprite(Tdata.Target);
// sprite[1].sprite = UIAtlasMgr.Ins.Get_Sprite(Tdata.TargetSub);
// sprite[2].sprite = UIAtlasMgr.Ins.Get_Sprite(DSUtil.Get_ItemSpriteInfo(Tdata.e_Reward, Tdata.n_RewardID).Icon);
// labels[0].text = DSUtil.GetThousandCommaText(Tdata.n_RewardAmount);
// labels[1].text = Tdata.Desc;
// labels[3].text = (Tdata.ID + 1).ToString();
//GuideQuestArrow.Ins.Set(Tdata.ID, sdata.Get_Common(eCommon.GuideClear) == 0);
sprite[0].sprite = UIAtlasMgr.Ins.Get_Sprite(Tdata.n_RewardValue);
labels[0].text = DSUtil.GetThousandCommaText(Tdata.n_RewardCount);
labels[1].text = Tdata.Get_Desc();
labels[2].text = $"Main - {Tdata.n_MissionIndex}";
labels[3].text = $"{sdata.Get_Common(eCommon.GuideCount)}/{Tdata.l_MissionConditionCount}";
// gos[0].SetActive(sdata.Get_Common(eCommon.GuideClear) > 0);
// gos[1].SetActive(Tdata.ID == 3);
gos[0].SetActive(sdata.Get_Common(eCommon.GuideCount) >= Tdata.l_MissionConditionCount);
// // 선행됐는 지 체크
// switch (Tdata.e_Purpose)
@ -115,7 +113,7 @@ public class GuideQuestUI : MonoBehaviour
gameObject.SetActive(false);
Tdata = null;
var sdata = ServerInfo.Ins.m_ServerData;
sdata.Set_Common(eCommon.GuideClear, 0);
sdata.Set_Common(eCommon.GuideCount, 0);
sdata.Set_Common(eCommon.GuideStep, 39);
//ServerInfo.Ins.GuideQuestComplete(() =>
@ -129,7 +127,7 @@ public class GuideQuestUI : MonoBehaviour
{
if (Tdata != null && Tdata.e_MissionConditionType == _purpose)
{
ServerInfo.Ins.m_ServerData.Add_Common(eCommon.GuideClear);
ServerInfo.Ins.m_ServerData.Add_Common(eCommon.GuideCount);
gos[0].SetActive(true);
ToastUI.Ins.Set(161);
List_CurArrow.ForEach(f => f.SetActive(false));
@ -146,9 +144,9 @@ public class GuideQuestUI : MonoBehaviour
public void OnClick_Reward()
{
var sdata = ServerInfo.Ins.m_ServerData;
if (sdata.Get_Common(eCommon.GuideClear) > 0)
if (sdata.Get_Common(eCommon.GuideCount) > 0)
{
sdata.Set_Common(eCommon.GuideClear, 0);
sdata.Set_Common(eCommon.GuideCount, 0);
sdata.Add_Common(eCommon.GuideStep);
//GetItemUI.Ins.Set(sdata.Add_Item(new ItemData(Tdata.e_Reward, Tdata.n_RewardID, Tdata.n_RewardAmount, DSUtil.Format("guide {0}", Tdata.ID), eUICardType.GetItem)));
GetItemUI.Ins.Show_Items();

88
Assets/Script/UI/Mission/MissionCard.cs
View File

@ -21,7 +21,7 @@ public class MissionCard : CardBase
if (active)
{
images[0].sprite = UIAtlasMgr.Ins.Get_Sprite(m_Data.n_RewardValue);
Set_Text();
texts[0].text = m_Data.Get_Desc();
Set_Proc();
Set_Complete();
}
@ -46,92 +46,6 @@ public class MissionCard : CardBase
return false;
}
void Set_Text()
{
switch (m_Data.e_MissionConditionType)
{
case ePurpose.KILL_MONSTER:
var mob = table_monsterlist.Ins.Get_Data_orNull(m_Data.n_MissionConditionValue);
texts[0].text = DSUtil.Format(m_Data.n_MissionDesc, m_Data.l_MissionConditionCount, mob.Get_Name());
break;
case ePurpose.KILL_MONSTER_GRADE:
case ePurpose.KILL_MONSTER_GRADE_ACC:
switch (m_Data.n_MissionConditionValue)
{
case 1: texts[0].text = DSUtil.Format(m_Data.n_MissionDesc, m_Data.l_MissionConditionCount, table_localtext.Ins.Get_Text(297)); break;
case 2: texts[0].text = DSUtil.Format(m_Data.n_MissionDesc, m_Data.l_MissionConditionCount, table_localtext.Ins.Get_Text(298)); break;
case 3: texts[0].text = DSUtil.Format(m_Data.n_MissionDesc, m_Data.l_MissionConditionCount, table_localtext.Ins.Get_Text(299)); break;
}
break;
case ePurpose.TAKE_GOODS:
case ePurpose.TAKE_GOODS_ACC:
case ePurpose.TAKE_GOODS_LIMIT:
case ePurpose.CONSUME_GOODS:
case ePurpose.CONSUME_GOODS_ACC:
case ePurpose.EAT_FRUIT_TYPE_ACC:
{
var item = table_itemlist.Ins.Get_Data(m_Data.n_MissionConditionValue);
texts[0].text = DSUtil.Format(m_Data.n_MissionDesc, m_Data.l_MissionConditionCount, item.Get_Name());
}
break;
case ePurpose.ARRIVAL_MAP_LIMIT:
var map = table_battlemapconfig.Ins.Get_Data(m_Data.n_MissionConditionValue);
texts[0].text = DSUtil.Format(m_Data.n_MissionDesc, map.Get_Name());
break;
case ePurpose.HERO_ABILITY_UPGRADE_CLASS_LIMIT:
//switch (m_Data.n_MissionConditionValue)
//{
// case 1: texts[0].text = DSUtil.Format(m_Data.n_MissionDesc, table_localtext.Ins.Get_Text(1001)); break;
// case 2: texts[0].text = DSUtil.Format(m_Data.n_MissionDesc, table_localtext.Ins.Get_Text(1011)); break;
// case 3: texts[0].text = DSUtil.Format(m_Data.n_MissionDesc, table_localtext.Ins.Get_Text(1021)); break;
// case 4: texts[0].text = DSUtil.Format(m_Data.n_MissionDesc, table_localtext.Ins.Get_Text(1031)); break;
// case 5: texts[0].text = DSUtil.Format(m_Data.n_MissionDesc, table_localtext.Ins.Get_Text(1021)); break;
// case 6: texts[0].text = DSUtil.Format(m_Data.n_MissionDesc, table_localtext.Ins.Get_Text(1031)); break;
//}
texts[0].text = DSUtil.Format(m_Data.n_MissionDesc, m_Data.l_MissionConditionCount,
(eBattleType)m_Data.n_MissionConditionValue);
break;
case ePurpose.CLASS_OPEN_LIMIT:
var classData = table_classopencondition.Ins.Get_MissionData(m_Data.n_MissionConditionValue);
texts[0].text = DSUtil.Format(m_Data.n_MissionDesc, classData.Get_Name());
break;
case ePurpose.HERO_AWAKEN_ACC:
case ePurpose.HERO_BASE_STAT_LIMIT:
texts[0].text = DSUtil.Format(m_Data.n_MissionDesc, m_Data.l_MissionConditionCount,
(eMainStatType)(m_Data.n_MissionConditionValue - 1));
break;
case ePurpose.GET_EQUIP_ITEM_GRADE_ACC:
case ePurpose.PLANTING_CROPS_GRADE_ACC:
texts[0].text = DSUtil.Format(m_Data.n_MissionDesc, m_Data.l_MissionConditionCount,
MyText.Get_GradeName(m_Data.n_MissionConditionValue));
break;
case ePurpose.EQUIP_ITEM_MOUNT_PARTS_LIMIT:
texts[0].text = DSUtil.Format(m_Data.n_MissionDesc, table_localtext.Ins.Get_Text(30100 + m_Data.n_MissionConditionValue));
break;
case ePurpose.TAKE_RELIC_GRADE_ACC:
texts[0].text = DSUtil.Format(m_Data.n_MissionDesc, m_Data.l_MissionConditionCount, m_Data.n_MissionConditionValue);
break;
case ePurpose.SKILL_UPGRADE_LIMIT:
texts[0].text = DSUtil.Format(m_Data.n_MissionDesc, m_Data.n_MissionConditionValue);
break;
case ePurpose.CONTENTS_CLEAR:
switch (m_Data.n_MissionConditionValue)
{
case 1: texts[0].text = DSUtil.Format(m_Data.n_MissionDesc, m_Data.l_MissionConditionCount, table_localtext.Ins.Get_Text(1001)); break;
case 2: texts[0].text = DSUtil.Format(m_Data.n_MissionDesc, m_Data.l_MissionConditionCount, table_localtext.Ins.Get_Text(1011)); break;
case 3: texts[0].text = DSUtil.Format(m_Data.n_MissionDesc, m_Data.l_MissionConditionCount, table_localtext.Ins.Get_Text(1021)); break;
case 4: texts[0].text = DSUtil.Format(m_Data.n_MissionDesc, m_Data.l_MissionConditionCount, table_localtext.Ins.Get_Text(1031)); break;
}
break;
case ePurpose.GET_ESSENCE_GRADE_ACC:
texts[0].text = DSUtil.Format(m_Data.n_MissionDesc, m_Data.l_MissionConditionCount, table_localtext.Ins.Get_Text(3340 + m_Data.n_MissionConditionValue));
break;
default:
texts[0].text = DSUtil.Format(m_Data.n_MissionDesc, m_Data.l_MissionConditionCount);
break;
}
}
void Set_Proc()
{
var sdata = ServerInfo.Ins.m_ServerData;

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

@ -196,7 +196,7 @@ public enum eStat
public enum eFarmerStat { MoveSpeed, DanceCoolTime }
public enum eCommon
{
Agree, Noti, NightNoti, DOY_Day, DOY_Week, DOY_Month, PlayTime, Auto, Title, ADRemove, GuideStep, GuideClear,
Agree, Noti, NightNoti, DOY_Day, DOY_Week, DOY_Month, PlayTime, Auto, Title, ADRemove, GuideStep, GuideCount,
NickChange, X2, CloverShopResetTime, CloverShopID_Weapon, CloverShopID_Ring, CloverShopID_Neck, CloverShopID_Boots, CloverShopID_Fairy, CloverShopID_Magic, CloverShopID_Pet, InAppBuyCount, FieldFirstFree,
Roullette_Ticket, Roullette_Count, Roullette_ADCount, Roullette_LuckyCount, AttendanceStep, AttendanceDOY,