Skip to content

Commit

Permalink
Merge pull request #259 from Xele02/FixBranche
Browse files Browse the repository at this point in the history 
Fix plate displaying rank max when received and not owned in song reward
  • Loading branch information
@Xele02
Xele02 authored Sep 7, 2024
2 parents 6c23ca2 + 7f32edc commit f7d4828
Show file tree
Hide file tree
Showing 7 changed files with 99 additions and 99 deletions.
128 changes: 64 additions & 64 deletions Unity/Assets/UMAssets/Scripts/GONMPHKGKHI.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,19 @@ public class LCMJJMNMIKG_RewardInfo
{
public int BCCHOBPJJKE_SceneId; // 0x8
public CECMLGBLHHG IPMJIODJGBC; // 0xC
public int JKGFBFPIMGA; // 0x10
public int MPGNHFDGOBO; // 0x14
public int HNNAODKJGPD; // 0x18
public int LBGGNGCKOJE; // 0x1C
public int FICKICOHCAD; // 0x20
public int JKGFBFPIMGA_BaseRarity; // 0x10
public int MPGNHFDGOBO_PrevRarity; // 0x14
public int HNNAODKJGPD_NextRarity; // 0x18
public int LBGGNGCKOJE_PrevNumBoard; // 0x1C
public int FICKICOHCAD_NextNumBoard; // 0x20
public int KELFCMEOPPM; // 0x24
}

public class GCHFDJMNCAF : LCMJJMNMIKG_RewardInfo
{
public bool DMJCACIDEBM; // 0x28
public int GBALGEMKJKD; // 0x2C
public int HMGDINKEPHJ; // 0x30
public int GBALGEMKJKD_PrevBoard; // 0x2C
public int HMGDINKEPHJ_NextBoard; // 0x30
}

