diff --git a/.vscode/settings.json b/.vscode/settings.json index 4849d0f..a247b9a 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -51,6 +51,6 @@ "temp/": true, "Temp/": true }, - "dotnet.defaultSolution": "sdk_TEST.sln", + "dotnet.defaultSolution": "BingoGrassland_unity_a.sln", "git.ignoreLimitWarning": true } \ No newline at end of file diff --git a/Assets/BingoBrain/BingoScene.cs b/Assets/BingoBrain/BingoScene.cs index 1013830..b2637b6 100644 --- a/Assets/BingoBrain/BingoScene.cs +++ b/Assets/BingoBrain/BingoScene.cs @@ -81,7 +81,7 @@ namespace BingoBrain SaveingPotHelper.CheckSaveingPot(); SaveingPotHelper.TestingClearTime(); // HideLoadingUI(); - if (GameHelper.IsGiftSwitch()) + if (true) { WebviewManager.Instance.SetFullScreen(); int flyswitch = ConfigSystem.GetConfig().flyswitch; @@ -118,7 +118,7 @@ namespace BingoBrain UICtrlDispatcher.Instance.Dispatch(SkinInfo.EnterBingoUI_Open); GameHelper.PostFunnelLogin("enterButtonShow"); isopen = true; - LoginSystem_sdk.Instance.RequestLogin(); + // LoginSystem_sdk.Instance.RequestLogin(); } public override void Dispose() diff --git a/Assets/Reserved/Scene/BingoScene.unity b/Assets/Reserved/Scene/BingoScene.unity index 34b9dba..f156e71 100644 --- a/Assets/Reserved/Scene/BingoScene.unity +++ b/Assets/Reserved/Scene/BingoScene.unity @@ -131,7 +131,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 137049540} - - component: {fileID: 137049539} m_Layer: 0 m_Name: WebviewManager m_TagString: Untagged @@ -139,19 +138,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &137049539 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 137049538} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ee10b2cdf9d274dfa8e9063c83029ded, type: 3} - m_Name: - m_EditorClassIdentifier: - orthoCamera: {fileID: 0} --- !u!4 &137049540 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/ConfigSystem_sdk.cs b/Assets/Scripts/ConfigSystem_sdk.cs index 3367dd3..351fee6 100644 --- a/Assets/Scripts/ConfigSystem_sdk.cs +++ b/Assets/Scripts/ConfigSystem_sdk.cs @@ -120,12 +120,12 @@ namespace BingoBrain SetConfig(json); if (true) { - // SdkManager. + SdkManager.Instance.RefreshUrl(); } // CtrlDispatcher.Instance.Dispatch(CtrlMsg.Game_StartBefore); } - RootObject SDKConfig; + public RootObject SDKConfig; private void SetConfig(string json_) { SDKConfig = JsonConvert.DeserializeObject(json_); diff --git a/Assets/Scripts/SdkManager.cs b/Assets/Scripts/SdkManager.cs index c42aff9..56256ae 100644 --- a/Assets/Scripts/SdkManager.cs +++ b/Assets/Scripts/SdkManager.cs @@ -11,6 +11,8 @@ using DG.Tweening; using BingoBrain; using BingoBrain.Core; using BingoBrain.HotFix; +using Unity.VisualScripting.FullSerializer; +using Unity.VisualScripting; @@ -172,9 +174,8 @@ public class SdkManager : MonoBehaviour public void H5AutoRefresh(string times) { if (times == "") return; - DateTime newDate = TimeZone.CurrentTimeZone.ToLocalTime(new DateTime(1970, 1, 1)); - newDate = newDate.AddSeconds(GameHelper.GetNowTime(true)); - var newDays = newDate.Day; + DateTime today = DateTime.Now; + var newDays = today.Day; if (times == "Dailyrefreshtimes") @@ -272,16 +273,6 @@ public class SdkManager : MonoBehaviour string darkWVRefreshtime_str = ""; string darkWVDailyrefreshtimes_str = ""; - // for (int i = 0; i < ConfigSystem.GetConfig().darkWVRefreshtime.Length; i++) - // { - // if (i != 0) darkWVRefreshtime_str += "|"; - // darkWVRefreshtime_str += ConfigSystem.GetConfig().darkWVRefreshtime[i].ToString(); - // } - // for (int i = 0; i < ConfigSystem.GetConfig().darkWVRefreshtime2.Length; i++) - // { - // darkWVRefreshtime_str += "|"; - // darkWVRefreshtime_str += ConfigSystem.GetConfig().darkWVRefreshtime2[i].ToString(); - // } int dark_type = -1; for (int i = 0; i < ConfigSystem.dark_weblist.Count; i++) { @@ -294,11 +285,7 @@ public class SdkManager : MonoBehaviour dark_type = ConfigSystem.dark_weblist[i].wvType; } } - // for (int i = 0; i < ConfigSystem.GetConfig().darkWVDailyrefreshtimes.Length; i++) - // { - // if (i != 0) darkWVDailyrefreshtimes_str += "|"; - // darkWVDailyrefreshtimes_str += ConfigSystem.GetConfig().darkWVDailyrefreshtimes[i].ToString(); - // } + dark_type = -1; for (int i = 0; i < ConfigSystem.dark_weblist.Count; i++) @@ -315,61 +302,6 @@ public class SdkManager : MonoBehaviour darkWVDailyrefreshtimes_str, "", "", GameHelper.IsGiftSwitch(), "", ""); } } - else - { - - string[] temp_array = times.Split("|"); - if (temp_array.Length >= 2 && temp_array[0] != null && temp_array[0] != "") - { - if (temp_array[1] == "h5") - { - - H5sendClass info = new H5sendClass() { link = temp_array[0], type = "h5" }; - NetworkKit.PostWithHeader("event/h5Impressions", info, (isSuccess, obj) => - { - if (isSuccess) - { - - int numbers = 0; - for (int i = 0; i < ConfigSystem.light_weblist.Count; i++) - { - if (ConfigSystem.light_weblist[i].webLink == temp_array[0]) - { - // Debug.Log("uuuuuuuuuuuuuuuuu明穿透" + temp_array[0] + "已经刷新了" + obj.times + "次" + "上限是" + ConfigSystem.light_weblist[i].refreshMax + "次"); - numbers = ConfigSystem.light_weblist[i].refreshMax - obj.times; - break; - } - } - if (numbers < 0) numbers = 0; - upDataH5times(temp_array[0], numbers, false); - } - }); - } - else - { - H5sendClass info = new H5sendClass() { link = temp_array[0], type = "h6" }; - NetworkKit.PostWithHeader("event/h5Impressions", info, (isSuccess, obj) => - { - if (isSuccess) - { - int numbers = 0; - for (int i = 0; i < ConfigSystem.dark_weblist.Count; i++) - { - if (ConfigSystem.dark_weblist[i].webLink == temp_array[0]) - { - // Debug.Log("uuuuuuuuuuuuuuuuu暗穿透" + temp_array[0] + "已经刷新了" + obj.times + "次" + "上限是" + ConfigSystem.dark_weblist[i].refreshMax + "次"); - numbers = ConfigSystem.dark_weblist[i].refreshMax - obj.times; - break; - } - } - if (numbers < 0) numbers = 0; - upDataH5times(temp_array[0], numbers, true); - } - }); - } - - } - } } @@ -396,373 +328,245 @@ public class SdkManager : MonoBehaviour { NetworkKit.BuriedPoint(BuriedPointEvent.Hall_behavior, BuriedPointEvent.annular_finish_number, 1); } - // else - // { - - // string[] a = name.Split("|"); - // if (a.Length < 2) return; - // if (!float.TryParse(a[0], out float x) || !float.TryParse(a[1], out float y)) - // { - // Debug.LogError("Invalid format for coordinates: " + name); - // return; - // } - - // Vector2 fguiScreenPos = new(x * GRoot.inst.width, y * GRoot.inst.height); - - // // Debug.Log("mmmmmmmmmmmmmmmmmm" + a[0]); - // // Debug.Log("mmmmmmmmmmmmmmmmmm" + a[1]); - // // if (AppConst.DeviceLangue == "pt") - // // { - // // fguiScreenPos = new Vector2((float.Parse(a[0]) * GRoot.inst.width) / 1000000.0f, - // // float.Parse(a[1]) * GRoot.inst.height / 1000000.0f); - // // } - // // else - // // { - - // //} - // GButton objUnderPoint = null; - - // var child_array = GRoot.inst.GetChildren().Reverse(); - // bool click_card = true; - // foreach (GComponent child in child_array) //normal - // { - // if (child.GetChildren().Length > 0) - // { - // var com_array = child.GetChildren().Reverse(); - // foreach (GComponent com_child in com_array) //com_层面 - // { - // if (child.name == "Popup" || child.name == "Highest") - // { - // click_card = false;/* */ - // } - // var btn_array = com_child.GetChildren(); - // for (int i = btn_array.Length - 1; i >= 0; i--) //btn_层面 - // { - // // if (btn_array[i] .name=="btn_collect") - // // { - // // Debug.Log(btn_array[i].x); - // // Debug.Log(btn_array[i].y); - // // Debug.Log(fguiScreenPos.x); - // // Debug.Log(fguiScreenPos.y); - // // Debug.Log(btn_array[i].position.x <= fguiScreenPos.x && - // // fguiScreenPos.x <= btn_array[i].position.x + btn_array[i].width); - // // Debug.Log( btn_array[i].position.y <= fguiScreenPos.y && - // // fguiScreenPos.y <= btn_array[i].position.y + btn_array[i].height); - // // } - - // if (btn_array[i] is GButton) - // { - // GButton temp = btn_array[i] as GButton; - - // if (temp.onStage && temp.visible && temp.position.x <= fguiScreenPos.x && - // fguiScreenPos.x <= temp.position.x + temp.width && - // temp.position.y <= fguiScreenPos.y && - // fguiScreenPos.y <= temp.position.y + temp.height) - // { - // objUnderPoint = btn_array[i] as GButton; - // if (objUnderPoint.enabled) - // { - // objUnderPoint.FireClick(true, true); - // } - // else objUnderPoint.FireClick(true, false); - // goto EndLoop; - // } - // } - - // else if (btn_array[i] is GTextInput) - // { - - // GTextInput temp = btn_array[i] as GTextInput; - // if (temp.onStage && temp.visible && temp.position.x <= fguiScreenPos.x && - // fguiScreenPos.x <= temp.position.x + temp.width && - // temp.position.y <= fguiScreenPos.y && - // fguiScreenPos.y <= temp.position.y + temp.height) - // { - - // temp.RequestFocus(); - // goto EndLoop; - // } - - // } - // else if (btn_array[i] is GList) - // { - - // GList temp = btn_array[i] as GList; - // if (temp.onStage && temp.visible && temp.position.x <= fguiScreenPos.x && - // fguiScreenPos.x <= temp.position.x + temp.width && - // temp.position.y <= fguiScreenPos.y && - // fguiScreenPos.y <= temp.position.y + temp.height) - // { - // if (select_glist == null) - // { - // select_glist_y = fguiScreenPos.y; - // select_glist = btn_array[i] as GList; - // } - // else - // { - // select_glist.scrollPane.posY -= (fguiScreenPos.y - select_glist_y); - // select_glist_y = fguiScreenPos.y; - // } - - // goto EndLoop; - // } - - // } - // else if (btn_array[i] is GComponent) - // { - // var child_btn_array = btn_array[i].asCom.GetChildren(); //嵌套的com - - // for (int j = child_btn_array.Length - 1; j >= 0; j--) - // { - // if (child_btn_array[j] is GButton) - // { - // Vector2 local_pos = new Vector2(btn_array[i].x + child_btn_array[j].x, - // btn_array[i].y + child_btn_array[j].y); - // if (child_btn_array[j].visible && child_btn_array[j].onStage && child_btn_array[j].visible && local_pos.x <= fguiScreenPos.x && - // fguiScreenPos.x <= local_pos.x + child_btn_array[j].width && - // local_pos.y <= fguiScreenPos.y && fguiScreenPos.y <= - // local_pos.y + child_btn_array[j].height) - // { - // objUnderPoint = child_btn_array[j] as GButton; - // if (objUnderPoint.enabled) objUnderPoint.FireClick(true, true); - // else objUnderPoint.FireClick(true, false); - // goto EndLoop; - - // } - // } - // } - - // } - - // } - // } - // if (child.name == "Popup" || child.name == "Highest") - // { - // goto EndLoop; - // } - // } - // } - - // EndLoop: Debug.Log(""); - // // if (click_card) - // // { - // // if (orthoCamera == null) orthoCamera = GameObject.Find("GameCamera").GetComponent(); - // // Ray ray = orthoCamera.ScreenPointToRay(new Vector2(float.Parse(a[0]) * Screen.width, (1 - float.Parse(a[1])) * Screen.height)); - // // RaycastHit hit; - // // int layerMask = 1 << 6; - - // // if (Physics.Raycast(ray, out hit, Mathf.Infinity, layerMask)) - // // { - // // // GameDispatcher.Instance.Dispatch(GameMsg.card_click, hit.collider.gameObject.name); - // // } - // // } - - // } } - public Camera orthoCamera; - - public static Dictionary adCallbackInfo = new Dictionary(); - public void SendH5Event(string numbers) - { - - // adCallbackInfo.Clear(); - // adCallbackInfo.Add("h5_revenue",ConfigSystem.GetConfig().h5_refreshRevenue.ToString()); - // //Debug.Log("sssssssssssssssssss"+JsonConvert.SerializeObject(adCallbackInfo)); - // AppsFlyer.sendEvent("Growing_Total_01_002",adCallbackInfo); - } - + List light_restoredList; + List> dark_restoredList; public void RefreshUrl() { // if (gameUrlInfo == null) return; //TODO: show invisible h5 - var Dailyrefresh_reamain = 0; - var last_time = PlayerPrefs.GetInt("Dayreftimes", 0); - DateTime newDate = TimeZone.CurrentTimeZone.ToLocalTime(new DateTime(1970, 1, 1)); - newDate = newDate.AddSeconds(GameHelper.GetNowTime()); - var newDays = newDate.Day; + string Dailyrefresh_reamain = ""; + int last_time = PlayerPrefs.GetInt("Dayreftimes", 0); + DateTime today = DateTime.Now; + int newDays = today.Day; - if (last_time == newDays) + string light_refresh_str = PlayerPrefs.GetString("Dailyrefreshnum", ""); + + if (string.IsNullOrEmpty(light_refresh_str)) { - Dailyrefresh_reamain = ConfigSystem.GetConfig().Dailyrefreshtimes - - PlayerPrefs.GetInt("Dailyrefreshnum", 0); + light_restoredList = new List(); } else { - PlayerPrefs.SetInt("Dailyrefreshnum", 0); - Dailyrefresh_reamain = ConfigSystem.GetConfig().Dailyrefreshtimes; + light_restoredList = light_refresh_str.Split(',').Select(int.Parse).ToList(); + } + + if (light_restoredList.Count < ConfigSystem_sdk.Instance.SDKConfig.h5Conf.links.Count) + { + int targetCount = ConfigSystem_sdk.Instance.SDKConfig.h5Conf.links.Count; + + for (int i = light_restoredList.Count; i < targetCount; i++) + { + light_restoredList.Add(0); + } + } + + if (last_time == newDays) + { + // for (int i = 0; i < light_restoredList.Count; i++) + // { + // if (i != 0) Dailyrefresh_reamain += "|"; + + // if (ConfigSystem_sdk.Instance.SDKConfig.h5Conf.links.Count > i) + // { + // Dailyrefresh_reamain += (ConfigSystem_sdk.Instance.SDKConfig.h5Conf.links[i].maxF5Times - light_restoredList[i]); + // } + // else Dailyrefresh_reamain += 0; + // } + } + else + { + + for (int i = 0; i < light_restoredList.Count; i++) + { + light_restoredList[i] = 0; + } + string str = string.Join(",", light_restoredList); + PlayerPrefs.SetString("Dailyrefreshnum", str); + + + // for (int i = 0; i < light_restoredList.Count; i++) + // { + // if (i != 0) Dailyrefresh_reamain += "|"; + // if (ConfigSystem_sdk.Instance.SDKConfig.h5Conf.links.Count > i) Dailyrefresh_reamain += ConfigSystem_sdk.Instance.SDKConfig.h5Conf.links[i].maxF5Times; + // else Dailyrefresh_reamain += 0; + // } + PlayerPrefs.SetInt("Dayreftimes", newDays); } int dark_last_time = PlayerPrefs.GetInt("dark_refreshDay", 0); - DateTime dark_newDate = TimeZone.CurrentTimeZone.ToLocalTime(new DateTime(1970, 1, 1)); - dark_newDate = dark_newDate.AddSeconds(GameHelper.GetNowTime()); - var dark_newDays = dark_newDate.Day; - string darkWVDailyrefreshtimes_str = ""; - - if (SaveData.GetSaveobject().dark_Dayref == null) + string dark_refresh_str = PlayerPrefs.GetString("Darkrefreshnum", ""); + // if (SaveData.GetSaveobject().dark_Dayref == null) + // { + // SaveData.GetSaveobject().dark_Dayref = new List() { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; + // } + if (string.IsNullOrEmpty(dark_refresh_str)) { - SaveData.GetSaveobject().dark_Dayref = new List() { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - } - - if (dark_last_time == dark_newDays) - { - // dark_Dailyrefresh_reamain = ConfigSystem.GetConfig().darkWVDailyrefreshtimes[Int32.Parse(webview_index) - 1] - - // PlayerPrefs.GetInt("dark_Dayref", 0); - // for (int i = 0; i < ConfigSystem.GetConfig().darkWVDailyrefreshtimes.Length; i++) - // { - - // if (i != 0) darkWVDailyrefreshtimes_str += "|"; - // darkWVDailyrefreshtimes_str += ConfigSystem.GetConfig().darkWVDailyrefreshtimes[i] - SaveData.GetSaveobject().dark_Dayref[i]; - - // } - int dark_type_ = -1; - for (int i = 0; i < ConfigSystem.dark_weblist.Count; i++) - { - if (dark_type_ != ConfigSystem.dark_weblist[i].wvType) - { - dark_type_ = ConfigSystem.dark_weblist[i].wvType; - if (i != 0) darkWVDailyrefreshtimes_str += "|"; - Debug.Log(dark_type_); - darkWVDailyrefreshtimes_str += ConfigSystem.dark_weblist[i].darkWVDailyrefreshtimes - SaveData.GetSaveobject().dark_Dayref[dark_type_ - 1]; - } - } + dark_restoredList = new List>(); } else { - // PlayerPrefs.SetInt("dark_Dayref", 0); - for (int i = 0; i < SaveData.GetSaveobject().dark_Dayref.Count; i++) - { - SaveData.GetSaveobject().dark_Dayref[i] = 0; - } - SaveData.saveDataFunc(); - // dark_Dailyrefresh_reamain = ConfigSystem.GetConfig().darkWVDailyrefreshtimes[Int32.Parse(webview_index)]; - - // for (int i = 0; i < ConfigSystem.GetConfig().darkWVDailyrefreshtimes.Length; i++) - // { - - // if (i != 0) darkWVDailyrefreshtimes_str += "|"; - // darkWVDailyrefreshtimes_str += ConfigSystem.GetConfig().darkWVDailyrefreshtimes[i]; - - // } - int dark_type_ = -1; - for (int i = 0; i < ConfigSystem.dark_weblist.Count; i++) - { - if (dark_type_ != ConfigSystem.dark_weblist[i].wvType) - { - dark_type_ = ConfigSystem.dark_weblist[i].wvType; - if (i != 0) darkWVDailyrefreshtimes_str += "|"; - darkWVDailyrefreshtimes_str += ConfigSystem.dark_weblist[i].darkWVDailyrefreshtimes; - } - } - PlayerPrefs.SetInt("dark_refreshDay", dark_newDays); + dark_restoredList = dark_refresh_str.Split(';').Select(row => row.Split(',').Select(int.Parse).ToList()).ToList(); } - // var last_login_time = PlayerPrefs.GetInt("last_login_time", 0);//获取上次登录日期 - // PlayerPrefs.SetInt("last_login_time", newDays); + + if (dark_restoredList.Count < ConfigSystem_sdk.Instance.SDKConfig.h6Conf.layerConfList.Count) + { + int targetCount = ConfigSystem_sdk.Instance.SDKConfig.h6Conf.layerConfList.Count; + + for (int i = dark_restoredList.Count; i < targetCount; i++) + { + dark_restoredList.Add(new List()); + } + } + + for (int i = 0; i < dark_restoredList.Count; i++) + { + if (ConfigSystem_sdk.Instance.SDKConfig.h6Conf.layerConfList.Count > i) + { + int targetCount = ConfigSystem_sdk.Instance.SDKConfig.h6Conf.layerConfList[i].links.Count; + if (dark_restoredList[i].Count < targetCount) + { + for (int j = dark_restoredList[i].Count; j < targetCount; j++) + { + dark_restoredList[i].Add(0); + } + } + } + } + + + + if (dark_last_time == newDays) + { + // for (int i = 0; i < dark_restoredList.Count; i++) + // { + // for (int j = 0; j < dark_restoredList[i].Count; j++) + // { + // // darkWVDailyrefreshtimes_str += ConfigSystem_sdk.Instance.SDKConfig.h6Conf.layerConfList[i].links[j].maxF5Times - dark_restoredList[i][j] + + + // } + // } + + // int dark_type_ = -1; + // for (int i = 0; i < ConfigSystem.dark_weblist.Count; i++) + // { + // if (dark_type_ != ConfigSystem.dark_weblist[i].wvType) + // { + // dark_type_ = ConfigSystem.dark_weblist[i].wvType; + // if (i != 0) darkWVDailyrefreshtimes_str += "|"; + // Debug.Log(dark_type_); + // darkWVDailyrefreshtimes_str += ConfigSystem.dark_weblist[i].darkWVDailyrefreshtimes - SaveData.GetSaveobject().dark_Dayref[dark_type_ - 1]; + // } + // } + } + else + { + + + for (int i = 0; i < dark_restoredList.Count; i++) + { + for (int j = 0; j < dark_restoredList[i].Count; j++) + { + dark_restoredList[i][j] = 0; + } + } + + PlayerPrefs.SetInt("dark_refreshDay", newDays); + PlayerPrefs.SetString("Darkrefreshnum", string.Join(";", dark_restoredList.Select(row => string.Join(",", row)))); + // PlayerPrefs.SetInt("dark_Dayref", 0); + + // for (int i = 0; i < SaveData.GetSaveobject().dark_Dayref.Count; i++) + // { + // SaveData.GetSaveobject().dark_Dayref[i] = 0; + // } + // SaveData.saveDataFunc(); + + // int dark_type_ = -1; + // for (int i = 0; i < ConfigSystem.dark_weblist.Count; i++) + // { + // if (dark_type_ != ConfigSystem.dark_weblist[i].wvType) + // { + // dark_type_ = ConfigSystem.dark_weblist[i].wvType; + // if (i != 0) darkWVDailyrefreshtimes_str += "|"; + // darkWVDailyrefreshtimes_str += ConfigSystem.dark_weblist[i].darkWVDailyrefreshtimes; + // } + // } + + } string light_str = ""; string dark_str = ""; - - for (int i = 0; i < ConfigSystem.light_weblist.Count; i++) + int can_refresh_numbners = 0; + for (int i = 0; i < ConfigSystem_sdk.Instance.SDKConfig.h5Conf.links.Count; i++) { - int can_refresh_numbners = 0; - // if (last_login_time==newDays) - // { - // can_refresh_numbners=ConfigSystem.light_weblist[i].refreshMax- PlayerPrefs.GetInt(ConfigSystem.light_weblist[i].webLink, 0); - // if (can_refresh_numbners < 0) can_refresh_numbners = 0; - // } - // else - // { - can_refresh_numbners = ConfigSystem.light_weblist[i].refreshMax; - //if (can_refresh_numbners < 0) can_refresh_numbners = 9999999; - // PlayerPrefs.SetInt(ConfigSystem.light_weblist[i].webLink, 0); - // } - if (i != 0) { light_str += "|"; } - - light_str += ConfigSystem.light_weblist[i].webLink + "#" + ConfigSystem.light_weblist[i].probability + "#" + can_refresh_numbners + "#" + ConfigSystem.light_weblist[i].darkWebTimesCT; ; + light_str += ConfigSystem_sdk.Instance.SDKConfig.h5Conf.links[i].url + "#" + ConfigSystem_sdk.Instance.SDKConfig.h5Conf.links[i].weight + "#" + (ConfigSystem_sdk.Instance.SDKConfig.h5Conf.links[i].maxF5Times - light_restoredList[i]); } - for (int i = 0; i < ConfigSystem.dark_weblist.Count; i++) + + for (int i = 0; i < ConfigSystem_sdk.Instance.SDKConfig.h6Conf.layerConfList.Count; i++) { - int can_refresh_numbners = 0; - // if (last_login_time==newDays) - // { - // can_refresh_numbners=ConfigSystem.dark_weblist[i].refreshMax- PlayerPrefs.GetInt(ConfigSystem.dark_weblist[i].webLink, 0); - // if (can_refresh_numbners < 0) can_refresh_numbners = 0; - // } - // else - // { - can_refresh_numbners = ConfigSystem.dark_weblist[i].refreshMax; - //if (can_refresh_numbners < 0) can_refresh_numbners = 9999999; - // PlayerPrefs.SetInt(ConfigSystem.dark_weblist[i].webLink, 0); - // } - if (i != 0) + for (int j = 0; j < ConfigSystem_sdk.Instance.SDKConfig.h6Conf.layerConfList[i].links.Count; j++) { - dark_str += "|"; + if (i != 0 || j != 0) + { + dark_str += "|"; + } + dark_str += ConfigSystem_sdk.Instance.SDKConfig.h6Conf.layerConfList[i].links[j].url + "#" + ConfigSystem_sdk.Instance.SDKConfig.h6Conf.layerConfList[i].links[j].weight + "#" + (ConfigSystem_sdk.Instance.SDKConfig.h6Conf.layerConfList[i].links[j].maxF5Times - dark_restoredList[i][j]) + + "#" + ConfigSystem_sdk.Instance.SDKConfig.h6Conf.layerConfList[i].links[j].ctProb + "#" + ConfigSystem_sdk.Instance.SDKConfig.h6Conf.layerConfList[i].layerId + "#" + ConfigSystem_sdk.Instance.SDKConfig.h6Conf.layerConfList[i].offset; } - - dark_str += ConfigSystem.dark_weblist[i].webLink + "#" + ConfigSystem.dark_weblist[i].probability + "#" + can_refresh_numbners + "#" + ConfigSystem.dark_weblist[i].darkWebTimesCT + "#" + ConfigSystem.dark_weblist[i].wvType + "#" + ConfigSystem.dark_weblist[i].WVOffset; } + + string darkWVRefreshtime_str = ""; - - // for (int i = 0; i < ConfigSystem.GetConfig().darkWVRefreshtime.Length; i++) - // { - // if (i != 0) darkWVRefreshtime_str += "|"; - // darkWVRefreshtime_str += ConfigSystem.GetConfig().darkWVRefreshtime[i].ToString(); - // } - // for (int i = 0; i < ConfigSystem.GetConfig().darkWVRefreshtime2.Length; i++) - // { - // darkWVRefreshtime_str += "|"; - // darkWVRefreshtime_str += ConfigSystem.GetConfig().darkWVRefreshtime2[i].ToString(); - // } - int dark_type = -1; string add_time = ""; - for (int i = 0; i < ConfigSystem.dark_weblist.Count; i++) + string layer_click_probability = ""; + for (int i = 0; i < ConfigSystem_sdk.Instance.SDKConfig.h6Conf.layerConfList.Count; i++) { - if (dark_type != ConfigSystem.dark_weblist[i].wvType) + if (i != 0) { - if (i != 0) - { - darkWVRefreshtime_str += "|"; - add_time += "|"; - } - darkWVRefreshtime_str += ConfigSystem.dark_weblist[i].darkWVRefreshtime[0]; darkWVRefreshtime_str += "|"; - darkWVRefreshtime_str += ConfigSystem.dark_weblist[i].darkWVRefreshtime[1]; - dark_type = ConfigSystem.dark_weblist[i].wvType; - add_time += ConfigSystem.dark_weblist[i].WVClickAddTime; + add_time += "|"; + layer_click_probability += "|"; } + + darkWVRefreshtime_str += ConfigSystem_sdk.Instance.SDKConfig.h6Conf.layerConfList[i].f5Interval.min; + darkWVRefreshtime_str += "|"; + darkWVRefreshtime_str += ConfigSystem_sdk.Instance.SDKConfig.h6Conf.layerConfList[i].f5Interval.max; + + add_time += UnityEngine.Random.Range(ConfigSystem_sdk.Instance.SDKConfig.h6Conf.ADClickF5Delay.min, ConfigSystem_sdk.Instance.SDKConfig.h6Conf.ADClickF5Delay.max + 1); + + layer_click_probability += ConfigSystem_sdk.Instance.SDKConfig.h6Conf.layerConfList[i].weight; } - Debug.Log("--------------------------------"); + Debug.Log("|||||||||||||||||||||--------------------------------"); - // add_time+= ConfigSystem.GetConfig().WVClickAddTime[0] + "|" + ConfigSystem.GetConfig().WVClickAddTime[1]; - Debug.Log(add_time); Debug.Log(darkWVRefreshtime_str); - Debug.Log(darkWVDailyrefreshtimes_str); - Debug.Log(dark_str); - Debug.Log(ConfigSystem.web_through_str); - addH5Field(ConfigSystem.GetConfig().flyCtRate, ConfigSystem.GetConfig().otherH5switch, - ConfigSystem.GetConfig().H5Refreshtime, Dailyrefresh_reamain, ConfigSystem.GetConfig().darkThoughProbability - , darkWVRefreshtime_str, darkWVDailyrefreshtimes_str, dark_str, light_str, GameHelper.IsGiftSwitch(), ConfigSystem.web_through_str, add_time); - // WebviewManager.Instance.OpenWebView(gameUrlInfo.webLink); - //WebviewManager.Instance.setFlyCtRate(ConfigSystem.GetConfig().flyCtRate); - // RefreshDataCT(isTop, gameUrlInfo); + Debug.Log(dark_str); + Debug.Log(light_str); + Debug.Log(layer_click_probability); + Debug.Log(add_time); + addH5Field(ConfigSystem.GetConfig().flyCtRate, ConfigSystem.GetConfig().otherH5switch, + UnityEngine.Random.Range(ConfigSystem_sdk.Instance.SDKConfig.h5Conf.f5Interval.min, ConfigSystem_sdk.Instance.SDKConfig.h5Conf.f5Interval.max + 1), -1, -1 + , darkWVRefreshtime_str, "", dark_str, light_str, GameHelper.IsGiftSwitch(), layer_click_probability, add_time); + } public void ClickAdEvent(string ad_msg) diff --git a/BingoGrassland_unity_a.sln b/BingoGrassland_unity_a.sln new file mode 100644 index 0000000..cde06c9 --- /dev/null +++ b/BingoGrassland_unity_a.sln @@ -0,0 +1,122 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{CCAB24A6-6FF2-C7CF-A23C-3333B03C1031}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "spine-unity", "spine-unity.csproj", "{E6CC61BE-6A03-8D46-39A1-45958C3ADCE2}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MaxSdk.Scripts", "MaxSdk.Scripts.csproj", "{C0910C7B-08B1-0ED8-23B8-E8EEDA7991F5}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OPS.Obfuscator", "OPS.Obfuscator.csproj", "{2FF4C4EE-32DC-8C37-D9F9-308E808D1385}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DOTween.Modules", "DOTween.Modules.csproj", "{9E4D6757-63B1-6BC2-B279-BDA16351BF08}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AppsFlyer", "AppsFlyer.csproj", "{823BE132-B742-B98C-CA91-E6A2FA72763C}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "spine-unity-editor", "spine-unity-editor.csproj", "{9DBAB8D1-6262-4B69-7F60-2B80575E7EBE}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IngameDebugConsole.Runtime", "IngameDebugConsole.Runtime.csproj", "{0C50008A-AAA3-66FE-B7F2-3BC1450D74FE}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{0E0684EC-DADC-6671-B71F-77955DA315F3}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MaxSdk.Scripts.IntegrationManager.Editor", "MaxSdk.Scripts.IntegrationManager.Editor.csproj", "{3DB78DCD-8BC0-0E26-8DD2-F3148A511981}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DOTweenPro.Scripts", "DOTweenPro.Scripts.csproj", "{B7603A93-AA88-1BF4-560B-052975006E30}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GoogleMobileAds.Editor", "GoogleMobileAds.Editor.csproj", "{BF9AAFE0-93FB-B2F8-B146-3679BCB5B1F0}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DOTweenPro.EditorScripts", "DOTweenPro.EditorScripts.csproj", "{B98B084D-9F92-C1B7-61DD-63F23FCB2670}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FirebaseMessagingActivityGenerator", "FirebaseMessagingActivityGenerator.csproj", "{36572005-0C6D-B79F-8D91-CD6B4D208D85}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests.csproj", "{7529929D-F6EE-8F57-E0BF-6EA8528F1D1A}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IngameDebugConsole.Editor", "IngameDebugConsole.Editor.csproj", "{7D42FCD8-0740-C354-A378-C2E18DE633DD}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AppsFlyer.Editor", "AppsFlyer.Editor.csproj", "{80BC7B6D-389C-523A-D585-DF16CBDCCF65}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor-firstpass", "Assembly-CSharp-Editor-firstpass.csproj", "{33ECA254-7128-6F8A-944E-414503E66C75}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {CCAB24A6-6FF2-C7CF-A23C-3333B03C1031}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CCAB24A6-6FF2-C7CF-A23C-3333B03C1031}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CCAB24A6-6FF2-C7CF-A23C-3333B03C1031}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CCAB24A6-6FF2-C7CF-A23C-3333B03C1031}.Release|Any CPU.Build.0 = Release|Any CPU + {E6CC61BE-6A03-8D46-39A1-45958C3ADCE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E6CC61BE-6A03-8D46-39A1-45958C3ADCE2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E6CC61BE-6A03-8D46-39A1-45958C3ADCE2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E6CC61BE-6A03-8D46-39A1-45958C3ADCE2}.Release|Any CPU.Build.0 = Release|Any CPU + {C0910C7B-08B1-0ED8-23B8-E8EEDA7991F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C0910C7B-08B1-0ED8-23B8-E8EEDA7991F5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C0910C7B-08B1-0ED8-23B8-E8EEDA7991F5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C0910C7B-08B1-0ED8-23B8-E8EEDA7991F5}.Release|Any CPU.Build.0 = Release|Any CPU + {2FF4C4EE-32DC-8C37-D9F9-308E808D1385}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2FF4C4EE-32DC-8C37-D9F9-308E808D1385}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2FF4C4EE-32DC-8C37-D9F9-308E808D1385}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2FF4C4EE-32DC-8C37-D9F9-308E808D1385}.Release|Any CPU.Build.0 = Release|Any CPU + {9E4D6757-63B1-6BC2-B279-BDA16351BF08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9E4D6757-63B1-6BC2-B279-BDA16351BF08}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9E4D6757-63B1-6BC2-B279-BDA16351BF08}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9E4D6757-63B1-6BC2-B279-BDA16351BF08}.Release|Any CPU.Build.0 = Release|Any CPU + {823BE132-B742-B98C-CA91-E6A2FA72763C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {823BE132-B742-B98C-CA91-E6A2FA72763C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {823BE132-B742-B98C-CA91-E6A2FA72763C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {823BE132-B742-B98C-CA91-E6A2FA72763C}.Release|Any CPU.Build.0 = Release|Any CPU + {9DBAB8D1-6262-4B69-7F60-2B80575E7EBE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9DBAB8D1-6262-4B69-7F60-2B80575E7EBE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9DBAB8D1-6262-4B69-7F60-2B80575E7EBE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9DBAB8D1-6262-4B69-7F60-2B80575E7EBE}.Release|Any CPU.Build.0 = Release|Any CPU + {0C50008A-AAA3-66FE-B7F2-3BC1450D74FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0C50008A-AAA3-66FE-B7F2-3BC1450D74FE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0C50008A-AAA3-66FE-B7F2-3BC1450D74FE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0C50008A-AAA3-66FE-B7F2-3BC1450D74FE}.Release|Any CPU.Build.0 = Release|Any CPU + {0E0684EC-DADC-6671-B71F-77955DA315F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0E0684EC-DADC-6671-B71F-77955DA315F3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0E0684EC-DADC-6671-B71F-77955DA315F3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0E0684EC-DADC-6671-B71F-77955DA315F3}.Release|Any CPU.Build.0 = Release|Any CPU + {3DB78DCD-8BC0-0E26-8DD2-F3148A511981}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3DB78DCD-8BC0-0E26-8DD2-F3148A511981}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3DB78DCD-8BC0-0E26-8DD2-F3148A511981}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3DB78DCD-8BC0-0E26-8DD2-F3148A511981}.Release|Any CPU.Build.0 = Release|Any CPU + {B7603A93-AA88-1BF4-560B-052975006E30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B7603A93-AA88-1BF4-560B-052975006E30}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B7603A93-AA88-1BF4-560B-052975006E30}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B7603A93-AA88-1BF4-560B-052975006E30}.Release|Any CPU.Build.0 = Release|Any CPU + {BF9AAFE0-93FB-B2F8-B146-3679BCB5B1F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BF9AAFE0-93FB-B2F8-B146-3679BCB5B1F0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BF9AAFE0-93FB-B2F8-B146-3679BCB5B1F0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BF9AAFE0-93FB-B2F8-B146-3679BCB5B1F0}.Release|Any CPU.Build.0 = Release|Any CPU + {B98B084D-9F92-C1B7-61DD-63F23FCB2670}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B98B084D-9F92-C1B7-61DD-63F23FCB2670}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B98B084D-9F92-C1B7-61DD-63F23FCB2670}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B98B084D-9F92-C1B7-61DD-63F23FCB2670}.Release|Any CPU.Build.0 = Release|Any CPU + {36572005-0C6D-B79F-8D91-CD6B4D208D85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {36572005-0C6D-B79F-8D91-CD6B4D208D85}.Debug|Any CPU.Build.0 = Debug|Any CPU + {36572005-0C6D-B79F-8D91-CD6B4D208D85}.Release|Any CPU.ActiveCfg = Release|Any CPU + {36572005-0C6D-B79F-8D91-CD6B4D208D85}.Release|Any CPU.Build.0 = Release|Any CPU + {7529929D-F6EE-8F57-E0BF-6EA8528F1D1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7529929D-F6EE-8F57-E0BF-6EA8528F1D1A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7529929D-F6EE-8F57-E0BF-6EA8528F1D1A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7529929D-F6EE-8F57-E0BF-6EA8528F1D1A}.Release|Any CPU.Build.0 = Release|Any CPU + {7D42FCD8-0740-C354-A378-C2E18DE633DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7D42FCD8-0740-C354-A378-C2E18DE633DD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7D42FCD8-0740-C354-A378-C2E18DE633DD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7D42FCD8-0740-C354-A378-C2E18DE633DD}.Release|Any CPU.Build.0 = Release|Any CPU + {80BC7B6D-389C-523A-D585-DF16CBDCCF65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {80BC7B6D-389C-523A-D585-DF16CBDCCF65}.Debug|Any CPU.Build.0 = Debug|Any CPU + {80BC7B6D-389C-523A-D585-DF16CBDCCF65}.Release|Any CPU.ActiveCfg = Release|Any CPU + {80BC7B6D-389C-523A-D585-DF16CBDCCF65}.Release|Any CPU.Build.0 = Release|Any CPU + {33ECA254-7128-6F8A-944E-414503E66C75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {33ECA254-7128-6F8A-944E-414503E66C75}.Debug|Any CPU.Build.0 = Debug|Any CPU + {33ECA254-7128-6F8A-944E-414503E66C75}.Release|Any CPU.ActiveCfg = Release|Any CPU + {33ECA254-7128-6F8A-944E-414503E66C75}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal