diff --git a/Unity/Assets/UMAssets/Scripts/CCAAJNJGNDO.cs b/Unity/Assets/UMAssets/Scripts/CCAAJNJGNDO.cs index c256e79a..b7c3a1c1 100644 --- a/Unity/Assets/UMAssets/Scripts/CCAAJNJGNDO.cs +++ b/Unity/Assets/UMAssets/Scripts/CCAAJNJGNDO.cs @@ -23,59 +23,59 @@ public enum BMFMICNKKJF public enum JLFOIPMADEP { - HJNNKCMLGFL = 0, - EPIBHNAAJGL_1 = 1, - IAHDGAGKBGJ_2 = 2, + HJNNKCMLGFL_0 = 0, + EPIBHNAAJGL_1_UnlockNotEnoughItems = 1, + IAHDGAGKBGJ_2_PreviousNotViewed = 2, } public enum NIPDOAIGCIB { - JFEDIMKFDNH_0 = 0, - GBECNPANBEA_1 = 1, - OEDCONLFLHD_2 = 2, - MOPAEGFEGCB = 3, - OOIPBACKOKH = 4, + JFEDIMKFDNH_0_Prologue = 0, + GBECNPANBEA_1_Sns = 1, + OEDCONLFLHD_2_Epilogue = 2, + MOPAEGFEGCB_3 = 3, + OOIPBACKOKH_4 = 4, } public class GALFFONBIJG { - private string ADCMNODJBGJ; // 0x8 - private string HBNEKPHPKII; // 0xC - private JLFOIPMADEP KKHDIHBHJCD; // 0x10 + private string ADCMNODJBGJ_Title; // 0x8 + private string HBNEKPHPKII_UnlockText_; // 0xC + private JLFOIPMADEP KKHDIHBHJCD_UnlockError; // 0x10 private NIPDOAIGCIB EMJFHKHLHDB; // 0x14 - private int PPFNGGCBJKC; // 0x18 - private int MKPJBDFDHOL; // 0x1C - private int MALFHCHNEFN; // 0x20 - private bool IPJMPBANBPP; // 0x24 + private int PPFNGGCBJKC_AdvId; // 0x18 + private int MKPJBDFDHOL_ThumbId_; // 0x1C + private int MALFHCHNEFN_RoomId_; // 0x20 + private bool IPJMPBANBPP_Unlocked_; // 0x24 private bool IBJNBJIFPAM; // 0x25 - private bool DJPODCBFDCN; // 0x26 + private bool DJPODCBFDCN_IsViewed; // 0x26 private CEBFFLDKAEC_SecureInt CHOFDPDFPDC = new CEBFFLDKAEC_SecureInt(); // 0x28 - private CEBFFLDKAEC_SecureInt PFGAKEDKOPD = new CEBFFLDKAEC_SecureInt(); // 0x2C - private int KDGJBBFKLGI; // 0x30 - private bool CADENLBDAEB; // 0x34 - private bool NPMMHCENABK; // 0x35 + private CEBFFLDKAEC_SecureInt PFGAKEDKOPD_UnlockCost = new CEBFFLDKAEC_SecureInt(); // 0x2C + private int KDGJBBFKLGI_Index; // 0x30 + private bool CADENLBDAEB_IsNew; // 0x34 + private bool NPMMHCENABK_PreviewViewed; // 0x35 - public string FFPANKMKAPD_Title { get { return ADCMNODJBGJ; } } //0x18FDD70 LLDJLCOLINP - public string OJAKFNNKADK_UnlockText { get { return HBNEKPHPKII; } } //0x18FDD78 ENODEHGLBMB - public int PBPOLELIPJI_AdventureId { get { return PPFNGGCBJKC; } } //0x18FD6BC AJNJOPJNMHL - public bool KKLDIKMOACO_IsSNS { get { return EMJFHKHLHDB == NIPDOAIGCIB.GBECNPANBEA_1/*1*/; } } //0x18FDAD4 KDPOHBICGIG - public bool GOBAMBLBCOM { get { return EMJFHKHLHDB == NIPDOAIGCIB.OEDCONLFLHD_2/*2*/ || EMJFHKHLHDB == NIPDOAIGCIB.JFEDIMKFDNH_0/*0*/; } } //0x18FDD80 LHCGKFGGKHF - public bool CMEKNACNMCE { get { return EMJFHKHLHDB == NIPDOAIGCIB.MOPAEGFEGCB/*3*/; } } //0x18FDD98 PLLDDFBFOEK - public bool DHJFHNFFDMG { get { return EMJFHKHLHDB == NIPDOAIGCIB.OOIPBACKOKH/*4*/; } } //0x18FDDAC MMKPJMILKBM + public string FFPANKMKAPD_Title { get { return ADCMNODJBGJ_Title; } } //0x18FDD70 LLDJLCOLINP + public string OJAKFNNKADK_UnlockText { get { return HBNEKPHPKII_UnlockText_; } } //0x18FDD78 ENODEHGLBMB + public int PBPOLELIPJI_AdventureId { get { return PPFNGGCBJKC_AdvId; } } //0x18FD6BC AJNJOPJNMHL + public bool KKLDIKMOACO_IsSNS { get { return EMJFHKHLHDB == NIPDOAIGCIB.GBECNPANBEA_1_Sns/*1*/; } } //0x18FDAD4 KDPOHBICGIG + public bool GOBAMBLBCOM { get { return EMJFHKHLHDB == NIPDOAIGCIB.OEDCONLFLHD_2_Epilogue/*2*/ || EMJFHKHLHDB == NIPDOAIGCIB.JFEDIMKFDNH_0_Prologue/*0*/; } } //0x18FDD80 LHCGKFGGKHF + public bool CMEKNACNMCE { get { return EMJFHKHLHDB == NIPDOAIGCIB.MOPAEGFEGCB_3/*3*/; } } //0x18FDD98 PLLDDFBFOEK + public bool DHJFHNFFDMG { get { return EMJFHKHLHDB == NIPDOAIGCIB.OOIPBACKOKH_4/*4*/; } } //0x18FDDAC MMKPJMILKBM public NIPDOAIGCIB BMCJDCOEJFH { get { return EMJFHKHLHDB; } } //0x18FD710 DPDGJDLHLCN - public bool CDOCOLOKCJK_Unlocked { get { return IPJMPBANBPP; } } //0x18FB9E4 CPLCFJBDCJP - public bool OKKNPGJAPAO_IsUnlockTextEmpty { get { return string.IsNullOrEmpty(HBNEKPHPKII); } } //0x18FDDC0 NOJBDDDCGIK - public int HIGLGJBBPAP_ThumbId { get { return MKPJBDFDHOL; } } //0x18FDDCC JGFEIGNOGMH + public bool CDOCOLOKCJK_Unlocked { get { return IPJMPBANBPP_Unlocked_; } } //0x18FB9E4 CPLCFJBDCJP + public bool OKKNPGJAPAO_IsUnlockTextEmpty { get { return string.IsNullOrEmpty(HBNEKPHPKII_UnlockText_); } } //0x18FDDC0 NOJBDDDCGIK + public int HIGLGJBBPAP_ThumbId { get { return MKPJBDFDHOL_ThumbId_; } } //0x18FDDCC JGFEIGNOGMH public bool OEDKEGEPFKE { get { return IBJNBJIFPAM; } } //0x18FDDD4 NGINCPFOKOI - public int CLIHPOEBELF_RoomId { get { return MALFHCHNEFN; } } //0x18FDDDC KOJLDOBBFLI - public bool FICACPOCAPG { get { return DJPODCBFDCN; } } //0x18FDDE4 ENGDEDCEKMH - public int DEIJDMPOPJF { get { return MKPJBDFDHOL; } } //0x18FDDEC OOCJFEMAHJM + public int CLIHPOEBELF_RoomId { get { return MALFHCHNEFN_RoomId_; } } //0x18FDDDC KOJLDOBBFLI + public bool FICACPOCAPG_IsViewed { get { return DJPODCBFDCN_IsViewed; } } //0x18FDDE4 ENGDEDCEKMH + public int DEIJDMPOPJF { get { return MKPJBDFDHOL_ThumbId_; } } //0x18FDDEC OOCJFEMAHJM public int LIPNNILKOLH { get { return CHOFDPDFPDC.DNJEJEANJGL_Value; } } //0x18FDB3C JPCNEPAEIBI - public int GAGNJGMKPME { get { return PFGAKEDKOPD.DNJEJEANJGL_Value; } } //0x18FDB68 HPPBIPOOLJL - public JLFOIPMADEP NHKNPHLNHHD { get { return KKHDIHBHJCD; } } //0x18FDDF4 GJGCBDFLLHE - public bool IFNIEPPAMBE { get { return CADENLBDAEB; } set { CADENLBDAEB = value; } } //0x18FB9EC DDMKFLKBLLM 0x18FDDFC GDNJIFOJKCJ - public int DEAKHOJCBDM_Index { get { return KDGJBBFKLGI; } } //0x18FDE04 NCJIACPIFGD - public bool GELLHOIEABC { get { return NPMMHCENABK; } set { NPMMHCENABK = value; } } //0x18FDE0C MHCIBMHLBMN 0x18FD6B4 LAMLNFGBNOF + public int GAGNJGMKPME_UnlockCost { get { return PFGAKEDKOPD_UnlockCost.DNJEJEANJGL_Value; } } //0x18FDB68 HPPBIPOOLJL + public JLFOIPMADEP NHKNPHLNHHD_UnlockError { get { return KKHDIHBHJCD_UnlockError; } } //0x18FDDF4 GJGCBDFLLHE + public bool IFNIEPPAMBE_IsNew { get { return CADENLBDAEB_IsNew; } set { CADENLBDAEB_IsNew = value; } } //0x18FB9EC DDMKFLKBLLM 0x18FDDFC GDNJIFOJKCJ + public int DEAKHOJCBDM_Index { get { return KDGJBBFKLGI_Index; } } //0x18FDE04 NCJIACPIFGD + public bool GELLHOIEABC_PreviousViewed { get { return NPMMHCENABK_PreviewViewed; } set { NPMMHCENABK_PreviewViewed = value; } } //0x18FDE0C MHCIBMHLBMN 0x18FD6B4 LAMLNFGBNOF //// RVA: 0x18FDAE4 Offset: 0x18FDAE4 VA: 0x18FDAE4 public FENCAJJBLBH KPOCKNCJBPN() @@ -83,61 +83,61 @@ public FENCAJJBLBH KPOCKNCJBPN() FENCAJJBLBH f = CHOFDPDFPDC.KPOCKNCJBPN_CheckSecure(); if(f != null) return f; - return PFGAKEDKOPD.KPOCKNCJBPN_CheckSecure(); + return PFGAKEDKOPD_UnlockCost.KPOCKNCJBPN_CheckSecure(); } //// RVA: 0x18FAB44 Offset: 0x18FAB44 VA: 0x18FAB44 - public void KHEKNNFCAOI(string ADCMNODJBGJ, string HBNEKPHPKII, NIPDOAIGCIB INDDJNMPONH, int PPFNGGCBJKC, int OAFJONPIFGM, int MALFHCHNEFN, bool IBJNBJIFPAM, bool IPJMPBANBPP) + public void KHEKNNFCAOI(string _ADCMNODJBGJ_Title, string _HBNEKPHPKII_UnlockText, NIPDOAIGCIB INDDJNMPONH, int _PPFNGGCBJKC_AdvId, int _OAFJONPIFGM_ThumbId, int _MALFHCHNEFN_RoomId, bool IBJNBJIFPAM, bool _IPJMPBANBPP_Unlocked) { - this.ADCMNODJBGJ = ADCMNODJBGJ; - this.HBNEKPHPKII = HBNEKPHPKII; + this.ADCMNODJBGJ_Title = _ADCMNODJBGJ_Title; + this.HBNEKPHPKII_UnlockText_ = _HBNEKPHPKII_UnlockText; EMJFHKHLHDB = INDDJNMPONH; - this.PPFNGGCBJKC = PPFNGGCBJKC; - MKPJBDFDHOL = OAFJONPIFGM; - this.MALFHCHNEFN = MALFHCHNEFN; - this.IPJMPBANBPP = IPJMPBANBPP; + this.PPFNGGCBJKC_AdvId = _PPFNGGCBJKC_AdvId; + MKPJBDFDHOL_ThumbId_ = _OAFJONPIFGM_ThumbId; + this.MALFHCHNEFN_RoomId_ = _MALFHCHNEFN_RoomId; + this.IPJMPBANBPP_Unlocked_ = _IPJMPBANBPP_Unlocked; this.IBJNBJIFPAM = IBJNBJIFPAM; - DJPODCBFDCN = false; - KDGJBBFKLGI = 0; - CADENLBDAEB = false; - NPMMHCENABK = false; + DJPODCBFDCN_IsViewed = false; + KDGJBBFKLGI_Index = 0; + CADENLBDAEB_IsNew = false; + NPMMHCENABK_PreviewViewed = false; } //// RVA: 0x18FCF48 Offset: 0x18FCF48 VA: 0x18FCF48 - public void KHEKNNFCAOI(string ADCMNODJBGJ, string HBNEKPHPKII, NIPDOAIGCIB INDDJNMPONH, int PPFNGGCBJKC, int OAFJONPIFGM, int MALFHCHNEFN, bool IBJNBJIFPAM, bool IPJMPBANBPP, bool DJPODCBFDCN, int CHOFDPDFPDC, int PFGAKEDKOPD, JLFOIPMADEP LJPMEHDDBGP) + public void KHEKNNFCAOI(string _ADCMNODJBGJ_Title, string _HBNEKPHPKII_UnlockText, NIPDOAIGCIB INDDJNMPONH, int _PPFNGGCBJKC_AdvId, int _OAFJONPIFGM_ThumbId, int _MALFHCHNEFN_RoomId, bool IBJNBJIFPAM, bool _IPJMPBANBPP_Unlocked, bool _DJPODCBFDCN_IsViewed, int CHOFDPDFPDC, int _PFGAKEDKOPD_UnlockCost, JLFOIPMADEP _LJPMEHDDBGP_UnlockError) { - this.ADCMNODJBGJ = ADCMNODJBGJ; - this.HBNEKPHPKII = HBNEKPHPKII; + this.ADCMNODJBGJ_Title = _ADCMNODJBGJ_Title; + this.HBNEKPHPKII_UnlockText_ = _HBNEKPHPKII_UnlockText; EMJFHKHLHDB = INDDJNMPONH; - this.PPFNGGCBJKC = PPFNGGCBJKC; - MKPJBDFDHOL = OAFJONPIFGM; - this.MALFHCHNEFN = MALFHCHNEFN; - this.IPJMPBANBPP = IPJMPBANBPP; + this.PPFNGGCBJKC_AdvId = _PPFNGGCBJKC_AdvId; + MKPJBDFDHOL_ThumbId_ = _OAFJONPIFGM_ThumbId; + this.MALFHCHNEFN_RoomId_ = _MALFHCHNEFN_RoomId; + this.IPJMPBANBPP_Unlocked_ = _IPJMPBANBPP_Unlocked; this.IBJNBJIFPAM = IBJNBJIFPAM; - KDGJBBFKLGI = 0; - CADENLBDAEB = false; - NPMMHCENABK = false; - this.DJPODCBFDCN = DJPODCBFDCN; + KDGJBBFKLGI_Index = 0; + CADENLBDAEB_IsNew = false; + NPMMHCENABK_PreviewViewed = false; + this.DJPODCBFDCN_IsViewed = _DJPODCBFDCN_IsViewed; this.CHOFDPDFPDC.DNJEJEANJGL_Value = CHOFDPDFPDC; - this.PFGAKEDKOPD.DNJEJEANJGL_Value = PFGAKEDKOPD; - KKHDIHBHJCD = LJPMEHDDBGP; + this.PFGAKEDKOPD_UnlockCost.DNJEJEANJGL_Value = _PFGAKEDKOPD_UnlockCost; + KKHDIHBHJCD_UnlockError = _LJPMEHDDBGP_UnlockError; } //// RVA: 0x18FB9F4 Offset: 0x18FB9F4 VA: 0x18FB9F4 - public void KHEKNNFCAOI(string ADCMNODJBGJ, string HBNEKPHPKII, NIPDOAIGCIB INDDJNMPONH, int PPFNGGCBJKC, int OAFJONPIFGM, int MALFHCHNEFN, bool IBJNBJIFPAM, bool IPJMPBANBPP, int KDGJBBFKLGI, bool CADENLBDAEB, bool NPMMHCENABK) + public void KHEKNNFCAOI(string _ADCMNODJBGJ_Title, string _HBNEKPHPKII_UnlockText, NIPDOAIGCIB INDDJNMPONH, int _PPFNGGCBJKC_AdvId, int _OAFJONPIFGM_ThumbId, int _MALFHCHNEFN_RoomId, bool IBJNBJIFPAM, bool _IPJMPBANBPP_Unlocked, int _KDGJBBFKLGI_Index, bool _CADENLBDAEB_IsNew, bool _NPMMHCENABK_PreviousViewed) { - this.ADCMNODJBGJ = ADCMNODJBGJ; - this.HBNEKPHPKII = HBNEKPHPKII; + this.ADCMNODJBGJ_Title = _ADCMNODJBGJ_Title; + this.HBNEKPHPKII_UnlockText_ = _HBNEKPHPKII_UnlockText; EMJFHKHLHDB = INDDJNMPONH; - this.PPFNGGCBJKC = PPFNGGCBJKC; - MKPJBDFDHOL = OAFJONPIFGM; - this.MALFHCHNEFN = MALFHCHNEFN; - this.IPJMPBANBPP = IPJMPBANBPP; + this.PPFNGGCBJKC_AdvId = _PPFNGGCBJKC_AdvId; + MKPJBDFDHOL_ThumbId_ = _OAFJONPIFGM_ThumbId; + this.MALFHCHNEFN_RoomId_ = _MALFHCHNEFN_RoomId; + this.IPJMPBANBPP_Unlocked_ = _IPJMPBANBPP_Unlocked; this.IBJNBJIFPAM = IBJNBJIFPAM; - DJPODCBFDCN = false; - this.KDGJBBFKLGI = KDGJBBFKLGI; - this.CADENLBDAEB = CADENLBDAEB; - this.NPMMHCENABK = NPMMHCENABK; + DJPODCBFDCN_IsViewed = false; + this.KDGJBBFKLGI_Index = _KDGJBBFKLGI_Index; + this.CADENLBDAEB_IsNew = _CADENLBDAEB_IsNew; + this.NPMMHCENABK_PreviewViewed = _NPMMHCENABK_PreviousViewed; } } @@ -177,19 +177,19 @@ public void KHEKNNFCAOI(IKDICBBFBMI_EventBase LIKDEHHKFEH) if(LIKDEHHKFEH.GFIBLLLHMPD_AdventureId > 0) { GALFFONBIJG g = new GALFFONBIJG(); - g.KHEKNNFCAOI(bk.GetMessageByLabel("event_story_text_001"), "", NIPDOAIGCIB.JFEDIMKFDNH_0, LIKDEHHKFEH.GFIBLLLHMPD_AdventureId, LIKDEHHKFEH.PGIIDPEGGPI_EventId, 0, false, true); + g.KHEKNNFCAOI(bk.GetMessageByLabel("event_story_text_001"), "", NIPDOAIGCIB.JFEDIMKFDNH_0_Prologue, LIKDEHHKFEH.GFIBLLLHMPD_AdventureId, LIKDEHHKFEH.PGIIDPEGGPI_EventId, 0, false, true); DHPMDOCLBGD.Add(g); } if(LIKDEHHKFEH.CAKEOPLJDAF > 0) { - bool b = true; + bool isAdvNew = true; if(LIKDEHHKFEH.NGOFCFJHOMI_Status > KGCNCBOKCBA.GNENJEHKMHD.EMAMLLFAOJI_6) { - b = !CIOECGOMILE.HHCJCDFCLOB.AHEFHIMGIBI_ServerSave.HBPPNFHOMNB_Adventure.FABEJIHKFGN(LIKDEHHKFEH.CAKEOPLJDAF); + isAdvNew = !CIOECGOMILE.HHCJCDFCLOB.AHEFHIMGIBI_ServerSave.HBPPNFHOMNB_Adventure.FABEJIHKFGN_IsViewed(LIKDEHHKFEH.CAKEOPLJDAF); } GALFFONBIJG g = new GALFFONBIJG(); EIIFHEMIAIJ.Clear(); - if(b) + if(isAdvNew) { DateTime dt = Utility.GetLocalDateTime(LIKDEHHKFEH.JDDFILGNGFH); EIIFHEMIAIJ.AppendFormat(bk.GetMessageByLabel("event_story_text_004"), new object[5] @@ -197,7 +197,7 @@ public void KHEKNNFCAOI(IKDICBBFBMI_EventBase LIKDEHHKFEH) dt.Year, dt.Month, dt.Day, dt.Hour, dt.Minute }); } - g.KHEKNNFCAOI(bk.GetMessageByLabel("event_story_text_002"), EIIFHEMIAIJ.ToString(), NIPDOAIGCIB.OEDCONLFLHD_2, LIKDEHHKFEH.CAKEOPLJDAF, LIKDEHHKFEH.PGIIDPEGGPI_EventId, 0, false, !b); + g.KHEKNNFCAOI(bk.GetMessageByLabel("event_story_text_002"), EIIFHEMIAIJ.ToString(), NIPDOAIGCIB.OEDCONLFLHD_2_Epilogue, LIKDEHHKFEH.CAKEOPLJDAF, LIKDEHHKFEH.PGIIDPEGGPI_EventId, 0, false, !isAdvNew); DHPMDOCLBGD.Add(g); } JCMHPMLKBHI.KHEKNNFCAOI(true, false, -1); @@ -240,7 +240,7 @@ public void KHEKNNFCAOI(IKDICBBFBMI_EventBase LIKDEHHKFEH) name = bk.GetMessageByLabel("event_story_text_005"); b1 = false; } - g.KHEKNNFCAOI(name, EIIFHEMIAIJ.ToString(), NIPDOAIGCIB.GBECNPANBEA_1, LIKDEHHKFEH.PFPJHJJAGAG[i].HBHMAKNGKFK[j].NNFNGLJOKKF_ItemId, 0, JCMHPMLKBHI.NPKPBDIDBBG_RoomData[k].MALFHCHNEFN_Id, !b1, b1 && b2); + g.KHEKNNFCAOI(name, EIIFHEMIAIJ.ToString(), NIPDOAIGCIB.GBECNPANBEA_1_Sns, LIKDEHHKFEH.PFPJHJJAGAG[i].HBHMAKNGKFK[j].NNFNGLJOKKF_ItemId, 0, JCMHPMLKBHI.NPKPBDIDBBG_RoomData[k].MALFHCHNEFN_Id, !b1, b1 && b2); DHPMDOCLBGD.Add(g); JCMHPMLKBHI.NPKPBDIDBBG_RoomData[k].MCGDHHHFBMO_GetUnreadIndex(t, false); } @@ -267,59 +267,59 @@ public void KHEKNNFCAOI(int OAFJONPIFGM) MessageBank masterBk = MessageManager.Instance.GetBank("master"); DHPMDOCLBGD.Clear(); MAIJBDCJPNJ = OAFJONPIFGM; - bool b1 = true; - bool b2 = true; - int e = 1; + bool previousSeen = true; + bool allviewed = true; + int index = 1; int g = 0; for(int i = 0; i < IMMAOANGPNK.HHCJCDFCLOB.NKEBMCIMJND_Database.NBEMLGADAGK_EventStory.JPIGOBGOMON.Count; i++) { FBIOJHECAHB_EventStory.ENDMMNNOAIL dbEventStory = IMMAOANGPNK.HHCJCDFCLOB.NKEBMCIMJND_Database.NBEMLGADAGK_EventStory.JPIGOBGOMON[i]; if(dbEventStory.PPEGAKEIEGM == 2) { - if(dbEventStory.OAFJONPIFGM == OAFJONPIFGM) + if(dbEventStory.OAFJONPIFGM_EventId == OAFJONPIFGM) { GALFFONBIJG d = new GALFFONBIJG(); switch(dbEventStory.JDJNNJEJDAJ) { - case FBIOJHECAHB_EventStory.NMIGMCJHAIE.JFEDIMKFDNH/*1*/: - string str2 = masterBk.GetMessageByLabel("adv_nm_" + dbEventStory.LOHMKCPKBON.ToString("D4")); + case FBIOJHECAHB_EventStory.NMIGMCJHAIE.JFEDIMKFDNH_Prologue/*1*/: + string str2 = masterBk.GetMessageByLabel("adv_nm_" + dbEventStory.LOHMKCPKBON_AdvId.ToString("D4")); if(str2 == "") { str2 = menuBk.GetMessageByLabel("event_story_text_001"); } - d.KHEKNNFCAOI(str2, "", NIPDOAIGCIB.JFEDIMKFDNH_0/*0*/, dbEventStory.LOHMKCPKBON, OAFJONPIFGM, 0, false, true); + d.KHEKNNFCAOI(str2, "", NIPDOAIGCIB.JFEDIMKFDNH_0_Prologue/*0*/, dbEventStory.LOHMKCPKBON_AdvId, OAFJONPIFGM, 0, false, true); break; - case FBIOJHECAHB_EventStory.NMIGMCJHAIE.GBECNPANBEA_2/*2*/: + case FBIOJHECAHB_EventStory.NMIGMCJHAIE.GBECNPANBEA_2_Sns/*2*/: for(int j = 0; j < CIOECGOMILE.HHCJCDFCLOB.AHEFHIMGIBI_ServerSave.FLHMJHBOBEA_Sns.HAJEJPFGILG.Count; j++) { DDEMMEPBOIA_Sns.EFIFBJGKPJF saveSns = CIOECGOMILE.HHCJCDFCLOB.AHEFHIMGIBI_ServerSave.FLHMJHBOBEA_Sns.HAJEJPFGILG[j]; - bool b = b2; - if(saveSns.HBNIMMAEKHJ_Id == dbEventStory.LOHMKCPKBON) + bool prevViewed = allviewed; + if(saveSns.HBNIMMAEKHJ_Id == dbEventStory.LOHMKCPKBON_AdvId) { - BOKMNHAFJHF_Sns.KEIGMAOCJHK dbSns = IMMAOANGPNK.HHCJCDFCLOB.NKEBMCIMJND_Database.OMGFKMANMAB_Sns.CDENCMNHNGA[dbEventStory.LOHMKCPKBON - 1]; - JLFOIPMADEP l = JLFOIPMADEP.HJNNKCMLGFL/*0*/; + BOKMNHAFJHF_Sns.KEIGMAOCJHK dbSns = IMMAOANGPNK.HHCJCDFCLOB.NKEBMCIMJND_Database.OMGFKMANMAB_Sns.CDENCMNHNGA[dbEventStory.LOHMKCPKBON_AdvId - 1]; + JLFOIPMADEP unlockErrorType = JLFOIPMADEP.HJNNKCMLGFL_0/*0*/; if (saveSns.BEBJKJKBOGH_Date == 0) { if(dbEventStory.CHOFDPDFPDC == 2) { - FAEDHJHCEFJ.SetFormat(menuBk.GetMessageByLabel("event_story_text_006"), EKLNMHFCAOI.INCKKODFJAP_GetItemName(EKLNMHFCAOI.FKGCBLHOOCL_Category.FMIIHMHKJDI_SpItem, 1), dbEventStory.PFGAKEDKOPD, EKLNMHFCAOI.NDBLEADIDLA(EKLNMHFCAOI.FKGCBLHOOCL_Category.FMIIHMHKJDI_SpItem, 1)); - int a = CIOECGOMILE.HHCJCDFCLOB.AHEFHIMGIBI_ServerSave.KCCLEHLLOFG_Common.JJKEDPHDEDO_GetSpItemCount(1); - l = JLFOIPMADEP.HJNNKCMLGFL/*0*/; - if (dbEventStory.PFGAKEDKOPD <= a) - l = JLFOIPMADEP.EPIBHNAAJGL_1/*1*/; + FAEDHJHCEFJ.SetFormat(menuBk.GetMessageByLabel("event_story_text_006"), EKLNMHFCAOI.INCKKODFJAP_GetItemName(EKLNMHFCAOI.FKGCBLHOOCL_Category.FMIIHMHKJDI_SpItem, 1), dbEventStory.PFGAKEDKOPD_UnlockSpCost, EKLNMHFCAOI.NDBLEADIDLA(EKLNMHFCAOI.FKGCBLHOOCL_Category.FMIIHMHKJDI_SpItem, 1)); + int ownedSpItem = CIOECGOMILE.HHCJCDFCLOB.AHEFHIMGIBI_ServerSave.KCCLEHLLOFG_Common.JJKEDPHDEDO_GetSpItemCount(1); + unlockErrorType = JLFOIPMADEP.HJNNKCMLGFL_0/*0*/; + if (dbEventStory.PFGAKEDKOPD_UnlockSpCost <= ownedSpItem) + unlockErrorType = JLFOIPMADEP.EPIBHNAAJGL_1_UnlockNotEnoughItems/*1*/; } - if (b1) - l = l == JLFOIPMADEP.HJNNKCMLGFL/*0*/ ? JLFOIPMADEP.EPIBHNAAJGL_1/*1*/ : JLFOIPMADEP.HJNNKCMLGFL/*0*/; + if (previousSeen) + unlockErrorType = unlockErrorType == JLFOIPMADEP.HJNNKCMLGFL_0/*0*/ ? JLFOIPMADEP.EPIBHNAAJGL_1_UnlockNotEnoughItems/*1*/ : JLFOIPMADEP.HJNNKCMLGFL_0/*0*/; else - l = JLFOIPMADEP.IAHDGAGKBGJ_2/*2*/; - b = false; + unlockErrorType = JLFOIPMADEP.IAHDGAGKBGJ_2_PreviousNotViewed/*2*/; + prevViewed = false; } else { FAEDHJHCEFJ.Set(""); } string s1, s2; - if(!b2) + if(!allviewed) { s1 = menuBk.GetMessageByLabel("event_story_text_005"); s2 = ""; @@ -329,62 +329,62 @@ public void KHEKNNFCAOI(int OAFJONPIFGM) s1 = masterBk.GetMessageByLabel("sns_nm_" + dbSns.AIPLIEMLHGC.ToString("D4")); s2 = FAEDHJHCEFJ.ToString(); } - d.KHEKNNFCAOI(s1, s2, NIPDOAIGCIB.GBECNPANBEA_1/*1*/, dbSns.AIPLIEMLHGC, OAFJONPIFGM, dbSns.MALFHCHNEFN_RoomId, b, true, saveSns.BEBJKJKBOGH_Date == 0, dbEventStory.CHOFDPDFPDC, dbEventStory.PFGAKEDKOPD, l); - b1 = saveSns.LDJIMGPHFPA_Cnt > 0; + d.KHEKNNFCAOI(s1, s2, NIPDOAIGCIB.GBECNPANBEA_1_Sns/*1*/, dbSns.AIPLIEMLHGC, OAFJONPIFGM, dbSns.MALFHCHNEFN_RoomId, prevViewed, true, saveSns.BEBJKJKBOGH_Date == 0, dbEventStory.CHOFDPDFPDC, dbEventStory.PFGAKEDKOPD_UnlockSpCost, unlockErrorType); + previousSeen = saveSns.LDJIMGPHFPA_Cnt > 0; } - b2 = b; + allviewed = prevViewed; } break; - case FBIOJHECAHB_EventStory.NMIGMCJHAIE.OEDCONLFLHD/*3*/: - string str = masterBk.GetMessageByLabel("adv_nm_" + dbEventStory.LOHMKCPKBON.ToString("D4")); + case FBIOJHECAHB_EventStory.NMIGMCJHAIE.OEDCONLFLHD_Epilogue/*3*/: + string str = masterBk.GetMessageByLabel("adv_nm_" + dbEventStory.LOHMKCPKBON_AdvId.ToString("D4")); if (str == "") { str = menuBk.GetMessageByLabel("event_story_text_002"); } - d.KHEKNNFCAOI(str, "", NIPDOAIGCIB.OEDCONLFLHD_2/*2*/, dbEventStory.LOHMKCPKBON, OAFJONPIFGM, 0, false, true); + d.KHEKNNFCAOI(str, "", NIPDOAIGCIB.OEDCONLFLHD_2_Epilogue/*2*/, dbEventStory.LOHMKCPKBON_AdvId, OAFJONPIFGM, 0, false, true); break; - case FBIOJHECAHB_EventStory.NMIGMCJHAIE.DCDEBCIMEMM/*4*/: + case FBIOJHECAHB_EventStory.NMIGMCJHAIE.DCDEBCIMEMM_Opening/*4*/: d.KHEKNNFCAOI(string.Format(menuBk.GetMessageByLabel("event_story_text_007"), g + 1), - "", g != 0 ? NIPDOAIGCIB.OEDCONLFLHD_2/*2*/ : NIPDOAIGCIB.JFEDIMKFDNH_0/*0*/, dbEventStory.LOHMKCPKBON, OAFJONPIFGM, 0, false, true); + "", g != 0 ? NIPDOAIGCIB.OEDCONLFLHD_2_Epilogue/*2*/ : NIPDOAIGCIB.JFEDIMKFDNH_0_Prologue/*0*/, dbEventStory.LOHMKCPKBON_AdvId, OAFJONPIFGM, 0, false, true); g++; break; - case FBIOJHECAHB_EventStory.NMIGMCJHAIE.MOPAEGFEGCB_5/*5*/: - string str3 = masterBk.GetMessageByLabel("adv_nm_" + dbEventStory.LOHMKCPKBON.ToString("D4")); - if (str3 == "") - str3 = JpStringLiterals.StringLiteral_9714 + e.ToString() + JpStringLiterals.StringLiteral_9715; - string str4 = ""; - NIPDOAIGCIB h; - bool b5, b6; + case FBIOJHECAHB_EventStory.NMIGMCJHAIE.MOPAEGFEGCB_5_EpisodeStory/*5*/: + string title = masterBk.GetMessageByLabel("adv_nm_" + dbEventStory.LOHMKCPKBON_AdvId.ToString("D4")); + if (title == "") + title = JpStringLiterals.StringLiteral_9714 + index.ToString() + JpStringLiterals.StringLiteral_9715; + string unlockText = ""; + NIPDOAIGCIB type; + bool unlocked, previousViewed; if (dbEventStory.CHOFDPDFPDC == 4) { - b5 = true; - if (!NLKEJAFBDGC(dbEventStory.OAFJONPIFGM, dbEventStory.PFGAKEDKOPD)) + unlocked = true; + if (!NLKEJAFBDGC(dbEventStory.OAFJONPIFGM_EventId, dbEventStory.PFGAKEDKOPD_UnlockSpCost)) { - str3 = menuBk.GetMessageByLabel("event_story_text_005"); - str4 = menuBk.GetMessageByLabel("event_story_text_015"); - b5 = false; + title = menuBk.GetMessageByLabel("event_story_text_005"); + unlockText = menuBk.GetMessageByLabel("event_story_text_015"); + unlocked = false; } - h = NIPDOAIGCIB.OOIPBACKOKH/*4*/; - b6 = b2; - b2 &= CIOECGOMILE.HHCJCDFCLOB.AHEFHIMGIBI_ServerSave.HBPPNFHOMNB_Adventure.FABEJIHKFGN(dbEventStory.LOHMKCPKBON); + type = NIPDOAIGCIB.OOIPBACKOKH_4/*4*/; + previousViewed = allviewed; + allviewed &= CIOECGOMILE.HHCJCDFCLOB.AHEFHIMGIBI_ServerSave.HBPPNFHOMNB_Adventure.FABEJIHKFGN_IsViewed(dbEventStory.LOHMKCPKBON_AdvId); } else { - h = NIPDOAIGCIB.MOPAEGFEGCB/*3*/; + type = NIPDOAIGCIB.MOPAEGFEGCB_3/*3*/; if(dbEventStory.CHOFDPDFPDC == 3) { - b5 = CIOECGOMILE.HHCJCDFCLOB.AHEFHIMGIBI_ServerSave.HBPPNFHOMNB_Adventure.FABEJIHKFGN(dbEventStory.LOHMKCPKBON); ; - b6 = false; + unlocked = CIOECGOMILE.HHCJCDFCLOB.AHEFHIMGIBI_ServerSave.HBPPNFHOMNB_Adventure.FABEJIHKFGN_IsViewed(dbEventStory.LOHMKCPKBON_AdvId); ; + previousViewed = false; } else { - b5 = true; - b6 = false; + unlocked = true; + previousViewed = false; } } - e++; - d.KHEKNNFCAOI(str3, str4, h, dbEventStory.LOHMKCPKBON, dbEventStory.OAFJONPIFGM, - 0, false, b5, e, false, b6); + d.KHEKNNFCAOI(title, unlockText, type, dbEventStory.LOHMKCPKBON_AdvId, dbEventStory.OAFJONPIFGM_EventId, + 0, false, unlocked, index, false, previousViewed); + index++; break; } DHPMDOCLBGD.Add(d); @@ -434,11 +434,11 @@ public void HFLNCEOIBJI() { if(KDJHLBCMMAG == HGIFGFEJLAB.EKJGOMKEJLK/*2*/) { - bool b = true; + bool previousViewed = true; for(int i = 0; i < DHPMDOCLBGD.Count; i++) { - DHPMDOCLBGD[i].GELLHOIEABC = b; - b &= CIOECGOMILE.HHCJCDFCLOB.AHEFHIMGIBI_ServerSave.HBPPNFHOMNB_Adventure.FABEJIHKFGN(DHPMDOCLBGD[i].PBPOLELIPJI_AdventureId); + DHPMDOCLBGD[i].GELLHOIEABC_PreviousViewed = previousViewed; + previousViewed &= CIOECGOMILE.HHCJCDFCLOB.AHEFHIMGIBI_ServerSave.HBPPNFHOMNB_Adventure.FABEJIHKFGN_IsViewed(DHPMDOCLBGD[i].PBPOLELIPJI_AdventureId); } } } @@ -470,7 +470,7 @@ public void IIOBBJFCHGH(int GGBHHDLHKEP) KHEKNNFCAOI(MAIJBDCJPNJ); if(c.LIPNNILKOLH == 2) { - CIOECGOMILE.HHCJCDFCLOB.AHEFHIMGIBI_ServerSave.KCCLEHLLOFG_Common.NLOGLGKPMNI(1, c.GAGNJGMKPME); + CIOECGOMILE.HHCJCDFCLOB.AHEFHIMGIBI_ServerSave.KCCLEHLLOFG_Common.NLOGLGKPMNI_ConsumeItem(1, c.GAGNJGMKPME_UnlockCost); } BIFNGFAIEIL.HHCJCDFCLOB.ALIANOFCAEI(); } @@ -489,9 +489,9 @@ public bool NLKEJAFBDGC(int PGIIDPEGGPI, int PFGAKEDKOPD) { if(KODEHLPFHEG.JKGFBFPIMGA_Rarity > 5) { - if(KODEHLPFHEG.FGMPFHOEPEL() != 0) + if(KODEHLPFHEG.FGMPFHOEPEL_GetNumUnlockedStory() != 0) { - if (PFGAKEDKOPD <= KODEHLPFHEG.FGMPFHOEPEL()) + if (PFGAKEDKOPD <= KODEHLPFHEG.FGMPFHOEPEL_GetNumUnlockedStory()) return true; } } diff --git a/Unity/Assets/UMAssets/Scripts/DKKPBBBDKMJ.cs b/Unity/Assets/UMAssets/Scripts/DKKPBBBDKMJ.cs index 738a57aa..11e5c5d8 100644 --- a/Unity/Assets/UMAssets/Scripts/DKKPBBBDKMJ.cs +++ b/Unity/Assets/UMAssets/Scripts/DKKPBBBDKMJ.cs @@ -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) { @@ -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; } @@ -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; } @@ -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); @@ -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()) @@ -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; } } } diff --git a/Unity/Assets/UMAssets/Scripts/Database/FBIOJHECAHB.cs b/Unity/Assets/UMAssets/Scripts/Database/FBIOJHECAHB.cs index 9b10654f..0bef79f2 100644 --- a/Unity/Assets/UMAssets/Scripts/Database/FBIOJHECAHB.cs +++ b/Unity/Assets/UMAssets/Scripts/Database/FBIOJHECAHB.cs @@ -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 @@ -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 @@ -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); } } @@ -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) @@ -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; diff --git a/Unity/Assets/UMAssets/Scripts/Database/MLIBEPGADJH.cs b/Unity/Assets/UMAssets/Scripts/Database/MLIBEPGADJH.cs index f3ece7a8..05520191 100644 --- a/Unity/Assets/UMAssets/Scripts/Database/MLIBEPGADJH.cs +++ b/Unity/Assets/UMAssets/Scripts/Database/MLIBEPGADJH.cs @@ -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; diff --git a/Unity/Assets/UMAssets/Scripts/FDDIIKBJNNA.cs b/Unity/Assets/UMAssets/Scripts/FDDIIKBJNNA.cs index 4a6d3816..e211b8ac 100644 --- a/Unity/Assets/UMAssets/Scripts/FDDIIKBJNNA.cs +++ b/Unity/Assets/UMAssets/Scripts/FDDIIKBJNNA.cs @@ -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 diff --git a/Unity/Assets/UMAssets/Scripts/GCIJNCFDNON.cs b/Unity/Assets/UMAssets/Scripts/GCIJNCFDNON.cs index 392dc14f..217d6caa 100644 --- a/Unity/Assets/UMAssets/Scripts/GCIJNCFDNON.cs +++ b/Unity/Assets/UMAssets/Scripts/GCIJNCFDNON.cs @@ -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 diff --git a/Unity/Assets/UMAssets/Scripts/KDHGBOOECKC.cs b/Unity/Assets/UMAssets/Scripts/KDHGBOOECKC.cs index 88cde4e2..2e7bd240 100644 --- a/Unity/Assets/UMAssets/Scripts/KDHGBOOECKC.cs +++ b/Unity/Assets/UMAssets/Scripts/KDHGBOOECKC.cs @@ -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 diff --git a/Unity/Assets/UMAssets/Scripts/ServerSave/EGOLBAPFHHD.cs b/Unity/Assets/UMAssets/Scripts/ServerSave/EGOLBAPFHHD.cs index b86c1657..95064ab2 100644 --- a/Unity/Assets/UMAssets/Scripts/ServerSave/EGOLBAPFHHD.cs +++ b/Unity/Assets/UMAssets/Scripts/ServerSave/EGOLBAPFHHD.cs @@ -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) { diff --git a/Unity/Assets/UMAssets/Scripts/ServerSave/HHDEBNFMIMH.cs b/Unity/Assets/UMAssets/Scripts/ServerSave/HHDEBNFMIMH.cs index d4753af6..c8671f79 100644 --- a/Unity/Assets/UMAssets/Scripts/ServerSave/HHDEBNFMIMH.cs +++ b/Unity/Assets/UMAssets/Scripts/ServerSave/HHDEBNFMIMH.cs @@ -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; } diff --git a/Unity/Assets/UMAssets/Scripts/XeApp/Game/Menu/EventStoryScene.cs b/Unity/Assets/UMAssets/Scripts/XeApp/Game/Menu/EventStoryScene.cs index 64d72f8a..a8fa1992 100644 --- a/Unity/Assets/UMAssets/Scripts/XeApp/Game/Menu/EventStoryScene.cs +++ b/Unity/Assets/UMAssets/Scripts/XeApp/Game/Menu/EventStoryScene.cs @@ -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) @@ -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) => @@ -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 @@ -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) { @@ -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); @@ -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); } diff --git a/Unity/Assets/UMAssets/Scripts/XeApp/Game/Menu/HomeScene.cs b/Unity/Assets/UMAssets/Scripts/XeApp/Game/Menu/HomeScene.cs index e217108a..954125fe 100644 --- a/Unity/Assets/UMAssets/Scripts/XeApp/Game/Menu/HomeScene.cs +++ b/Unity/Assets/UMAssets/Scripts/XeApp/Game/Menu/HomeScene.cs @@ -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(); @@ -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(); @@ -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); @@ -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); @@ -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); @@ -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(); } @@ -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) diff --git a/Unity/Assets/UMAssets/Scripts/XeApp/Game/Menu/MenuBarPrefab.cs b/Unity/Assets/UMAssets/Scripts/XeApp/Game/Menu/MenuBarPrefab.cs index 991461a0..e30f649d 100644 --- a/Unity/Assets/UMAssets/Scripts/XeApp/Game/Menu/MenuBarPrefab.cs +++ b/Unity/Assets/UMAssets/Scripts/XeApp/Game/Menu/MenuBarPrefab.cs @@ -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); diff --git a/Unity/Assets/UMAssets/Scripts/XeApp/Game/Menu/QuestUtility.cs b/Unity/Assets/UMAssets/Scripts/XeApp/Game/Menu/QuestUtility.cs index 770ef561..d0c26d9c 100644 --- a/Unity/Assets/UMAssets/Scripts/XeApp/Game/Menu/QuestUtility.cs +++ b/Unity/Assets/UMAssets/Scripts/XeApp/Game/Menu/QuestUtility.cs @@ -931,7 +931,7 @@ private static void GotoCurrentEventScene(FKMOKDCJFEN view) Database.Instance.advResult.Setup("Menu", goScene, param); goScene = TransitionUniqueId.EVENTQUEST; } - CIOECGOMILE.HHCJCDFCLOB.AHEFHIMGIBI_ServerSave.HBPPNFHOMNB_Adventure.GFANLIOMMNA(ev.GFIBLLLHMPD_AdventureId); + CIOECGOMILE.HHCJCDFCLOB.AHEFHIMGIBI_ServerSave.HBPPNFHOMNB_Adventure.GFANLIOMMNA_SetViewed(ev.GFIBLLLHMPD_AdventureId); Database.Instance.advSetup.Setup(advId); MenuScene.Instance.GotoAdventure(true); return; diff --git a/Unity/Assets/UMAssets/Scripts/XeApp/Game/Menu/SceneGrowthStatus.cs b/Unity/Assets/UMAssets/Scripts/XeApp/Game/Menu/SceneGrowthStatus.cs index 3c39e79d..c2ed6894 100644 --- a/Unity/Assets/UMAssets/Scripts/XeApp/Game/Menu/SceneGrowthStatus.cs +++ b/Unity/Assets/UMAssets/Scripts/XeApp/Game/Menu/SceneGrowthStatus.cs @@ -216,7 +216,7 @@ public void UpdateContent(GCIJNCFDNON_SceneInfo sceneData, TransitionUniqueId tr if(m_eventStoryData.FFPCLEONGHE[i].CDOCOLOKCJK_Unlocked) { disabled = false; - if (!CIOECGOMILE.HHCJCDFCLOB.AHEFHIMGIBI_ServerSave.HBPPNFHOMNB_Adventure.FABEJIHKFGN(m_eventStoryData.FFPCLEONGHE[i].PBPOLELIPJI_AdventureId)) + if (!CIOECGOMILE.HHCJCDFCLOB.AHEFHIMGIBI_ServerSave.HBPPNFHOMNB_Adventure.FABEJIHKFGN_IsViewed(m_eventStoryData.FFPCLEONGHE[i].PBPOLELIPJI_AdventureId)) { m_storyNewLayout.StartChildrenAnimGoStop("01"); } diff --git a/Unity/Assets/UMAssets/Scripts/XeApp/Game/Menu/SettingMenuPanel.cs b/Unity/Assets/UMAssets/Scripts/XeApp/Game/Menu/SettingMenuPanel.cs index 56861d5f..0f5c1531 100644 --- a/Unity/Assets/UMAssets/Scripts/XeApp/Game/Menu/SettingMenuPanel.cs +++ b/Unity/Assets/UMAssets/Scripts/XeApp/Game/Menu/SettingMenuPanel.cs @@ -134,7 +134,7 @@ public void CallBackValkyrieTuneUp() return; } Database.Instance.advResult.Setup("Menu", TransitionUniqueId.SETTINGMENU_VALKYRIETUNEUP, new AdvSetupParam()); - CIOECGOMILE.HHCJCDFCLOB.AHEFHIMGIBI_ServerSave.HBPPNFHOMNB_Adventure.GFANLIOMMNA(valkyrietuneup_first_adv_id); + CIOECGOMILE.HHCJCDFCLOB.AHEFHIMGIBI_ServerSave.HBPPNFHOMNB_Adventure.GFANLIOMMNA_SetViewed(valkyrietuneup_first_adv_id); Database.Instance.advSetup.Setup(dbAdv.KKPPFAHFOJI_FileId); MenuScene.Instance.GotoAdventure(true); MenuScene.Instance.InputDisable(); diff --git a/Unity/Assets/UMAssets/Scripts/XeApp/Game/Menu/VerticalMusicSelectSceneBase.cs b/Unity/Assets/UMAssets/Scripts/XeApp/Game/Menu/VerticalMusicSelectSceneBase.cs index 86fa2c54..994d563d 100644 --- a/Unity/Assets/UMAssets/Scripts/XeApp/Game/Menu/VerticalMusicSelectSceneBase.cs +++ b/Unity/Assets/UMAssets/Scripts/XeApp/Game/Menu/VerticalMusicSelectSceneBase.cs @@ -1571,7 +1571,7 @@ protected void GotoEventMusicSelect(int eventId) GPMHOAKFALE_Adventure.NGDBKCKMDHE dbAdv = IMMAOANGPNK.HHCJCDFCLOB.NKEBMCIMJND_Database.EFMAIKAHFEK_Adventure.GCINIJEMHFK(ev.GFIBLLLHMPD_AdventureId); if(dbAdv != null) { - CIOECGOMILE.HHCJCDFCLOB.AHEFHIMGIBI_ServerSave.HBPPNFHOMNB_Adventure.GFANLIOMMNA(ev.GFIBLLLHMPD_AdventureId); + CIOECGOMILE.HHCJCDFCLOB.AHEFHIMGIBI_ServerSave.HBPPNFHOMNB_Adventure.GFANLIOMMNA_SetViewed(ev.GFIBLLLHMPD_AdventureId); ILCCJNDFFOB.HHCJCDFCLOB.LIIJEGOIKDP(ev.GFIBLLLHMPD_AdventureId, OAGBCBBHMPF.DKAMMIHBINF.IDINJDEBPKP_6); Database.Instance.advSetup.Setup(dbAdv.KKPPFAHFOJI_FileId); Database.Instance.advResult.Setup("Menu", TransitionUniqueId.EVENTMUSICSELECT, new AdvSetupParam()); diff --git a/Unity/Assets/UMAssets/Scripts/_LibC/Sakasho/SakashoPlayerData.cs b/Unity/Assets/UMAssets/Scripts/_LibC/Sakasho/SakashoPlayerData.cs index 9933967e..614ba513 100644 --- a/Unity/Assets/UMAssets/Scripts/_LibC/Sakasho/SakashoPlayerData.cs +++ b/Unity/Assets/UMAssets/Scripts/_LibC/Sakasho/SakashoPlayerData.cs @@ -307,12 +307,12 @@ public static void UnlockAll(PlayerData playerData) 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(storyEvent2.JDJNNJEJDAJ == FBIOJHECAHB_EventStory.NMIGMCJHAIE.MOPAEGFEGCB_5) + if(storyEvent2.JDJNNJEJDAJ == FBIOJHECAHB_EventStory.NMIGMCJHAIE.MOPAEGFEGCB_5_EpisodeStory) { - if(storyEvent2.LOHMKCPKBON > 0) + if(storyEvent2.LOHMKCPKBON_AdvId > 0) { - if(!newData.HBPPNFHOMNB_Adventure.FABEJIHKFGN(storyEvent2.LOHMKCPKBON)) - newData.HBPPNFHOMNB_Adventure.GFANLIOMMNA(storyEvent2.LOHMKCPKBON); + if(!newData.HBPPNFHOMNB_Adventure.FABEJIHKFGN_IsViewed(storyEvent2.LOHMKCPKBON_AdvId)) + newData.HBPPNFHOMNB_Adventure.GFANLIOMMNA_SetViewed(storyEvent2.LOHMKCPKBON_AdvId); } } }