public List<LCMJJMNMIKG_RewardInfo> NJCMJLPPIGK = new List<LCMJJMNMIKG_RewardInfo>(); // 0x8
Expand All @@ -56,7 +56,7 @@ public bool KHEKNNFCAOI(JKNGJFOBADP BEJHIEGCGNE, bool IMBGFAJLPEK)
for(int i = 0; i < BEJHIEGCGNE.FIGHNFKAMGI.Count; i++)
{
JKNGJFOBADP.GPPAIFNBHDP FKHPGALPAIC = BEJHIEGCGNE.FIGHNFKAMGI[i];
if(FKHPGALPAIC.JKGFBFPIMGA < 4)
if(FKHPGALPAIC.JKGFBFPIMGA_BaseRarity < 4)
{
if(FKHPGALPAIC.INDDJNMPONH >= 3 && FKHPGALPAIC.INDDJNMPONH < 5)
{
Expand All @@ -72,17 +72,17 @@ public bool KHEKNNFCAOI(JKNGJFOBADP BEJHIEGCGNE, bool IMBGFAJLPEK)
rewardInfo = new LCMJJMNMIKG_RewardInfo();
rewardInfo.BCCHOBPJJKE_SceneId = FKHPGALPAIC.BCCHOBPJJKE_SceneId;
rewardInfo.IPMJIODJGBC = (CECMLGBLHHG)FKHPGALPAIC.INDDJNMPONH;
rewardInfo.JKGFBFPIMGA = FKHPGALPAIC.JKGFBFPIMGA;
rewardInfo.MPGNHFDGOBO = FKHPGALPAIC.MPGNHFDGOBO;
rewardInfo.HNNAODKJGPD = FKHPGALPAIC.HNNAODKJGPD;
rewardInfo.LBGGNGCKOJE = FKHPGALPAIC.JPIPENJGGDD < 1 ? 0 : FKHPGALPAIC.JPIPENJGGDD - 1;
rewardInfo.FICKICOHCAD = FKHPGALPAIC.JPIPENJGGDD;
rewardInfo.JKGFBFPIMGA_BaseRarity = FKHPGALPAIC.JKGFBFPIMGA_BaseRarity;
rewardInfo.MPGNHFDGOBO_PrevRarity = FKHPGALPAIC.MPGNHFDGOBO_PrevRarity;
rewardInfo.HNNAODKJGPD_NextRarity = FKHPGALPAIC.HNNAODKJGPD_NextRarity;
rewardInfo.LBGGNGCKOJE_PrevNumBoard = FKHPGALPAIC.JPIPENJGGDD_NumBoard < 1 ? 0 : FKHPGALPAIC.JPIPENJGGDD_NumBoard - 1;
rewardInfo.FICKICOHCAD_NextNumBoard = FKHPGALPAIC.JPIPENJGGDD_NumBoard;
JPMPIFCKEHH_RewardsInfo.Add(rewardInfo);
}
else
{
rewardInfo.LBGGNGCKOJE = Mathf.Min(FKHPGALPAIC.JPIPENJGGDD, rewardInfo.LBGGNGCKOJE);
rewardInfo.FICKICOHCAD = Mathf.Max(FKHPGALPAIC.JPIPENJGGDD, rewardInfo.FICKICOHCAD);
rewardInfo.LBGGNGCKOJE_PrevNumBoard = Mathf.Min(FKHPGALPAIC.JPIPENJGGDD_NumBoard, rewardInfo.LBGGNGCKOJE_PrevNumBoard);
rewardInfo.FICKICOHCAD_NextNumBoard = Mathf.Max(FKHPGALPAIC.JPIPENJGGDD_NumBoard, rewardInfo.FICKICOHCAD_NextNumBoard);
}
}
else if(FKHPGALPAIC.INDDJNMPONH == 6)
Expand All @@ -97,9 +97,9 @@ public bool KHEKNNFCAOI(JKNGJFOBADP BEJHIEGCGNE, bool IMBGFAJLPEK)
rewardInfo = new LCMJJMNMIKG_RewardInfo();
rewardInfo.BCCHOBPJJKE_SceneId = FKHPGALPAIC.BCCHOBPJJKE_SceneId;
rewardInfo.IPMJIODJGBC = (CECMLGBLHHG)FKHPGALPAIC.INDDJNMPONH;
rewardInfo.JKGFBFPIMGA = FKHPGALPAIC.JKGFBFPIMGA;
rewardInfo.MPGNHFDGOBO = FKHPGALPAIC.MPGNHFDGOBO;
rewardInfo.HNNAODKJGPD = FKHPGALPAIC.HNNAODKJGPD;
rewardInfo.JKGFBFPIMGA_BaseRarity = FKHPGALPAIC.JKGFBFPIMGA_BaseRarity;
rewardInfo.MPGNHFDGOBO_PrevRarity = FKHPGALPAIC.MPGNHFDGOBO_PrevRarity;
rewardInfo.HNNAODKJGPD_NextRarity = FKHPGALPAIC.HNNAODKJGPD_NextRarity;
JPMPIFCKEHH_RewardsInfo.Add(rewardInfo);
}
else
Expand All @@ -115,11 +115,11 @@ public bool KHEKNNFCAOI(JKNGJFOBADP BEJHIEGCGNE, bool IMBGFAJLPEK)
LCMJJMNMIKG_RewardInfo rewardInfo = new LCMJJMNMIKG_RewardInfo();
rewardInfo.BCCHOBPJJKE_SceneId = FKHPGALPAIC.BCCHOBPJJKE_SceneId;
rewardInfo.IPMJIODJGBC = (CECMLGBLHHG)FKHPGALPAIC.INDDJNMPONH;
rewardInfo.JKGFBFPIMGA = FKHPGALPAIC.JKGFBFPIMGA;
rewardInfo.MPGNHFDGOBO = FKHPGALPAIC.MPGNHFDGOBO;
rewardInfo.HNNAODKJGPD = FKHPGALPAIC.HNNAODKJGPD;
rewardInfo.LBGGNGCKOJE = FKHPGALPAIC.JPIPENJGGDD;
rewardInfo.FICKICOHCAD = FKHPGALPAIC.JPIPENJGGDD;
rewardInfo.JKGFBFPIMGA_BaseRarity = FKHPGALPAIC.JKGFBFPIMGA_BaseRarity;
rewardInfo.MPGNHFDGOBO_PrevRarity = FKHPGALPAIC.MPGNHFDGOBO_PrevRarity;
rewardInfo.HNNAODKJGPD_NextRarity = FKHPGALPAIC.HNNAODKJGPD_NextRarity;
rewardInfo.LBGGNGCKOJE_PrevNumBoard = FKHPGALPAIC.JPIPENJGGDD_NumBoard;
rewardInfo.FICKICOHCAD_NextNumBoard = FKHPGALPAIC.JPIPENJGGDD_NumBoard;
JPMPIFCKEHH_RewardsInfo.Add(rewardInfo);
}
}
Expand All @@ -128,20 +128,20 @@ public bool KHEKNNFCAOI(JKNGJFOBADP BEJHIEGCGNE, bool IMBGFAJLPEK)
LCMJJMNMIKG_RewardInfo rewardInfo = new LCMJJMNMIKG_RewardInfo();
rewardInfo.BCCHOBPJJKE_SceneId = FKHPGALPAIC.BCCHOBPJJKE_SceneId;
rewardInfo.IPMJIODJGBC = (CECMLGBLHHG)FKHPGALPAIC.INDDJNMPONH;
rewardInfo.JKGFBFPIMGA = FKHPGALPAIC.JKGFBFPIMGA;
rewardInfo.MPGNHFDGOBO = FKHPGALPAIC.MPGNHFDGOBO;
rewardInfo.HNNAODKJGPD = FKHPGALPAIC.HNNAODKJGPD;
rewardInfo.LBGGNGCKOJE = FKHPGALPAIC.JPIPENJGGDD;
rewardInfo.FICKICOHCAD = FKHPGALPAIC.JPIPENJGGDD;
rewardInfo.JKGFBFPIMGA_BaseRarity = FKHPGALPAIC.JKGFBFPIMGA_BaseRarity;
rewardInfo.MPGNHFDGOBO_PrevRarity = FKHPGALPAIC.MPGNHFDGOBO_PrevRarity;
rewardInfo.HNNAODKJGPD_NextRarity = FKHPGALPAIC.HNNAODKJGPD_NextRarity;
rewardInfo.LBGGNGCKOJE_PrevNumBoard = FKHPGALPAIC.JPIPENJGGDD_NumBoard;
rewardInfo.FICKICOHCAD_NextNumBoard = FKHPGALPAIC.JPIPENJGGDD_NumBoard;
JPMPIFCKEHH_RewardsInfo.Add(rewardInfo);
if(FKHPGALPAIC.OGPKHGEMLMP)
{
GCHFDJMNCAF d = new GCHFDJMNCAF();
d.BCCHOBPJJKE_SceneId = FKHPGALPAIC.BCCHOBPJJKE_SceneId;
d.JKGFBFPIMGA = FKHPGALPAIC.JKGFBFPIMGA;
d.DMJCACIDEBM = FKHPGALPAIC.OLGCDLJFMDH;
d.GBALGEMKJKD = 0;
d.HMGDINKEPHJ = 1;
d.JKGFBFPIMGA_BaseRarity = FKHPGALPAIC.JKGFBFPIMGA_BaseRarity;
d.DMJCACIDEBM = FKHPGALPAIC.OLGCDLJFMDH_Sngl;
d.GBALGEMKJKD_PrevBoard = 0;
d.HMGDINKEPHJ_NextBoard = 1;
COLIEKINOPB.Add(d);
}
}
Expand All @@ -161,21 +161,21 @@ public bool KHEKNNFCAOI(JKNGJFOBADP BEJHIEGCGNE, bool IMBGFAJLPEK)
rewardInfo = new LCMJJMNMIKG_RewardInfo();
rewardInfo.BCCHOBPJJKE_SceneId = FKHPGALPAIC.BCCHOBPJJKE_SceneId;
rewardInfo.IPMJIODJGBC = (CECMLGBLHHG)FKHPGALPAIC.INDDJNMPONH;
rewardInfo.JKGFBFPIMGA = FKHPGALPAIC.JKGFBFPIMGA;
rewardInfo.MPGNHFDGOBO = FKHPGALPAIC.MPGNHFDGOBO;
rewardInfo.HNNAODKJGPD = FKHPGALPAIC.HNNAODKJGPD;
rewardInfo.LBGGNGCKOJE = FKHPGALPAIC.JPIPENJGGDD - 1;
rewardInfo.FICKICOHCAD = FKHPGALPAIC.JPIPENJGGDD;
rewardInfo.JKGFBFPIMGA_BaseRarity = FKHPGALPAIC.JKGFBFPIMGA_BaseRarity;
rewardInfo.MPGNHFDGOBO_PrevRarity = FKHPGALPAIC.MPGNHFDGOBO_PrevRarity;
rewardInfo.HNNAODKJGPD_NextRarity = FKHPGALPAIC.HNNAODKJGPD_NextRarity;
rewardInfo.LBGGNGCKOJE_PrevNumBoard = FKHPGALPAIC.JPIPENJGGDD_NumBoard - 1;
rewardInfo.FICKICOHCAD_NextNumBoard = FKHPGALPAIC.JPIPENJGGDD_NumBoard;
NJCMJLPPIGK.Add(rewardInfo);
}
else
{
rewardInfo.LBGGNGCKOJE = Mathf.Min(FKHPGALPAIC.JPIPENJGGDD, rewardInfo.LBGGNGCKOJE);
rewardInfo.FICKICOHCAD = Mathf.Max(FKHPGALPAIC.JPIPENJGGDD, rewardInfo.FICKICOHCAD);
rewardInfo.LBGGNGCKOJE_PrevNumBoard = Mathf.Min(FKHPGALPAIC.JPIPENJGGDD_NumBoard, rewardInfo.LBGGNGCKOJE_PrevNumBoard);
rewardInfo.FICKICOHCAD_NextNumBoard = Mathf.Max(FKHPGALPAIC.JPIPENJGGDD_NumBoard, rewardInfo.FICKICOHCAD_NextNumBoard);
}
if(FKHPGALPAIC.OGPKHGEMLMP)
{
if(!FKHPGALPAIC.OLGCDLJFMDH)
if(!FKHPGALPAIC.OLGCDLJFMDH_Sngl)
{
rewardInfo = COLIEKINOPB.Find((LCMJJMNMIKG_RewardInfo GHPLINIACBB) =>
{
Expand All @@ -190,16 +190,16 @@ public bool KHEKNNFCAOI(JKNGJFOBADP BEJHIEGCGNE, bool IMBGFAJLPEK)
GCHFDJMNCAF d = new GCHFDJMNCAF();
d.BCCHOBPJJKE_SceneId = FKHPGALPAIC.BCCHOBPJJKE_SceneId;
d.DMJCACIDEBM = false;
d.JKGFBFPIMGA = FKHPGALPAIC.JKGFBFPIMGA;
d.GBALGEMKJKD = FKHPGALPAIC.JPIPENJGGDD;
d.HMGDINKEPHJ = FKHPGALPAIC.JPIPENJGGDD + 1;
d.JKGFBFPIMGA_BaseRarity = FKHPGALPAIC.JKGFBFPIMGA_BaseRarity;
d.GBALGEMKJKD_PrevBoard = FKHPGALPAIC.JPIPENJGGDD_NumBoard;
d.HMGDINKEPHJ_NextBoard = FKHPGALPAIC.JPIPENJGGDD_NumBoard + 1;
COLIEKINOPB.Add(d);
}
else
{
GCHFDJMNCAF d = rewardInfo as GCHFDJMNCAF;
d.GBALGEMKJKD = Mathf.Min(FKHPGALPAIC.JPIPENJGGDD + 1, d.GBALGEMKJKD);
d.HMGDINKEPHJ = Mathf.Min(FKHPGALPAIC.JPIPENJGGDD + 1, d.HMGDINKEPHJ);
d.GBALGEMKJKD_PrevBoard = Mathf.Min(FKHPGALPAIC.JPIPENJGGDD_NumBoard + 1, d.GBALGEMKJKD_PrevBoard);
d.HMGDINKEPHJ_NextBoard = Mathf.Min(FKHPGALPAIC.JPIPENJGGDD_NumBoard + 1, d.HMGDINKEPHJ_NextBoard);
}
}
rewardInfo = COLIEKINOPB.Find((LCMJJMNMIKG_RewardInfo GHPLINIACBB) =>
Expand All @@ -215,16 +215,16 @@ public bool KHEKNNFCAOI(JKNGJFOBADP BEJHIEGCGNE, bool IMBGFAJLPEK)
GCHFDJMNCAF d = new GCHFDJMNCAF();
d.BCCHOBPJJKE_SceneId = FKHPGALPAIC.BCCHOBPJJKE_SceneId;
d.DMJCACIDEBM = true;
d.JKGFBFPIMGA = FKHPGALPAIC.JKGFBFPIMGA;
d.GBALGEMKJKD = FKHPGALPAIC.JPIPENJGGDD;
d.HMGDINKEPHJ = FKHPGALPAIC.JPIPENJGGDD + 1;
d.JKGFBFPIMGA_BaseRarity = FKHPGALPAIC.JKGFBFPIMGA_BaseRarity;
d.GBALGEMKJKD_PrevBoard = FKHPGALPAIC.JPIPENJGGDD_NumBoard;
d.HMGDINKEPHJ_NextBoard = FKHPGALPAIC.JPIPENJGGDD_NumBoard + 1;
COLIEKINOPB.Add(d);
}
else
{
GCHFDJMNCAF d = rewardInfo as GCHFDJMNCAF;
d.GBALGEMKJKD = Mathf.Min(FKHPGALPAIC.JPIPENJGGDD + 1, d.GBALGEMKJKD);
d.HMGDINKEPHJ = Mathf.Min(FKHPGALPAIC.JPIPENJGGDD + 1, d.HMGDINKEPHJ);
d.GBALGEMKJKD_PrevBoard = Mathf.Min(FKHPGALPAIC.JPIPENJGGDD_NumBoard + 1, d.GBALGEMKJKD_PrevBoard);
d.HMGDINKEPHJ_NextBoard = Mathf.Min(FKHPGALPAIC.JPIPENJGGDD_NumBoard + 1, d.HMGDINKEPHJ_NextBoard);
}
}
}
Expand All @@ -233,20 +233,20 @@ public bool KHEKNNFCAOI(JKNGJFOBADP BEJHIEGCGNE, bool IMBGFAJLPEK)
LCMJJMNMIKG_RewardInfo rewardInfo = new LCMJJMNMIKG_RewardInfo();
rewardInfo.BCCHOBPJJKE_SceneId = FKHPGALPAIC.BCCHOBPJJKE_SceneId;
rewardInfo.IPMJIODJGBC = (CECMLGBLHHG)FKHPGALPAIC.INDDJNMPONH;
rewardInfo.JKGFBFPIMGA = FKHPGALPAIC.JKGFBFPIMGA;
rewardInfo.MPGNHFDGOBO = FKHPGALPAIC.MPGNHFDGOBO;
rewardInfo.HNNAODKJGPD = FKHPGALPAIC.HNNAODKJGPD;
rewardInfo.LBGGNGCKOJE = FKHPGALPAIC.JPIPENJGGDD;
rewardInfo.FICKICOHCAD = FKHPGALPAIC.JPIPENJGGDD;
rewardInfo.JKGFBFPIMGA_BaseRarity = FKHPGALPAIC.JKGFBFPIMGA_BaseRarity;
rewardInfo.MPGNHFDGOBO_PrevRarity = FKHPGALPAIC.MPGNHFDGOBO_PrevRarity;
rewardInfo.HNNAODKJGPD_NextRarity = FKHPGALPAIC.HNNAODKJGPD_NextRarity;
rewardInfo.LBGGNGCKOJE_PrevNumBoard = FKHPGALPAIC.JPIPENJGGDD_NumBoard;
rewardInfo.FICKICOHCAD_NextNumBoard = FKHPGALPAIC.JPIPENJGGDD_NumBoard;
NJCMJLPPIGK.Add(rewardInfo);
if (FKHPGALPAIC.OGPKHGEMLMP)
{
GCHFDJMNCAF d = new GCHFDJMNCAF();
d.BCCHOBPJJKE_SceneId = FKHPGALPAIC.BCCHOBPJJKE_SceneId;
d.DMJCACIDEBM = true;
d.JKGFBFPIMGA = FKHPGALPAIC.JKGFBFPIMGA;
d.GBALGEMKJKD = 0;
d.HMGDINKEPHJ = 1;
d.JKGFBFPIMGA_BaseRarity = FKHPGALPAIC.JKGFBFPIMGA_BaseRarity;
d.GBALGEMKJKD_PrevBoard = 0;
d.HMGDINKEPHJ_NextBoard = 1;
COLIEKINOPB.Add(d);
}
}
Expand All @@ -257,11 +257,11 @@ public bool KHEKNNFCAOI(JKNGJFOBADP BEJHIEGCGNE, bool IMBGFAJLPEK)
//0x1E5D328
if(HKICMNAACDA.IPMJIODJGBC == BNKHBCBJBKI.IPMJIODJGBC)
{
if(HKICMNAACDA.JKGFBFPIMGA == BNKHBCBJBKI.JKGFBFPIMGA)
if(HKICMNAACDA.JKGFBFPIMGA_BaseRarity == BNKHBCBJBKI.JKGFBFPIMGA_BaseRarity)
{
return HKICMNAACDA.BCCHOBPJJKE_SceneId.CompareTo(BNKHBCBJBKI.BCCHOBPJJKE_SceneId);
}
return HKICMNAACDA.JKGFBFPIMGA.CompareTo(BNKHBCBJBKI.JKGFBFPIMGA);
return HKICMNAACDA.JKGFBFPIMGA_BaseRarity.CompareTo(BNKHBCBJBKI.JKGFBFPIMGA_BaseRarity);
}
return HKICMNAACDA.IPMJIODJGBC.CompareTo(BNKHBCBJBKI.IPMJIODJGBC);
});
Expand All @@ -270,18 +270,18 @@ public bool KHEKNNFCAOI(JKNGJFOBADP BEJHIEGCGNE, bool IMBGFAJLPEK)
//0x1E5D3AC
if (HKICMNAACDA.IPMJIODJGBC == BNKHBCBJBKI.IPMJIODJGBC)
{
if (HKICMNAACDA.JKGFBFPIMGA == BNKHBCBJBKI.JKGFBFPIMGA)
if (HKICMNAACDA.JKGFBFPIMGA_BaseRarity == BNKHBCBJBKI.JKGFBFPIMGA_BaseRarity)
{
return HKICMNAACDA.BCCHOBPJJKE_SceneId.CompareTo(BNKHBCBJBKI.BCCHOBPJJKE_SceneId);
}
return HKICMNAACDA.JKGFBFPIMGA.CompareTo(BNKHBCBJBKI.JKGFBFPIMGA);
return HKICMNAACDA.JKGFBFPIMGA_BaseRarity.CompareTo(BNKHBCBJBKI.JKGFBFPIMGA_BaseRarity);
}
return HKICMNAACDA.IPMJIODJGBC.CompareTo(BNKHBCBJBKI.IPMJIODJGBC);
});
COLIEKINOPB.Sort((LCMJJMNMIKG_RewardInfo HKICMNAACDA, LCMJJMNMIKG_RewardInfo BNKHBCBJBKI) =>
{
//0x1E5D430
if (HKICMNAACDA.JKGFBFPIMGA == BNKHBCBJBKI.JKGFBFPIMGA)
if (HKICMNAACDA.JKGFBFPIMGA_BaseRarity == BNKHBCBJBKI.JKGFBFPIMGA_BaseRarity)
{
if (HKICMNAACDA.BCCHOBPJJKE_SceneId == BNKHBCBJBKI.BCCHOBPJJKE_SceneId)
{
Expand All @@ -291,7 +291,7 @@ public bool KHEKNNFCAOI(JKNGJFOBADP BEJHIEGCGNE, bool IMBGFAJLPEK)
}
return HKICMNAACDA.BCCHOBPJJKE_SceneId.CompareTo(BNKHBCBJBKI.BCCHOBPJJKE_SceneId);
}
return HKICMNAACDA.JKGFBFPIMGA.CompareTo(BNKHBCBJBKI.JKGFBFPIMGA);
return HKICMNAACDA.JKGFBFPIMGA_BaseRarity.CompareTo(BNKHBCBJBKI.JKGFBFPIMGA_BaseRarity);
});
DKJLFPMHDJC.Clear();
List<int> l = new List<int>();
Expand Down
44 changes: 22 additions & 22 deletions Unity/Assets/UMAssets/Scripts/JKNGJFOBADP.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ public class GPPAIFNBHDP
{
public int BCCHOBPJJKE_SceneId; // 0x8
public int INDDJNMPONH; // 0xC
public int JKGFBFPIMGA; // 0x10
public int MPGNHFDGOBO; // 0x14
public int HNNAODKJGPD; // 0x18
public int JPIPENJGGDD; // 0x1C
public int JKGFBFPIMGA_BaseRarity; // 0x10
public int MPGNHFDGOBO_PrevRarity; // 0x14
public int HNNAODKJGPD_NextRarity; // 0x18
public int JPIPENJGGDD_NumBoard; // 0x1C
public int FELBNCPBGMJ; // 0x20
public int OCMIGHELJDP; // 0x24
public bool OGPKHGEMLMP; // 0x28
public bool OLGCDLJFMDH; // 0x29
public bool OLGCDLJFMDH_Sngl; // 0x29
}

