Merge pull request #159 from Xele02/OptionsMenu

Added Setting/Option menu
Xele02 · Dec 9, 2023 · b9d5189 · b9d5189
2 parents b24285c + 9c13c3b
commit b9d5189
Show file tree

Hide file tree

Showing 156 changed files with 8,117 additions and 459 deletions.
diff --git a/Unity/Assets/Scripts/FileSystemProxy.cs b/Unity/Assets/Scripts/FileSystemProxy.cs
@@ -9,6 +9,8 @@
 using System.Net;
 using System.Text;
 using XeApp.Game.Common;
+using System.Text.RegularExpressions;
+
 #if UNITY_EDITOR
 using System.Reflection;
 using System.Linq;
@@ -66,10 +68,16 @@ static public string ConvertURL(string url)
 		return url.Replace("[SERVER_DATA_PATH]", serverPath) + urlExt;
 	}
 
+	public static Regex NOCCMAKNLLD = new Regex("!s[0-9a-fA-F]+z!"); 
+
 	static public string ConvertPath(string path)
 	{
 		path = path.Replace("\\", "/");
-		path = path.Replace("!s00000000z!", "");
+		if(path.Contains("!s"))
+		{
+			path = path.Replace("!s00000000z!", "");
+			path = NOCCMAKNLLD.Replace(path, "");
+		}
 		path = path.Replace("[SERVER_DATA_PATH]", Application.persistentDataPath + "/data");
 		if (File.Exists(path))
 			return path;

diff --git a/Unity/Assets/UMAssets/Scripts/AIBFEFOFMFK.cs b/Unity/Assets/UMAssets/Scripts/AIBFEFOFMFK.cs
@@ -30,11 +30,116 @@ public override void EMKKJILHOOB_GetLinkageStatus(IMCBBOAFION BHFHGFKBOHH, JFDNP
 	}
 
 	//// RVA: 0xCCA99C Offset: 0xCCA99C VA: 0xCCA99C Slot: 5
-	//public override void GGNBIHHFJMP(IMCBBOAFION BHFHGFKBOHH, JFDNPFFOACP NIMPEHIECJH, DJBHIFLHJLK AOCANKOMKFG) { }
+	public override void GGNBIHHFJMP(IMCBBOAFION BHFHGFKBOHH, JFDNPFFOACP NIMPEHIECJH, DJBHIFLHJLK AOCANKOMKFG)
+	{
+		OMOHMPMNOJG req = NKGJPJPHLIF.HHCJCDFCLOB.IBLPICFDGOF_ServerRequester.IFFNCAFNEAG_AddRequest(new OMOHMPMNOJG());
+		req.ICDEFIIADDO_Timeout = 15;
+		req.BHFHGFKBOHH_OnSuccess = (CACGCMBKHDI_Request JIPCHHHLOMM) =>
+		{
+			//0xCCB600
+			JEDJNIKPFLH_IsLinked = true;
+			MOJEDCPFGJJ_IsVersionOk = false;
+			BHFHGFKBOHH();
+		};
+		req.MOBEEPPKFLG_OnFail = (CACGCMBKHDI_Request JIPCHHHLOMM) =>
+		{
+			//0xCCB668
+			if (!JIPCHHHLOMM.PDAPLCPOCMA)
+			{
+				if (DGLAMLJFEDB_CheckError(JIPCHHHLOMM.CJMFJOMECKI_ErrorId))
+				{
+					FFGPDGJNCOO = true;
+				}
+				else
+				{
+					if (!HGOKJBPIDJB(JIPCHHHLOMM))
+					{
+						AOCANKOMKFG();
+						return;
+					}
+				}
+				NIMPEHIECJH();
+				return;
+			}
+			AOCANKOMKFG();
+		};
+	}
 
 	//// RVA: 0xCCABE4 Offset: 0xCCABE4 VA: 0xCCABE4 Slot: 6
-	//public override void MOHPODEDIEK(IMCBBOAFION BHFHGFKBOHH, JFDNPFFOACP NIMPEHIECJH, DJBHIFLHJLK AOCANKOMKFG) { }
+	public override void MOHPODEDIEK(IMCBBOAFION BHFHGFKBOHH, JFDNPFFOACP NIMPEHIECJH, DJBHIFLHJLK AOCANKOMKFG)
+	{
+		HJMMIMBMFFP req = NKGJPJPHLIF.HHCJCDFCLOB.IBLPICFDGOF_ServerRequester.IFFNCAFNEAG_AddRequest(new HJMMIMBMFFP());
+		req.ICDEFIIADDO_Timeout = 15;
+		req.BHFHGFKBOHH_OnSuccess = (CACGCMBKHDI_Request JIPCHHHLOMM) =>
+		{
+			//0xCCB770
+			JEDJNIKPFLH_IsLinked = false;
+			MOJEDCPFGJJ_IsVersionOk = false;
+			BHFHGFKBOHH();
+		};
+		req.MOBEEPPKFLG_OnFail = (CACGCMBKHDI_Request JIPCHHHLOMM) =>
+		{
+			//0xCCB7D4
+			if (!JIPCHHHLOMM.PDAPLCPOCMA)
+			{
+				if(DGLAMLJFEDB_CheckError(JIPCHHHLOMM.CJMFJOMECKI_ErrorId))
+				{
+					FFGPDGJNCOO = true;
+				}
+				else
+				{
+					if(!HGOKJBPIDJB(JIPCHHHLOMM))
+					{
+						AOCANKOMKFG();
+						return;
+					}
+				}
+				NIMPEHIECJH();
+				return;
+			}
+			AOCANKOMKFG();
+		};
+	}
 
 	//// RVA: 0xCCAE2C Offset: 0xCCAE2C VA: 0xCCAE2C Slot: 7
-	//public override void BMJMJCIKALP(IMCBBOAFION BHFHGFKBOHH, JFDNPFFOACP NIMPEHIECJH, DJBHIFLHJLK AOCANKOMKFG) { }
+	public override void BMJMJCIKALP(IMCBBOAFION BHFHGFKBOHH, JFDNPFFOACP NIMPEHIECJH, DJBHIFLHJLK AOCANKOMKFG)
+	{
+		MOJEDCPFGJJ_IsVersionOk = false;
+		AOODABADOGG req = NKGJPJPHLIF.HHCJCDFCLOB.IBLPICFDGOF_ServerRequester.IFFNCAFNEAG_AddRequest(new AOODABADOGG());
+		req.ICDEFIIADDO_Timeout = 15;
+		req.NBFDEFGFLPJ = NPOAJHCHJGF;
+		req.BHFHGFKBOHH_OnSuccess = (CACGCMBKHDI_Request JIPCHHHLOMM) =>
+		{
+			//0xCCB8DC
+			NKGJPJPHLIF.HHCJCDFCLOB.IJMGMJHLGDG((JIPCHHHLOMM as AOODABADOGG).NFEAMMJIMPG.EHGBICNIBKE_PlayerId);
+			BHFHGFKBOHH();
+		};
+		req.MOBEEPPKFLG_OnFail = (CACGCMBKHDI_Request JIPCHHHLOMM) =>
+		{
+			//0xCCBAFC
+			if(JIPCHHHLOMM.PDAPLCPOCMA)
+			{
+				AOCANKOMKFG();
+				return;
+			}
+			if (DGLAMLJFEDB_CheckError(JIPCHHHLOMM.CJMFJOMECKI_ErrorId))
+			{
+				FFGPDGJNCOO = true;
+			}
+			else
+			{
+				if (JIPCHHHLOMM.CJMFJOMECKI_ErrorId == SakashoErrorId.PLAYER_NOT_FOUND)
+				{
+					HLOKAOHAMNC(NIMPEHIECJH, "LINE");
+					return;
+				}
+				if(!HGOKJBPIDJB(JIPCHHHLOMM))
+				{
+					AOCANKOMKFG();
+					return;
+				}
+			}
+			NIMPEHIECJH();
+		};
+	}
 }
diff --git a/Unity/Assets/UMAssets/Scripts/AILHMHMOKKA.cs b/Unity/Assets/UMAssets/Scripts/AILHMHMOKKA.cs
@@ -1,4 +1,7 @@
 
+using XeApp.Game.Common;
+using XeSys;
+
 [System.Obsolete("Use AILHMHMOKKA_BaseLinkage", true)]
 public abstract class AILHMHMOKKA { }
 public abstract class AILHMHMOKKA_BaseLinkage
@@ -11,30 +14,68 @@ public abstract class AILHMHMOKKA_BaseLinkage
 	public abstract void EMKKJILHOOB_GetLinkageStatus(IMCBBOAFION BHFHGFKBOHH, JFDNPFFOACP NIMPEHIECJH, DJBHIFLHJLK AOCANKOMKFG);
 
 	//// RVA: -1 Offset: -1 Slot: 5
-	//public abstract void GGNBIHHFJMP(IMCBBOAFION BHFHGFKBOHH, JFDNPFFOACP NIMPEHIECJH, DJBHIFLHJLK AOCANKOMKFG);
+	public abstract void GGNBIHHFJMP(IMCBBOAFION BHFHGFKBOHH, JFDNPFFOACP NIMPEHIECJH, DJBHIFLHJLK AOCANKOMKFG);
 
 	//// RVA: -1 Offset: -1 Slot: 6
-	//public abstract void MOHPODEDIEK(IMCBBOAFION BHFHGFKBOHH, JFDNPFFOACP NIMPEHIECJH, DJBHIFLHJLK AOCANKOMKFG);
+	public abstract void MOHPODEDIEK(IMCBBOAFION BHFHGFKBOHH, JFDNPFFOACP NIMPEHIECJH, DJBHIFLHJLK AOCANKOMKFG);
 
 	//// RVA: -1 Offset: -1 Slot: 7
-	//public abstract void BMJMJCIKALP(IMCBBOAFION BHFHGFKBOHH, JFDNPFFOACP NIMPEHIECJH, DJBHIFLHJLK AOCANKOMKFG);
+	public abstract void BMJMJCIKALP(IMCBBOAFION BHFHGFKBOHH, JFDNPFFOACP NIMPEHIECJH, DJBHIFLHJLK AOCANKOMKFG);
 
 	//// RVA: 0xCCB544 Offset: 0xCCB544 VA: 0xCCB544
-	//protected bool HGOKJBPIDJB(CACGCMBKHDI NHECPMNKEFK) { }
+	protected bool HGOKJBPIDJB(CACGCMBKHDI_Request NHECPMNKEFK)
+	{
+		if (NHECPMNKEFK.PDAPLCPOCMA)
+			return false;
+		if(NHECPMNKEFK.CJMFJOMECKI_ErrorId < SakashoErrorId.RANKING_CLOSED)
+		{
+			if(NHECPMNKEFK.CJMFJOMECKI_ErrorId >= SakashoErrorId.GAME_NOT_FACEBOOK_LINKAGE && NHECPMNKEFK.CJMFJOMECKI_ErrorId < SakashoErrorId.RANKING_CLOSED)
+			{
+				return ((0x23 >> ((int)NHECPMNKEFK.CJMFJOMECKI_ErrorId - 70)) & 1) != 0;
+			}
+		}
+		else
+		{
+			if((int)NHECPMNKEFK.CJMFJOMECKI_ErrorId >= 254 && (int)NHECPMNKEFK.CJMFJOMECKI_ErrorId - 254 < 16)
+			{
+				return ((1 << ((int)NHECPMNKEFK.CJMFJOMECKI_ErrorId - 254)) & 0x87df) != 0;
+			}
+			if (NHECPMNKEFK.CJMFJOMECKI_ErrorId == SakashoErrorId.ANOTHER_FACEBOOK_USER_ID_ALREADY_EXISTS)
+				return true;
+			if ((int)NHECPMNKEFK.CJMFJOMECKI_ErrorId >= 336 && (int)NHECPMNKEFK.CJMFJOMECKI_ErrorId - 336 < 6)
+				return true;
+		}
+		return false;
+	}
 
 	//// RVA: 0xCCB520 Offset: 0xCCB520 VA: 0xCCB520
 	protected bool DGLAMLJFEDB_CheckError(SakashoErrorId KLCMLLLIANB)
 	{
-		TodoLogger.LogError(0, "AILHMHMOKKA_BaseLinkage.DGLAMLJFEDB_CheckError");
-		return false;
+		return KLCMLLLIANB == SakashoErrorId.GAME_NOT_TWITTER_LINKAGE ||
+			KLCMLLLIANB == SakashoErrorId.GAME_NOT_LINE_LINKAGE ||
+			KLCMLLLIANB == SakashoErrorId.GAME_NOT_FACEBOOK_LINKAGE;
 	}
 
 	//// RVA: 0xCD1AF4 Offset: 0xCD1AF4 VA: 0xCD1AF4
 	//protected bool FDDHFHKIABD(SakashoErrorId KLCMLLLIANB) { }
 
 	//// RVA: 0xCD1B2C Offset: 0xCD1B2C VA: 0xCD1B2C
-	//protected bool NPOAJHCHJGF(SakashoErrorId KLCMLLLIANB) { }
+	protected bool NPOAJHCHJGF(SakashoErrorId KLCMLLLIANB)
+	{
+		return KLCMLLLIANB == SakashoErrorId.PLAYER_NOT_FOUND;
+	}
 
 	//// RVA: 0xCCBC94 Offset: 0xCCBC94 VA: 0xCCBC94
-	//protected void HLOKAOHAMNC(JFDNPFFOACP NIMPEHIECJH, string JJPJAJEOECI) { }
+	protected void HLOKAOHAMNC(JFDNPFFOACP NIMPEHIECJH, string JJPJAJEOECI)
+	{
+		TextPopupSetting s = new TextPopupSetting();
+		s.TitleText = MessageManager.Instance.GetMessage("common", "popup_inh_title_005");
+		s.Buttons = new ButtonInfo[1] { new ButtonInfo() { Label = PopupButton.ButtonLabel.Ok, Type = PopupButton.ButtonType.Positive } };
+		s.Text = string.Format(MessageManager.Instance.GetMessage("common", "popup_inh_player_not_found"), JJPJAJEOECI);
+		PopupWindowManager.Show(s, (PopupWindowControl HEIEPLBJGJA, PopupButton.ButtonType INDDJNMPONH, PopupButton.ButtonLabel LHFGEOAJAAL) =>
+		{
+			//0xCD1B44
+			NIMPEHIECJH();
+		}, null, null, null);
+	}
 }
diff --git a/Unity/Assets/UMAssets/Scripts/BBGDKLLEPIB.cs b/Unity/Assets/UMAssets/Scripts/BBGDKLLEPIB.cs
@@ -256,7 +256,7 @@ private IEnumerator EOFJPNPFGDM_Coroutine_Install(IMCBBOAFION BHFHGFKBOHH, DJBHI
 				yield return null;
 				MHHFMCPJONH.FBANBDCOEJL();
 				//L.312
-				if(MHHFMCPJONH.CMCKNKKCNDK_Status == JEHIAIPJNJF_FileDownloader.NKLKJEOKIFO_Status.FEJIMBDPMKI/*2*/)
+				if(MHHFMCPJONH.CMCKNKKCNDK_Status == JEHIAIPJNJF_FileDownloader.NKLKJEOKIFO_Status.FEJIMBDPMKI_2/*2*/)
 				{
 					OEPPEGHGNNO(3, 100);
 					if(MHHFMCPJONH != null)

diff --git a/Unity/Assets/UMAssets/Scripts/BKNLPABECOB.cs b/Unity/Assets/UMAssets/Scripts/BKNLPABECOB.cs
@@ -28,11 +28,111 @@ public override void EMKKJILHOOB_GetLinkageStatus(IMCBBOAFION BHFHGFKBOHH, JFDNP
 	}
 
 	//// RVA: 0xC8935C Offset: 0xC8935C VA: 0xC8935C Slot: 5
-	//public override void GGNBIHHFJMP(IMCBBOAFION BHFHGFKBOHH, JFDNPFFOACP NIMPEHIECJH, DJBHIFLHJLK AOCANKOMKFG) { }
+	public override void GGNBIHHFJMP(IMCBBOAFION BHFHGFKBOHH, JFDNPFFOACP NIMPEHIECJH, DJBHIFLHJLK AOCANKOMKFG)
+	{
+		NPPLCKMKIFE req = NKGJPJPHLIF.HHCJCDFCLOB.IBLPICFDGOF_ServerRequester.IFFNCAFNEAG_AddRequest(new NPPLCKMKIFE());
+		req.ICDEFIIADDO_Timeout = 15;
+		req.BHFHGFKBOHH_OnSuccess = (CACGCMBKHDI_Request JIPCHHHLOMM) =>
+		{
+			//0xC89D3C
+			JEDJNIKPFLH_IsLinked = true;
+			BHFHGFKBOHH();
+		};
+		req.MOBEEPPKFLG_OnFail = (CACGCMBKHDI_Request JIPCHHHLOMM) =>
+		{
+			//0xC89D88
+			if (!JIPCHHHLOMM.PDAPLCPOCMA)
+			{
+				if (DGLAMLJFEDB_CheckError(JIPCHHHLOMM.CJMFJOMECKI_ErrorId))
+					FFGPDGJNCOO = true;
+				else
+				{
+					if (!HGOKJBPIDJB(JIPCHHHLOMM))
+					{
+						AOCANKOMKFG();
+						return;
+					}
+				}
+				NIMPEHIECJH();
+				return;
+			}
+			AOCANKOMKFG();
+		};
+	}
 
 	//// RVA: 0xC895A4 Offset: 0xC895A4 VA: 0xC895A4 Slot: 6
-	//public override void MOHPODEDIEK(IMCBBOAFION BHFHGFKBOHH, JFDNPFFOACP NIMPEHIECJH, DJBHIFLHJLK AOCANKOMKFG) { }
+	public override void MOHPODEDIEK(IMCBBOAFION BHFHGFKBOHH, JFDNPFFOACP NIMPEHIECJH, DJBHIFLHJLK AOCANKOMKFG)
+	{
+		NIAECEJLJKH req = NKGJPJPHLIF.HHCJCDFCLOB.IBLPICFDGOF_ServerRequester.IFFNCAFNEAG_AddRequest(new NIAECEJLJKH());
+		req.ICDEFIIADDO_Timeout = 15;
+		req.BHFHGFKBOHH_OnSuccess = (CACGCMBKHDI_Request JIPCHHHLOMM) =>
+		{
+			//0xC89E8C
+			JEDJNIKPFLH_IsLinked = false;
+			BHFHGFKBOHH();
+		};
+		req.MOBEEPPKFLG_OnFail = (CACGCMBKHDI_Request JIPCHHHLOMM) =>
+		{
+			//0xC89ED8
+			if(!JIPCHHHLOMM.PDAPLCPOCMA)
+			{
+				if (DGLAMLJFEDB_CheckError(JIPCHHHLOMM.CJMFJOMECKI_ErrorId))
+					FFGPDGJNCOO = true;
+				else
+				{
+					if(!HGOKJBPIDJB(JIPCHHHLOMM))
+					{
+						AOCANKOMKFG();
+						return;
+					}
+				}
+				NIMPEHIECJH();
+				return;
+			}
+			AOCANKOMKFG();
+		};
+	}
 
 	//// RVA: 0xC897EC Offset: 0xC897EC VA: 0xC897EC Slot: 7
-	//public override void BMJMJCIKALP(IMCBBOAFION BHFHGFKBOHH, JFDNPFFOACP NIMPEHIECJH, DJBHIFLHJLK AOCANKOMKFG) { }
+	public override void BMJMJCIKALP(IMCBBOAFION BHFHGFKBOHH, JFDNPFFOACP NIMPEHIECJH, DJBHIFLHJLK AOCANKOMKFG)
+	{
+		ANLMHAMGJHP req = NKGJPJPHLIF.HHCJCDFCLOB.IBLPICFDGOF_ServerRequester.IFFNCAFNEAG_AddRequest(new ANLMHAMGJHP());
+		req.ICDEFIIADDO_Timeout = 15;
+		req.NBFDEFGFLPJ = NPOAJHCHJGF;
+		req.BHFHGFKBOHH_OnSuccess = (CACGCMBKHDI_Request JIPCHHHLOMM) =>
+		{
+			//0xC89FDC
+			NKGJPJPHLIF.HHCJCDFCLOB.IJMGMJHLGDG((JIPCHHHLOMM as ANLMHAMGJHP).NFEAMMJIMPG.EHGBICNIBKE_PlayerId);
+			BHFHGFKBOHH();
+		};
+		req.MOBEEPPKFLG_OnFail = (CACGCMBKHDI_Request JIPCHHHLOMM) =>
+		{
+			//0xC8A1FC
+			if(!JIPCHHHLOMM.PDAPLCPOCMA)
+			{
+				if(DGLAMLJFEDB_CheckError(JIPCHHHLOMM.CJMFJOMECKI_ErrorId))
+				{
+					FFGPDGJNCOO = true;
+				}
+				else
+				{
+					if(JIPCHHHLOMM.CJMFJOMECKI_ErrorId == SakashoErrorId.PLAYER_NOT_FOUND)
+					{
+						HLOKAOHAMNC(NIMPEHIECJH, "Facebook");
+						return;
+					}
+					if(!HGOKJBPIDJB(JIPCHHHLOMM))
+					{
+						if (AOCANKOMKFG != null)
+							AOCANKOMKFG();
+						return;
+					}
+				}
+				NIMPEHIECJH();
+				return;
+			}
+			if(AOCANKOMKFG != null)
+				AOCANKOMKFG();
+		};
+	}
 }
diff --git a/Unity/Assets/UMAssets/Scripts/CCAAJNJGNDO.cs b/Unity/Assets/UMAssets/Scripts/CCAAJNJGNDO.cs
@@ -260,7 +260,7 @@ public void KHEKNNFCAOI(int OAFJONPIFGM)
 								"", g != 0 ? NIPDOAIGCIB.OEDCONLFLHD/*2*/ : NIPDOAIGCIB.JFEDIMKFDNH/*0*/, dbEventStory.LOHMKCPKBON, OAFJONPIFGM, 0, false, true);
 							g++;
 							break;
