Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix event story popup. Wrong new, some unlock text bugs. #292

Merged
merged 2 commits into from
Sep 29, 2024
Merged

Fix event story popup. Wrong new, some unlock text bugs. #292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20c982f
Rename variables. Fix a wrong text for new stories flag
Xele02 Sep 29, 2024
2e4b856
Fix unlock story sns cost text. Fix cancel which unlocked the story
Xele02 Sep 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
278 changes: 139 additions & 139 deletions Unity/Assets/UMAssets/Scripts/CCAAJNJGNDO.cs
View file
Open in desktop

Large diffs are not rendered by default.

28 changes: 14 additions & 14 deletions Unity/Assets/UMAssets/Scripts/DKKPBBBDKMJ.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,15 @@ public void KHEKNNFCAOI()
FBIOJHECAHB_EventStory.GIEHECAKIFC storyEvent = IMMAOANGPNK.HHCJCDFCLOB.NKEBMCIMJND_Database.NBEMLGADAGK_EventStory.ILEJEJKNOBN[i];
if(storyEvent.PPEGAKEIEGM == 2)
{
bool b1 = false;
bool hasNewAdv = false;
bool b2 = false;
bool b3 = false;
for(int j = 0; j < IMMAOANGPNK.HHCJCDFCLOB.NKEBMCIMJND_Database.NBEMLGADAGK_EventStory.JPIGOBGOMON.Count; j++)
{
FBIOJHECAHB_EventStory.ENDMMNNOAIL storyEvent2 = IMMAOANGPNK.HHCJCDFCLOB.NKEBMCIMJND_Database.NBEMLGADAGK_EventStory.JPIGOBGOMON[j];
if(storyEvent.OAFJONPIFGM_EventId == storyEvent2.OAFJONPIFGM)
if(storyEvent.OAFJONPIFGM_EventId == storyEvent2.OAFJONPIFGM_EventId)
{
if(storyEvent2.JDJNNJEJDAJ == FBIOJHECAHB_EventStory.NMIGMCJHAIE.MOPAEGFEGCB_5)
if(storyEvent2.JDJNNJEJDAJ == FBIOJHECAHB_EventStory.NMIGMCJHAIE.MOPAEGFEGCB_5_EpisodeStory)
{
if(storyEvent2.CHOFDPDFPDC == 4)
{
Expand All @@ -68,10 +68,10 @@ public void KHEKNNFCAOI()
{
if(HOMGKHBHDME.EKLIPGELKCL_SceneRarity > 5)
{
if(HOMGKHBHDME.FGMPFHOEPEL() != 0)
if(HOMGKHBHDME.FGMPFHOEPEL_GetNumUnlockedStory() != 0)
{
MHCPOIEDLJF = true;
b1 |= !CIOECGOMILE.HHCJCDFCLOB.AHEFHIMGIBI_ServerSave.HBPPNFHOMNB_Adventure.FABEJIHKFGN(storyEvent2.LOHMKCPKBON);
hasNewAdv |= !CIOECGOMILE.HHCJCDFCLOB.AHEFHIMGIBI_ServerSave.HBPPNFHOMNB_Adventure.FABEJIHKFGN_IsViewed(storyEvent2.LOHMKCPKBON_AdvId);
b2 = true;
continue;
}
Expand All @@ -83,7 +83,7 @@ public void KHEKNNFCAOI()
}
else if(storyEvent2.CHOFDPDFPDC == 3)
{
if (!CIOECGOMILE.HHCJCDFCLOB.AHEFHIMGIBI_ServerSave.HBPPNFHOMNB_Adventure.FABEJIHKFGN(storyEvent2.LOHMKCPKBON))
if (!CIOECGOMILE.HHCJCDFCLOB.AHEFHIMGIBI_ServerSave.HBPPNFHOMNB_Adventure.FABEJIHKFGN_IsViewed(storyEvent2.LOHMKCPKBON_AdvId))
{
b3 = true;
}
Expand All @@ -110,7 +110,7 @@ public void KHEKNNFCAOI()
}
AGAAGMGKNCO data = new AGAAGMGKNCO();
data.PGIIDPEGGPI_EventId = storyEvent.OAFJONPIFGM_EventId;
data.CADENLBDAEB_IsNew = b1;
data.CADENLBDAEB_IsNew = hasNewAdv;
data.CPKMLLNADLJ = storyEvent.MGBDCFIKBPM;
DateTime dt = Utility.GetLocalDateTime(storyEvent.PDBPFJJCADD);
DateTime dt2 = Utility.GetLocalDateTime(storyEvent.FDBNFFNFOND);
Expand Down Expand Up @@ -150,13 +150,13 @@ public void JPLNEJFDPHN(int CPKMLLNADLJ)
if(k.CPKMLLNADLJ == 5)
{
int a1 = 0;
bool b1 = false;
bool hasViewed = false;
foreach (var k2 in IMMAOANGPNK.HHCJCDFCLOB.NKEBMCIMJND_Database.NBEMLGADAGK_EventStory.JPIGOBGOMON)
{
if(k2.OAFJONPIFGM == k.PGIIDPEGGPI_EventId && k2.CHOFDPDFPDC == 4)
if(k2.OAFJONPIFGM_EventId == k.PGIIDPEGGPI_EventId && k2.CHOFDPDFPDC == 4)
{
MMPBPOIFDAF_Scene.PMKOFEIONEG scene = CIOECGOMILE.HHCJCDFCLOB.AHEFHIMGIBI_ServerSave.PNLOINMCCKH_Scene.OPIBAPEGCLA[CCAAJNJGNDO.FCMFPPALLOM(k2.OAFJONPIFGM) - 1];
MLIBEPGADJH_Scene.KKLDOOJBJMN scene2 = IMMAOANGPNK.HHCJCDFCLOB.NKEBMCIMJND_Database.ECNHDEHADGL_Scene.CDENCMNHNGA_SceneList[CCAAJNJGNDO.FCMFPPALLOM(k2.OAFJONPIFGM) - 1];
MMPBPOIFDAF_Scene.PMKOFEIONEG scene = CIOECGOMILE.HHCJCDFCLOB.AHEFHIMGIBI_ServerSave.PNLOINMCCKH_Scene.OPIBAPEGCLA[CCAAJNJGNDO.FCMFPPALLOM(k2.OAFJONPIFGM_EventId) - 1];
MLIBEPGADJH_Scene.KKLDOOJBJMN scene2 = IMMAOANGPNK.HHCJCDFCLOB.NKEBMCIMJND_Database.ECNHDEHADGL_Scene.CDENCMNHNGA_SceneList[CCAAJNJGNDO.FCMFPPALLOM(k2.OAFJONPIFGM_EventId) - 1];
HOMGKHBHDME.KHEKNNFCAOI(scene.PPFNGGCBJKC_Id, scene.PDNIFBEGMHC_Mb, scene.EMOJHJGHJLN_Sb, scene.JPIPENJGGDD_Mlt, scene.IELENGDJPHF_Ulk, scene.MJBODMOLOBC_Luck, scene.LHMOAJAIJCO_New, scene.BEBJKJKBOGH_Date, scene.DMNIMMGGJJJ_Leaf);
a1++;
if (HOMGKHBHDME.CGKAEMGLHNK_IsUnlocked())
Expand All @@ -165,16 +165,16 @@ public void JPLNEJFDPHN(int CPKMLLNADLJ)
{
if(HOMGKHBHDME.EKLIPGELKCL_SceneRarity > 5)
{
if(HOMGKHBHDME.FGMPFHOEPEL() >= a1)
if(HOMGKHBHDME.FGMPFHOEPEL_GetNumUnlockedStory() >= a1)
{
b1 |= !CIOECGOMILE.HHCJCDFCLOB.AHEFHIMGIBI_ServerSave.HBPPNFHOMNB_Adventure.FABEJIHKFGN(k2.LOHMKCPKBON);
hasViewed |= !CIOECGOMILE.HHCJCDFCLOB.AHEFHIMGIBI_ServerSave.HBPPNFHOMNB_Adventure.FABEJIHKFGN_IsViewed(k2.LOHMKCPKBON_AdvId);
}
}
}
}
}
}
k.CADENLBDAEB_IsNew = !b1;
k.CADENLBDAEB_IsNew = hasViewed;
}
}
}
Expand Down
28 changes: 14 additions & 14 deletions Unity/Assets/UMAssets/Scripts/Database/FBIOJHECAHB.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ public class ENDMMNNOAIL
{
public int PPFNGGCBJKC; // 0x8
public int PPEGAKEIEGM; // 0xC
public int OAFJONPIFGM; // 0x10
public int OAFJONPIFGM_EventId; // 0x10
public NMIGMCJHAIE JDJNNJEJDAJ; // 0x14
public int LOHMKCPKBON; // 0x18
public int LOHMKCPKBON_AdvId; // 0x18
public int CHOFDPDFPDC; // 0x1C
public int PFGAKEDKOPD; // 0x20
public int PFGAKEDKOPD_UnlockSpCost; // 0x20
}

public class CHCCGPMJFEL
Expand All @@ -36,11 +36,11 @@ public class CHCCGPMJFEL

public enum NMIGMCJHAIE
{
JFEDIMKFDNH = 1,
GBECNPANBEA_2 = 2,
OEDCONLFLHD = 3,
DCDEBCIMEMM = 4,
MOPAEGFEGCB_5 = 5,
JFEDIMKFDNH_Prologue = 1,
GBECNPANBEA_2_Sns = 2,
OEDCONLFLHD_Epilogue = 3,
DCDEBCIMEMM_Opening = 4,
MOPAEGFEGCB_5_EpisodeStory = 5,
}

public enum CHMHPDHPDCD
Expand Down Expand Up @@ -98,11 +98,11 @@ public override bool IIEMACPEEBJ(byte[] DBBGALAPFGC)
ENDMMNNOAIL data = new ENDMMNNOAIL();
data.PPFNGGCBJKC = array[i].PPFNGGCBJKC;
data.PPEGAKEIEGM = array[i].PLALNIIBLOF;
data.OAFJONPIFGM = array[i].BCKCEEMNKCH;
data.OAFJONPIFGM_EventId = array[i].BCKCEEMNKCH;
data.JDJNNJEJDAJ = (NMIGMCJHAIE)array[i].PIDAAPMCAML;
data.LOHMKCPKBON = array[i].OIAAFFHGBBD;
data.LOHMKCPKBON_AdvId = array[i].OIAAFFHGBBD;
data.CHOFDPDFPDC = array[i].ODNOJKHHEOP;
data.PFGAKEDKOPD = array[i].DFMOIKJOCGH;
data.PFGAKEDKOPD_UnlockSpCost = array[i].DFMOIKJOCGH;
JPIGOBGOMON.Add(data);
}
}
Expand All @@ -128,8 +128,8 @@ public ENDMMNNOAIL GIBIMCOLLNN(int AIPLIEMLHGC)
ENDMMNNOAIL e = JPIGOBGOMON.Find((ENDMMNNOAIL GHPLINIACBB) =>
{
//0xFC7200
if(GHPLINIACBB.PPEGAKEIEGM == 2 && GHPLINIACBB.JDJNNJEJDAJ == NMIGMCJHAIE.GBECNPANBEA_2)
return GHPLINIACBB.LOHMKCPKBON == AIPLIEMLHGC;
if(GHPLINIACBB.PPEGAKEIEGM == 2 && GHPLINIACBB.JDJNNJEJDAJ == NMIGMCJHAIE.GBECNPANBEA_2_Sns)
return GHPLINIACBB.LOHMKCPKBON_AdvId == AIPLIEMLHGC;
return false;
});
if(e != null)
Expand All @@ -139,7 +139,7 @@ public ENDMMNNOAIL GIBIMCOLLNN(int AIPLIEMLHGC)
//0xFC7254
if(GHPLINIACBB.PPEGAKEIEGM != 2)
return false;
return GHPLINIACBB.OAFJONPIFGM_EventId == e.OAFJONPIFGM;
return GHPLINIACBB.OAFJONPIFGM_EventId == e.OAFJONPIFGM_EventId;
}) != null)
{
return e;
Expand Down
2 changes: 1 addition & 1 deletion Unity/Assets/UMAssets/Scripts/Database/MLIBEPGADJH.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ public int PKNGPIFNIGN(KOGHKIODHPA_Board JEMMMJEJLNL, int JPIPENJGGDD, int JPJNK
}

// // RVA: 0x1963110 Offset: 0x1963110 VA: 0x1963110
public int JGKOJEOLMIL(KOGHKIODHPA_Board JEMMMJEJLNL, byte[] KBOLNIBLIND)
public int JGKOJEOLMIL_GetNumUnlockedStory(KOGHKIODHPA_Board JEMMMJEJLNL, byte[] KBOLNIBLIND)
{
if (KBOLNIBLIND == null)
return 0;
Expand Down
2 changes: 1 addition & 1 deletion Unity/Assets/UMAssets/Scripts/FDDIIKBJNNA.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ public void OPBFFEMJBFH(long JHNMKKNEENE, bool DENGEJFHAFA, bool IAHLNPMFJMH, in
if(evData != null)
{
MessageBank bk2 = MessageManager.Instance.GetBank("menu");
data.LJGOOOMOMMA_Desc = string.Format(bk2.GetMessageByLabel("event_story_text_006"), EKLNMHFCAOI.INCKKODFJAP_GetItemName(EKLNMHFCAOI.FKGCBLHOOCL_Category.FMIIHMHKJDI_SpItem, 1), evData.PFGAKEDKOPD, EKLNMHFCAOI.NDBLEADIDLA(EKLNMHFCAOI.FKGCBLHOOCL_Category.FMIIHMHKJDI_SpItem, 1));
data.LJGOOOMOMMA_Desc = string.Format(bk2.GetMessageByLabel("event_story_text_006"), EKLNMHFCAOI.INCKKODFJAP_GetItemName(EKLNMHFCAOI.FKGCBLHOOCL_Category.FMIIHMHKJDI_SpItem, 1), evData.PFGAKEDKOPD_UnlockSpCost, EKLNMHFCAOI.NDBLEADIDLA(EKLNMHFCAOI.FKGCBLHOOCL_Category.FMIIHMHKJDI_SpItem, 1));
}
}
else
Expand Down
4 changes: 2 additions & 2 deletions Unity/Assets/UMAssets/Scripts/GCIJNCFDNON.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1069,11 +1069,11 @@ public int CGJCEHGFHMA()
}

// // RVA: 0x16B28E0 Offset: 0x16B28E0 VA: 0x16B28E0
public int FGMPFHOEPEL()
public int FGMPFHOEPEL_GetNumUnlockedStory()
{
if (JKGFBFPIMGA_Rarity < 6)
return 0;
return IMMAOANGPNK.HHCJCDFCLOB.NKEBMCIMJND_Database.ECNHDEHADGL_Scene.CDENCMNHNGA_SceneList[BCCHOBPJJKE_SceneId - 1].JGKOJEOLMIL(IMMAOANGPNK.HHCJCDFCLOB.NKEBMCIMJND_Database.JEMMMJEJLNL_Board, KBOLNIBLIND_Mb);
return IMMAOANGPNK.HHCJCDFCLOB.NKEBMCIMJND_Database.ECNHDEHADGL_Scene.CDENCMNHNGA_SceneList[BCCHOBPJJKE_SceneId - 1].JGKOJEOLMIL_GetNumUnlockedStory(IMMAOANGPNK.HHCJCDFCLOB.NKEBMCIMJND_Database.JEMMMJEJLNL_Board, KBOLNIBLIND_Mb);
}

// // RVA: 0x16B2A54 Offset: 0x16B2A54 VA: 0x16B2A54
Expand Down
2 changes: 1 addition & 1 deletion Unity/Assets/UMAssets/Scripts/KDHGBOOECKC.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3042,7 +3042,7 @@ public bool NKEKPBALJGD_IsFirstAdvOfferDone()
{
if (IMMAOANGPNK.HHCJCDFCLOB.NKEBMCIMJND_Database == null || CIOECGOMILE.HHCJCDFCLOB.AHEFHIMGIBI_ServerSave == null)
return false;
return CIOECGOMILE.HHCJCDFCLOB.AHEFHIMGIBI_ServerSave.HBPPNFHOMNB_Adventure.FABEJIHKFGN(IMMAOANGPNK.HHCJCDFCLOB.NKEBMCIMJND_Database.LBCMJGOOHLJ_Offer.LPJLEHAJADA("first_adv_id", 88));
return CIOECGOMILE.HHCJCDFCLOB.AHEFHIMGIBI_ServerSave.HBPPNFHOMNB_Adventure.FABEJIHKFGN_IsViewed(IMMAOANGPNK.HHCJCDFCLOB.NKEBMCIMJND_Database.LBCMJGOOHLJ_Offer.LPJLEHAJADA("first_adv_id", 88));
}

// // RVA: 0x1035330 Offset: 0x1035330 VA: 0x1035330
Expand Down
2 changes: 1 addition & 1 deletion Unity/Assets/UMAssets/Scripts/ServerSave/EGOLBAPFHHD.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -662,7 +662,7 @@ private PPNFHHPJOKK_SpItem.JBBIPIAABOJ FOECFMNNNMP_GetEnabledSpItem(int PPFNGGCB
// public bool POOOHJIJLNN(int PPFNGGCBJKC, int HMFFHLPNMPH) { }

// // RVA: 0x1C528D0 Offset: 0x1C528D0 VA: 0x1C528D0
public bool NLOGLGKPMNI(int PPFNGGCBJKC, int HMFFHLPNMPH)
public bool NLOGLGKPMNI_ConsumeItem(int PPFNGGCBJKC, int HMFFHLPNMPH)
{
if(PPFNGGCBJKC > 0 && PPFNGGCBJKC <= 16)
{
Expand Down
4 changes: 2 additions & 2 deletions Unity/Assets/UMAssets/Scripts/ServerSave/HHDEBNFMIMH.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@ public bool AGBOGBEOFME(JLAPDGALDGC OIKJFMGEICL)
public override bool DMICHEJIAJL { get { return true; } } // 0x175742C NFKFOODCJJB

// // RVA: 0x17550EC Offset: 0x17550EC VA: 0x17550EC
public void GFANLIOMMNA(int BPNKGDGBBFG)
public void GFANLIOMMNA_SetViewed(int BPNKGDGBBFG)
{
JBBHBNAJMJB[BPNKGDGBBFG - 1].BEBJKJKBOGH_Date = NKGJPJPHLIF.HHCJCDFCLOB.IBLPICFDGOF_ServerRequester.FJDBNGEPKHL.KMEFBNBFJHI_GetServerTime();
}

// // RVA: 0x175523C Offset: 0x175523C VA: 0x175523C
public bool FABEJIHKFGN(int MDLFDNOJAJN)
public bool FABEJIHKFGN_IsViewed(int MDLFDNOJAJN)
{
return JBBHBNAJMJB[MDLFDNOJAJN - 1].BEBJKJKBOGH_Date != 0;
}
Expand Down
27 changes: 14 additions & 13 deletions Unity/Assets/UMAssets/Scripts/XeApp/Game/Menu/EventStoryScene.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ private void LookEvent(int index)
{
Database.Instance.advResult.Setup("Menu", uniqueId, new AdvSetupParam() { eventUniqueId = eventUniqueId, restorBgmId = restorBgmId, restorListPosition = pos, bgParam = new AdvReturnBgParam() { bgId = bgId, textureType = bgTexType, bgType = bgType, attr = bgAttr }, eventStoryData = m_eventStoryData });
}
CIOECGOMILE.HHCJCDFCLOB.AHEFHIMGIBI_ServerSave.HBPPNFHOMNB_Adventure.GFANLIOMMNA(data.PBPOLELIPJI_AdventureId);
CIOECGOMILE.HHCJCDFCLOB.AHEFHIMGIBI_ServerSave.HBPPNFHOMNB_Adventure.GFANLIOMMNA_SetViewed(data.PBPOLELIPJI_AdventureId);
GPMHOAKFALE_Adventure.NGDBKCKMDHE dbAdv = IMMAOANGPNK.HHCJCDFCLOB.NKEBMCIMJND_Database.EFMAIKAHFEK_Adventure.GCINIJEMHFK(data.PBPOLELIPJI_AdventureId);
OAGBCBBHMPF.DKAMMIHBINF a = 0;
if (m_eventStoryData.IPCPFJJPIII - 1 < 4)
Expand Down Expand Up @@ -354,23 +354,24 @@ private IEnumerator Co_ShowUnlockSnsPopup(int index)
{
str2 = EKLNMHFCAOI.INCKKODFJAP_GetItemName(EKLNMHFCAOI.GJEEGMCBGGM_GetItemFullId(EKLNMHFCAOI.FKGCBLHOOCL_Category.FMIIHMHKJDI_SpItem, 1));
a1 = CIOECGOMILE.HHCJCDFCLOB.AHEFHIMGIBI_ServerSave.KCCLEHLLOFG_Common.JJKEDPHDEDO_GetSpItemCount(1);
a2 = d.GAGNJGMKPME_UnlockCost;
str = EKLNMHFCAOI.NDBLEADIDLA(EKLNMHFCAOI.FKGCBLHOOCL_Category.FMIIHMHKJDI_SpItem, 1);
}
if(d.NHKNPHLNHHD != 0)
if(d.NHKNPHLNHHD_UnlockError != 0)
{
textPopup.Buttons = new ButtonInfo[1]
{
new ButtonInfo() { Label = PopupButton.ButtonLabel.Ok, Type = PopupButton.ButtonType.Positive }
};
if(d.NHKNPHLNHHD == CCAAJNJGNDO.JLFOIPMADEP.EPIBHNAAJGL_1)
if(d.NHKNPHLNHHD_UnlockError == CCAAJNJGNDO.JLFOIPMADEP.EPIBHNAAJGL_1_UnlockNotEnoughItems)
{
textPopup.TitleText = bank.GetMessageByLabel("event_story_text_014");
textPopup.Text = string.Format(bank.GetMessageByLabel("event_story_text_013"), str2, a2);
textPopup.Text = string.Format(bank.GetMessageByLabel("event_story_text_013"), str2, a2, str);
}
else if(d.NHKNPHLNHHD == CCAAJNJGNDO.JLFOIPMADEP.IAHDGAGKBGJ_2)
else if(d.NHKNPHLNHHD_UnlockError == CCAAJNJGNDO.JLFOIPMADEP.IAHDGAGKBGJ_2_PreviousNotViewed)
{
textPopup.TitleText = bank.GetMessageByLabel("event_story_text_008");
textPopup.Text = bank.GetMessageByLabel(d.FICACPOCAPG ? "event_story_text_012" : "event_story_text_011");
textPopup.Text = bank.GetMessageByLabel(d.FICACPOCAPG_IsViewed ? "event_story_text_012" : "event_story_text_011");
}
isWait = true;
PopupWindowManager.Show(textPopup, (PopupWindowControl control, PopupButton.ButtonType type, PopupButton.ButtonLabel label) =>
Expand All @@ -394,7 +395,7 @@ private IEnumerator Co_ShowUnlockSnsPopup(int index)
new ButtonInfo() { Label = PopupButton.ButtonLabel.UsedItem, Type = PopupButton.ButtonType.Positive }
};
isWait = true;
bool isPositive = true;
bool isPositive = false;
PopupWindowManager.Show(textPopup, (PopupWindowControl control, PopupButton.ButtonType type, PopupButton.ButtonLabel label) =>
{
//0xB975AC
Expand Down Expand Up @@ -493,10 +494,10 @@ private void UpdateList(int index, SwapScrollListContent content)
c.EnableArrow(true);
bool b = false;
if (!d.CDOCOLOKCJK_Unlocked)
b = !d.GELLHOIEABC;
b = !d.GELLHOIEABC_PreviousViewed;
c.EnableNoise(b);
c.SetThumbnail(d.HIGLGJBBPAP_ThumbId, d.DEAKHOJCBDM_Index);
c.EnableNewIcon(d.IFNIEPPAMBE);
c.EnableNewIcon(d.IFNIEPPAMBE_IsNew);
}
else if(d.DHJFHNFFDMG)
{
Expand All @@ -507,7 +508,7 @@ private void UpdateList(int index, SwapScrollListContent content)
c.EnableArrow(true);
c.EnableNoise(false);
c.SetThumbnail(d.HIGLGJBBPAP_ThumbId, d.DEAKHOJCBDM_Index);
c.EnableNewIcon(d.IFNIEPPAMBE);
c.EnableNewIcon(d.IFNIEPPAMBE_IsNew);
if(!d.CDOCOLOKCJK_Unlocked)
{
c.SetButtonLabel(EventStoryListContent.ButtonLabel.Release);
Expand All @@ -529,11 +530,11 @@ private void UpdateList(int index, SwapScrollListContent content)
c.EnableThumbnail(true);
c.EnableArrow(true);
c.EnableNoise(!d.CDOCOLOKCJK_Unlocked);
c.SetThumbnail(d.HIGLGJBBPAP_ThumbId, d.BMCJDCOEJFH == CCAAJNJGNDO.NIPDOAIGCIB.OEDCONLFLHD_2/*2*/);
c.SetThumbnail(d.HIGLGJBBPAP_ThumbId, d.BMCJDCOEJFH == CCAAJNJGNDO.NIPDOAIGCIB.OEDCONLFLHD_2_Epilogue/*2*/);
c.EnableNewIcon(false);
}
c.SetButtonLabel(d.FICACPOCAPG ? EventStoryListContent.ButtonLabel.Release : EventStoryListContent.ButtonLabel.Look);
c.SetButtonFunc(d.FICACPOCAPG ? EventStoryListContent.ButtonFunc.Release : EventStoryListContent.ButtonFunc.Look);
c.SetButtonLabel(d.FICACPOCAPG_IsViewed ? EventStoryListContent.ButtonLabel.Release : EventStoryListContent.ButtonLabel.Look);
c.SetButtonFunc(d.FICACPOCAPG_IsViewed ? EventStoryListContent.ButtonFunc.Release : EventStoryListContent.ButtonFunc.Look);
c.ChangeReleaseFont(EventStoryListContent.ReleaseFont.DoRelease);
}

Expand Down
14 changes: 7 additions & 7 deletions Unity/Assets/UMAssets/Scripts/XeApp/Game/Menu/HomeScene.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1125,7 +1125,7 @@ private void OnClickEventLead()
TodoLogger.LogError(TodoLogger.EventQuest_6, "Quest");
}
//LAB_009789d0
CIOECGOMILE.HHCJCDFCLOB.AHEFHIMGIBI_ServerSave.HBPPNFHOMNB_Adventure.GFANLIOMMNA(a1);
CIOECGOMILE.HHCJCDFCLOB.AHEFHIMGIBI_ServerSave.HBPPNFHOMNB_Adventure.GFANLIOMMNA_SetViewed(a1);
ILCCJNDFFOB.HHCJCDFCLOB.LIIJEGOIKDP(a1, OAGBCBBHMPF.DKAMMIHBINF.IFEDIOFCOBC_7);
Database.Instance.advSetup.Setup(adv.KKPPFAHFOJI_FileId);
MenuScene.Instance.GotoAdventure();
Expand Down Expand Up @@ -1180,7 +1180,7 @@ private void GotoCurrentEventScene(int eventUniqueId, OHCAABOMEOF.KGOGMKMBCPP_Ev
TodoLogger.LogError(TodoLogger.EventGoDiva_14, "Event Go Diva");
break;
}
CIOECGOMILE.HHCJCDFCLOB.AHEFHIMGIBI_ServerSave.HBPPNFHOMNB_Adventure.GFANLIOMMNA(id);
CIOECGOMILE.HHCJCDFCLOB.AHEFHIMGIBI_ServerSave.HBPPNFHOMNB_Adventure.GFANLIOMMNA_SetViewed(id);
ILCCJNDFFOB.HHCJCDFCLOB.LIIJEGOIKDP(id, OAGBCBBHMPF.DKAMMIHBINF.IDINJDEBPKP_6);
Database.Instance.advSetup.Setup(adv.KKPPFAHFOJI_FileId);
MenuScene.Instance.GotoAdventure();
Expand Down Expand Up @@ -1382,7 +1382,7 @@ private IEnumerator Co_SceneIntroduce()
while (TipsControl.Instance.isPlayingAnime())
yield return null;
Database.Instance.advResult.Setup("Menu", TransitionUniqueId.HOME);
CIOECGOMILE.HHCJCDFCLOB.AHEFHIMGIBI_ServerSave.HBPPNFHOMNB_Adventure.GFANLIOMMNA(GetRareBreakAdvId());
CIOECGOMILE.HHCJCDFCLOB.AHEFHIMGIBI_ServerSave.HBPPNFHOMNB_Adventure.GFANLIOMMNA_SetViewed(GetRareBreakAdvId());
ILCCJNDFFOB.HHCJCDFCLOB.LIIJEGOIKDP(GetRareBreakAdvId(), OAGBCBBHMPF.DKAMMIHBINF.PGNFDEIHHMD/*9*/);
Database.Instance.advSetup.Setup(IMMAOANGPNK.HHCJCDFCLOB.NKEBMCIMJND_Database.EFMAIKAHFEK_Adventure.GCINIJEMHFK(GetRareBreakAdvId()).KKPPFAHFOJI_FileId);
MenuScene.Instance.GotoAdventure(true);
Expand All @@ -1396,7 +1396,7 @@ private IEnumerator Co_SceneIntroduce()
while (TipsControl.Instance.isPlayingAnime())
yield return null;
Database.Instance.advResult.Setup("Menu", TransitionUniqueId.HOME);
CIOECGOMILE.HHCJCDFCLOB.AHEFHIMGIBI_ServerSave.HBPPNFHOMNB_Adventure.GFANLIOMMNA(m_eventAdvId);
CIOECGOMILE.HHCJCDFCLOB.AHEFHIMGIBI_ServerSave.HBPPNFHOMNB_Adventure.GFANLIOMMNA_SetViewed(m_eventAdvId);
ILCCJNDFFOB.HHCJCDFCLOB.LIIJEGOIKDP(m_eventAdvId, OAGBCBBHMPF.DKAMMIHBINF.PGNFDEIHHMD/*9*/);
Database.Instance.advSetup.Setup(IMMAOANGPNK.HHCJCDFCLOB.NKEBMCIMJND_Database.EFMAIKAHFEK_Adventure.GCINIJEMHFK(m_eventAdvId).KKPPFAHFOJI_FileId);
MenuScene.Instance.GotoAdventure(true);
Expand Down Expand Up @@ -1849,7 +1849,7 @@ private void OnClickDecoButton()
if(adv != null)
{
Database.Instance.advResult.Setup("Menu", TransitionUniqueId.DECO, new AdvSetupParam());
CIOECGOMILE.HHCJCDFCLOB.AHEFHIMGIBI_ServerSave.HBPPNFHOMNB_Adventure.GFANLIOMMNA(d);
CIOECGOMILE.HHCJCDFCLOB.AHEFHIMGIBI_ServerSave.HBPPNFHOMNB_Adventure.GFANLIOMMNA_SetViewed(d);
Database.Instance.advSetup.Setup(adv.KKPPFAHFOJI_FileId);
MenuScene.Instance.GotoAdventure(true);
ILCCJNDFFOB.HHCJCDFCLOB.CLGHLKLHEAK(JpStringLiterals.StringLiteral_16417, 0);
Expand Down Expand Up @@ -2870,7 +2870,7 @@ private bool CanRareBreakAdv()
if (CIOECGOMILE.HHCJCDFCLOB.AHEFHIMGIBI_ServerSave.JHFIPCIHJNL_Base.IJHBIMNKOMC_TutorialEnd == 2)
{
int id = GetRareBreakAdvId();
if(CIOECGOMILE.HHCJCDFCLOB.AHEFHIMGIBI_ServerSave.HBPPNFHOMNB_Adventure.FABEJIHKFGN(id) == false)
if(CIOECGOMILE.HHCJCDFCLOB.AHEFHIMGIBI_ServerSave.HBPPNFHOMNB_Adventure.FABEJIHKFGN_IsViewed(id) == false)
{
return NKGJPJPHLIF.HHCJCDFCLOB.FPNBCFJHENI.GGBCCADCPNP();
}
Expand Down Expand Up @@ -2906,7 +2906,7 @@ private int GetEventAdvId()
int advId = ev.BAEPGOAMBDK("adv_id", 0);
if (advId > 0)
{
if(!CIOECGOMILE.HHCJCDFCLOB.AHEFHIMGIBI_ServerSave.HBPPNFHOMNB_Adventure.FABEJIHKFGN(advId))
if(!CIOECGOMILE.HHCJCDFCLOB.AHEFHIMGIBI_ServerSave.HBPPNFHOMNB_Adventure.FABEJIHKFGN_IsViewed(advId))
{
long time = NKGJPJPHLIF.HHCJCDFCLOB.IBLPICFDGOF_ServerRequester.FJDBNGEPKHL.KMEFBNBFJHI_GetServerTime();
if(time >= ev.GLIMIGNNGGB_Start)
Expand Down
2 changes: 1 addition & 1 deletion Unity/Assets/UMAssets/Scripts/XeApp/Game/Menu/MenuBarPrefab.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ private bool CheckFirstAdvVOP()
else
{
Database.Instance.advResult.Setup("Menu", TransitionUniqueId.OFFERSELECT, new AdvSetupParam());
CIOECGOMILE.HHCJCDFCLOB.AHEFHIMGIBI_ServerSave.HBPPNFHOMNB_Adventure.GFANLIOMMNA(advId);
CIOECGOMILE.HHCJCDFCLOB.AHEFHIMGIBI_ServerSave.HBPPNFHOMNB_Adventure.GFANLIOMMNA_SetViewed(advId);
Database.Instance.advSetup.Setup(adv.KKPPFAHFOJI_FileId);
MenuScene.Instance.GotoAdventure(true);
ILCCJNDFFOB.HHCJCDFCLOB.BKLNHBHDDEJ(JpStringLiterals.StringLiteral_16417);
Expand Down
Loading