public class OILCOECKMOO
Expand Down Expand Up @@ -366,11 +366,11 @@ private void IKFHPLBCMHN(BBHNACPENDM_ServerSaveData AHEFHIMGIBI, int MHFBCINOJEE
PJBJCBEMEEC = 0;
GPPAIFNBHDP data = new GPPAIFNBHDP();
data.BCCHOBPJJKE_SceneId = MHFBCINOJEE;
data.OLGCDLJFMDH = dbScene.FBJDHLGODPP_Sngl;
data.OLGCDLJFMDH_Sngl = dbScene.FBJDHLGODPP_Sngl;
data.INDDJNMPONH = 1;
data.JKGFBFPIMGA = EKLNMHFCAOI.FABCKNDLPDH_GetItemRarity(EKLNMHFCAOI.FKGCBLHOOCL_Category.MHKFDBLMOGF_Scene, MHFBCINOJEE);
data.MPGNHFDGOBO = data.JKGFBFPIMGA;
data.HNNAODKJGPD = data.JKGFBFPIMGA;
data.JKGFBFPIMGA_BaseRarity = EKLNMHFCAOI.FABCKNDLPDH_GetItemRarity(EKLNMHFCAOI.FKGCBLHOOCL_Category.MHKFDBLMOGF_Scene, MHFBCINOJEE);
data.MPGNHFDGOBO_PrevRarity = data.JKGFBFPIMGA_BaseRarity;
data.HNNAODKJGPD_NextRarity = data.JKGFBFPIMGA_BaseRarity;
data.OGPKHGEMLMP = b3;
FIGHNFKAMGI.Add(data);
//joined_r0x0146b3fc;
Expand All @@ -386,14 +386,14 @@ private void IKFHPLBCMHN(BBHNACPENDM_ServerSaveData AHEFHIMGIBI, int MHFBCINOJEE
IKBLCEFCGDE = 0;
GPPAIFNBHDP data = new GPPAIFNBHDP();
data.BCCHOBPJJKE_SceneId = MHFBCINOJEE;
data.OLGCDLJFMDH = dbScene.FBJDHLGODPP_Sngl;
data.OLGCDLJFMDH_Sngl = dbScene.FBJDHLGODPP_Sngl;
data.INDDJNMPONH = 1;
data.JKGFBFPIMGA = EKLNMHFCAOI.FABCKNDLPDH_GetItemRarity(EKLNMHFCAOI.FKGCBLHOOCL_Category.MHKFDBLMOGF_Scene, MHFBCINOJEE);
data.MPGNHFDGOBO = data.JKGFBFPIMGA + 1;
data.HNNAODKJGPD = data.JKGFBFPIMGA + 1;
data.JKGFBFPIMGA_BaseRarity = EKLNMHFCAOI.FABCKNDLPDH_GetItemRarity(EKLNMHFCAOI.FKGCBLHOOCL_Category.MHKFDBLMOGF_Scene, MHFBCINOJEE);
data.MPGNHFDGOBO_PrevRarity = data.JKGFBFPIMGA_BaseRarity + 1;
data.HNNAODKJGPD_NextRarity = data.JKGFBFPIMGA_BaseRarity + 1;
data.OGPKHGEMLMP = b3;
PJBJCBEMEEC = saveScene.JPIPENJGGDD_Mlt;
data.JPIPENJGGDD = PJBJCBEMEEC;
data.JPIPENJGGDD_NumBoard = PJBJCBEMEEC;
FIGHNFKAMGI.Add(data);
if(b3)
{
Expand All @@ -406,22 +406,22 @@ private void IKFHPLBCMHN(BBHNACPENDM_ServerSaveData AHEFHIMGIBI, int MHFBCINOJEE
{
GPPAIFNBHDP data = new GPPAIFNBHDP();
data.BCCHOBPJJKE_SceneId = MHFBCINOJEE;
data.OLGCDLJFMDH = dbScene.FBJDHLGODPP_Sngl;
data.OLGCDLJFMDH_Sngl = dbScene.FBJDHLGODPP_Sngl;
if(saveScene.JPIPENJGGDD_Mlt == 0)
{
data.INDDJNMPONH = 3;
data.JPIPENJGGDD = saveScene.JPIPENJGGDD_Mlt;
data.JKGFBFPIMGA = EKLNMHFCAOI.FABCKNDLPDH_GetItemRarity(EKLNMHFCAOI.FKGCBLHOOCL_Category.MHKFDBLMOGF_Scene, MHFBCINOJEE);
data.MPGNHFDGOBO = data.JKGFBFPIMGA;
data.JPIPENJGGDD_NumBoard = saveScene.JPIPENJGGDD_Mlt;
data.JKGFBFPIMGA_BaseRarity = EKLNMHFCAOI.FABCKNDLPDH_GetItemRarity(EKLNMHFCAOI.FKGCBLHOOCL_Category.MHKFDBLMOGF_Scene, MHFBCINOJEE);
data.MPGNHFDGOBO_PrevRarity = data.JKGFBFPIMGA_BaseRarity;
}
else
{
data.INDDJNMPONH = 4;
data.JPIPENJGGDD = saveScene.JPIPENJGGDD_Mlt;
data.JKGFBFPIMGA = EKLNMHFCAOI.FABCKNDLPDH_GetItemRarity(EKLNMHFCAOI.FKGCBLHOOCL_Category.MHKFDBLMOGF_Scene, MHFBCINOJEE);
data.MPGNHFDGOBO = data.JKGFBFPIMGA + 1;
data.JPIPENJGGDD_NumBoard = saveScene.JPIPENJGGDD_Mlt;
data.JKGFBFPIMGA_BaseRarity = EKLNMHFCAOI.FABCKNDLPDH_GetItemRarity(EKLNMHFCAOI.FKGCBLHOOCL_Category.MHKFDBLMOGF_Scene, MHFBCINOJEE);
data.MPGNHFDGOBO_PrevRarity = data.JKGFBFPIMGA_BaseRarity + 1;
}
data.HNNAODKJGPD = data.JKGFBFPIMGA + 1;
data.HNNAODKJGPD_NextRarity = data.JKGFBFPIMGA_BaseRarity + 1;
b3 = b3 && saveScene.JPIPENJGGDD_Mlt < maxPoster;
data.OGPKHGEMLMP = b3;
FIGHNFKAMGI.Add(data);
Expand Down
8 changes: 4 additions & 4 deletions Unity/Assets/UMAssets/Scripts/XeApp/Game/Menu/LayoutOverlapPlateLvup.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ public void SetStatus(GONMPHKGKHI_RewardView.LCMJJMNMIKG_RewardInfo info, SceneC
{
SetImageInner(sceneCard, m_before, info.BCCHOBPJJKE_SceneId, 1);
SetImageInner(sceneCard, m_beforeEf, info.BCCHOBPJJKE_SceneId, 1);
int rank = info.JKGFBFPIMGA > 3 ? 2 : 1;
int rank = info.JKGFBFPIMGA_BaseRarity > 3 ? 2 : 1;
SetImageInner(sceneCard, m_after, info.BCCHOBPJJKE_SceneId, rank);
SetImageFrameInner(sceneFrame, m_frameBefore, GetSceneCardIdFromAttrId(info.BCCHOBPJJKE_SceneId), info.JKGFBFPIMGA, 1);
SetImageFrameInner(sceneFrame, m_frameBeforeEf, GetSceneCardIdFromAttrId(info.BCCHOBPJJKE_SceneId), info.JKGFBFPIMGA, 1);
SetImageFrameInner(sceneFrame, m_frameAfter, GetSceneCardIdFromAttrId(info.BCCHOBPJJKE_SceneId), info.JKGFBFPIMGA, 2);
SetImageFrameInner(sceneFrame, m_frameBefore, GetSceneCardIdFromAttrId(info.BCCHOBPJJKE_SceneId), info.JKGFBFPIMGA_BaseRarity, 1);
SetImageFrameInner(sceneFrame, m_frameBeforeEf, GetSceneCardIdFromAttrId(info.BCCHOBPJJKE_SceneId), info.JKGFBFPIMGA_BaseRarity, 1);
SetImageFrameInner(sceneFrame, m_frameAfter, GetSceneCardIdFromAttrId(info.BCCHOBPJJKE_SceneId), info.JKGFBFPIMGA_BaseRarity, 2);
}

}
Expand Down
2 changes: 1 addition & 1 deletion Unity/Assets/UMAssets/Scripts/XeApp/Game/Menu/LayoutPopupGachaOverlap.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public void SetStatus(GONMPHKGKHI_RewardView.LCMJJMNMIKG_RewardInfo info)
SetDesc("");
}
SetPlateName(RecordPlateUtility.GetPlateName(info.BCCHOBPJJKE_SceneId, m_showType, m_showType != GONMPHKGKHI_RewardView.CECMLGBLHHG.GBIDBHKEPGL/*1*/ && m_showType != GONMPHKGKHI_RewardView.CECMLGBLHHG.NNEOHGFGLKM_3/*3*/));
SetPlateImage(info.BCCHOBPJJKE_SceneId, info.JKGFBFPIMGA < info.HNNAODKJGPD ? 1 : 2);
SetPlateImage(info.BCCHOBPJJKE_SceneId, info.JKGFBFPIMGA_BaseRarity < info.HNNAODKJGPD_NextRarity ? 2 : 1);
SwitchTblShowType(m_showType);
}

Expand Down
Loading

0 comments on commit f7d4828

Please sign in to comment.