-						case FBIOJHECAHB_EventStory.NMIGMCJHAIE.MOPAEGFEGCB/*5*/:
+						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;

diff --git a/Unity/Assets/UMAssets/Scripts/CHHECNJBMLA.cs b/Unity/Assets/UMAssets/Scripts/CHHECNJBMLA.cs
@@ -23,7 +23,11 @@ public class CHHECNJBMLA_EventBoxGacha : IKDICBBFBMI_EventBase
 	public override OHCAABOMEOF.KGOGMKMBCPP_EventType HIDHLFCBIDE_EventType { get { return OHCAABOMEOF.KGOGMKMBCPP_EventType.OCCGDMDBCHK_EventGacha; } } //0x12BF064 DKHCGLCNKCD  Slot: 4
 
 	// // RVA: 0x12BF06C Offset: 0x12BF06C VA: 0x12BF06C Slot: 32
-	// public override EECOJKDJIFG DAKMIKNKHMF(int LHJCOPMMIGO = 0) { }
+	public override EECOJKDJIFG DAKMIKNKHMF(int LHJCOPMMIGO = 0)
+	{
+		TodoLogger.LogError(0, "DAKMIKNKHMF");
+		return null;
+	}
 
 	// RVA: 0x12BF074 Offset: 0x12BF074 VA: 0x12BF074
 	public CHHECNJBMLA_EventBoxGacha(string OPFGFINHFCE) : base(OPFGFINHFCE)