1. 修复More 更多 数据加载 不对情况 改成实时加载
This commit is contained in:
parent
0679235d10
commit
f9557fbc40
File diff suppressed because one or more lines are too long
@ -0,0 +1,50 @@
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace GameLogic
|
||||
{
|
||||
[System.Serializable]
|
||||
public class CompanyData
|
||||
{
|
||||
public int userId; // 用户ID
|
||||
public int sortId; // 排序ID
|
||||
public string userCode; // 用户代码
|
||||
public string userAccount; // 用户账号
|
||||
public string userName; // 用户名称
|
||||
public string mobile; // 手机号码
|
||||
public string status; // 用户状态
|
||||
public string companyName; // 公司名称
|
||||
public string logoPath; // Logo路径
|
||||
public int industry; // 行业类型
|
||||
}
|
||||
|
||||
[System.Serializable]
|
||||
public class CompanyAllData
|
||||
{
|
||||
public int total; // 总记录数
|
||||
public List<CompanyData> list; // 数据列表
|
||||
public int pageNum; // 当前页码
|
||||
public int pageSize; // 每页大小
|
||||
public int size; // 当前页记录数
|
||||
public int startRow; // 起始行
|
||||
public int endRow; // 结束行
|
||||
public int pages; // 总页数
|
||||
public int prePage; // 上一页
|
||||
public int nextPage; // 下一页
|
||||
public string isFirstPage; // 是否第一页
|
||||
public string isLastPage; // 是否最后一页
|
||||
public string hasPreviousPage; // 是否有上一页
|
||||
public string hasNextPage; // 是否有下一页
|
||||
public int navigatePages; // 导航页码数
|
||||
public List<int> navigatepageNums; // 所有导航页号
|
||||
public int navigateFirstPage; // 导航条上的第一页
|
||||
public int navigateLastPage; // 导航条上的最后一页
|
||||
}
|
||||
|
||||
[System.Serializable]
|
||||
public class CompanyIndustryRoot
|
||||
{
|
||||
public int code; // 返回代码
|
||||
public string message; // 返回消息
|
||||
public CompanyAllData data; // 返回数据
|
||||
}
|
||||
}
|
@ -0,0 +1,2 @@
|
||||
fileFormatVersion: 2
|
||||
guid: ab151eda28c1568498a7232f571f1f87
|
@ -35,14 +35,7 @@ namespace GameLogic
|
||||
public string category; // category 可能为 null, 所以类型为 string,但你也可以使用 nullable
|
||||
}
|
||||
|
||||
|
||||
[Serializable]
|
||||
public class CompanyFourTopData
|
||||
{
|
||||
public int code; // 响应码(例如200表示成功)
|
||||
public string message; // 响应信息
|
||||
public List<CompanyTopData> data; // 用户数据列表
|
||||
}
|
||||
|
||||
|
||||
[Serializable]
|
||||
public class CompanyTopData
|
||||
|
@ -24,13 +24,13 @@ namespace GameLogic
|
||||
GameObjectFactory.CreateDeviceOrientationGo(homeManager.transform,OrientationState.Portrait);
|
||||
await UniTask.WaitForSeconds(.5f);
|
||||
await UniTask.Yield();
|
||||
await CoroShowAllMainUI();
|
||||
await ShowAsyncAllMainUI();
|
||||
GameModule.UI.CloseUI<UIInit>();
|
||||
//GameEvent.AddEventListener<SceneData>(ARBrochureHomeEventDefine.LoadARSceneProjectExample, LoadSceneProjectExample);
|
||||
}
|
||||
|
||||
|
||||
public async UniTask CoroShowAllMainUI()
|
||||
public async UniTask ShowAsyncAllMainUI()
|
||||
{
|
||||
await UniTask.Yield();
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Security.Cryptography;
|
||||
using Cysharp.Threading.Tasks;
|
||||
using JetBrains.Annotations;
|
||||
using TEngine;
|
||||
using UnityEngine;
|
||||
|
||||
@ -10,46 +10,34 @@ namespace GameLogic
|
||||
{
|
||||
public partial class DataConfigSystem
|
||||
{
|
||||
public async UniTask<ProjectData> GetSingleProjectAllData(string page, string userCode)
|
||||
/// <summary>
|
||||
/// 获取单个项目或公司的所有数据
|
||||
/// </summary>
|
||||
public async UniTask<ProjectData> GetSingleProjectData(string page, string userCode)
|
||||
{
|
||||
|
||||
if (m_dictallProject.TryGetValue(userCode, out var projectData))
|
||||
{
|
||||
return projectData;
|
||||
}
|
||||
string jsonParm = $"{{\"userCode\":\"{userCode}\"}}";
|
||||
var jsonData = await JsonHttpUtility.UnityWebRequestPostJsonByUserCode(page, jsonParm);
|
||||
|
||||
var jsonData = await JsonHttpUtility.UnityWebRequestPostJsonByUserCode(page, userCode);
|
||||
var projectConfigRoot = JsonUtility.FromJson<ProjectConfigRoot>(jsonData);
|
||||
|
||||
var projectDataist = GetProjectData(projectConfigRoot.data, userCode);
|
||||
if (projectDataist == null)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
if (projectDataist.Count > 0)
|
||||
{
|
||||
return projectDataist[0];
|
||||
}
|
||||
return null;
|
||||
}
|
||||
public async UniTask<ProjectData> GetSingleCompanyAllData(string page, string userCode)
|
||||
{
|
||||
|
||||
if (m_dictallProject.TryGetValue(userCode, out var projectData))
|
||||
{
|
||||
return projectData;
|
||||
}
|
||||
string jsonParm = $"{{\"userCode\":\"{userCode}\"}}";
|
||||
var jsonData = await JsonHttpUtility.UnityWebRequestPostJsonByUserCode(page, jsonParm);
|
||||
var projectConfigRoot = JsonUtility.FromJson<ProjectConfigRoot>(jsonData);
|
||||
|
||||
var projectDataist = GetProjectData(projectConfigRoot.data, userCode);
|
||||
if (projectDataist.Count > 0)
|
||||
{
|
||||
return projectDataist[0];
|
||||
}
|
||||
return null;
|
||||
}
|
||||
public async UniTask<List<ProjectData>> GetSearchCompanyAllData(string page, string companyName)
|
||||
{
|
||||
string jsonParm = $"{{\"companyName\":\"{companyName}\"}}";
|
||||
var jsonData = await JsonHttpUtility.UnityWebRequestPostJsonByUserCode(page, jsonParm);
|
||||
var jsonData = await JsonHttpUtility.UnityWebRequestPostJsonByCompany(page, companyName);
|
||||
Log.Info("jsonData"+jsonData);
|
||||
var projectConfigRoot = JsonUtility.FromJson<ProjectConfigRoot>(jsonData);
|
||||
|
||||
@ -57,6 +45,44 @@ namespace GameLogic
|
||||
}
|
||||
|
||||
|
||||
public async UniTask<List<ProjectData>> GetMoreCompanyByInDustry(string page, int industry)
|
||||
{
|
||||
var jsonData = await JsonHttpUtility.UnityWebRequestPostJsonByInDustry(page, industry.ToString());
|
||||
|
||||
var projectConfigRoot = JsonUtility.FromJson<CompanyIndustryRoot>(jsonData);
|
||||
|
||||
var total = projectConfigRoot.data.total;
|
||||
jsonData = await JsonHttpUtility.UnityWebRequestPostJsonByInDustry($"1/{projectConfigRoot.data.total}", industry.ToString());
|
||||
projectConfigRoot = JsonUtility.FromJson<CompanyIndustryRoot>(jsonData);
|
||||
|
||||
var companyList = projectConfigRoot.data.list;
|
||||
var list = new List<ProjectData>();
|
||||
Log.Info("company"+companyList.Count);
|
||||
int count = 0;
|
||||
foreach (var company in companyList)
|
||||
{
|
||||
GameEvent.Send(LoadEventDefine.InitSceneAndData, $"公司数据初始进度 {count}/{total}");
|
||||
var projectData = await GetSingleProjectData("1/14", company.userCode);
|
||||
list.Add(projectData);
|
||||
count++;
|
||||
}
|
||||
return list;
|
||||
//return GetProjectData(projectConfigRoot.data, industry);
|
||||
}
|
||||
|
||||
|
||||
public async UniTask<List<CompanyData>> GetMoreCompanyDatasByInDustry(string page, int industry)
|
||||
{
|
||||
var jsonData = await JsonHttpUtility.UnityWebRequestPostJsonByInDustry(page, industry.ToString());
|
||||
|
||||
var projectConfigRoot = JsonUtility.FromJson<CompanyIndustryRoot>(jsonData);
|
||||
|
||||
var total = projectConfigRoot.data.total;
|
||||
jsonData = await JsonHttpUtility.UnityWebRequestPostJsonByInDustry($"1/{projectConfigRoot.data.total}", industry.ToString());
|
||||
projectConfigRoot = JsonUtility.FromJson<CompanyIndustryRoot>(jsonData);
|
||||
return projectConfigRoot.data.list;
|
||||
//return GetProjectData(projectConfigRoot.data, industry);
|
||||
}
|
||||
#region 场景数据
|
||||
|
||||
public ProjectData GetProjectData(string company = null)
|
||||
|
@ -3,6 +3,7 @@ using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using Cysharp.Threading.Tasks;
|
||||
using TEngine;
|
||||
using UnityEngine;
|
||||
|
||||
namespace GameLogic
|
||||
{
|
||||
@ -10,12 +11,16 @@ namespace GameLogic
|
||||
{
|
||||
public JsonData.QueryAllCompanyData m_dataQueryAllCompany;
|
||||
private Dictionary<string, ProjectData> m_dictallProject = new Dictionary<string, ProjectData>();
|
||||
|
||||
|
||||
public List<List<ProjectData>> m_listCompanyData = new List<List<ProjectData>>();
|
||||
/// <summary>
|
||||
/// 初始化
|
||||
/// </summary>
|
||||
public async UniTask Init()
|
||||
{
|
||||
await ConfigLanguage();
|
||||
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@ -25,8 +30,25 @@ namespace GameLogic
|
||||
{
|
||||
await GameModule.Localization.LoadLanguageTotalAsset(LanguagesSetting.LanguageCsv);
|
||||
GameEvent.Send(LoadEventDefine.InitSceneAndData, "语言表加载成功...");
|
||||
|
||||
await InitCompanyData();
|
||||
GameEvent.Send(LoadEventDefine.InitSceneAndData, "公司数据初始化完成");
|
||||
await UniTask.CompletedTask;
|
||||
}
|
||||
|
||||
|
||||
public async UniTask InitCompanyData()
|
||||
{
|
||||
int[] industryIndexArray = new[] { 2, 3, 4, 1 };
|
||||
|
||||
// for (int i = 0; i < industryIndexArray.Length; i++)
|
||||
// {
|
||||
// var projectDatas = await GetMoreCompanyByInDustry("1/7", industryIndexArray[i]);
|
||||
// m_listCompanyData.Add(projectDatas);
|
||||
// }
|
||||
|
||||
}
|
||||
|
||||
public List<JsonData.QueryCompanyData> GetCompanyListFromIndustry(int industryid)
|
||||
{
|
||||
if (m_dataQueryAllCompany != null)
|
||||
@ -47,24 +69,6 @@ namespace GameLogic
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
public List<JsonData.QueryCompanyData> GetAllCompanyListDataContain(string searchString, int threshold = 3)
|
||||
{
|
||||
if (m_dataQueryAllCompany != null && !string.IsNullOrEmpty(searchString))
|
||||
{
|
||||
var list = m_dataQueryAllCompany.data;
|
||||
|
||||
// 使用Contains进行模糊搜索
|
||||
var filteredList = list
|
||||
.Where(company =>
|
||||
company.companyName != null &&
|
||||
company.companyName.Contains(searchString, StringComparison.OrdinalIgnoreCase)) // 忽略大小写
|
||||
.ToList();
|
||||
//Log.Warning(filteredList.Count);
|
||||
return filteredList;
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
@ -91,22 +91,31 @@ namespace GameLogic
|
||||
protected override void OnCreate()
|
||||
{
|
||||
base.OnCreate();
|
||||
SetUpComponentByData();
|
||||
SetUpComponentByData().Forget();
|
||||
|
||||
//UpdateMoveScrollEvent();
|
||||
}
|
||||
|
||||
private void SetUpComponentByData()
|
||||
private async UniTask SetUpComponentByData()
|
||||
{
|
||||
int[] industryIndexArray = new[] { 2, 3, 4, 1 };
|
||||
for (int i = 0; i < m_listtapContent.Count; i++)
|
||||
|
||||
for (int i = 0; i < industryIndexArray.Length; i++)
|
||||
{
|
||||
var list = DataConfigSystem.Instance.GetCompanyListFromIndustry(industryIndexArray[i]);
|
||||
//var projectDatas = await ("1/7", industryIndexArray[i]);
|
||||
//var projectDatas = DataConfigSystem.Instance.m_listCompanyData[i];
|
||||
//
|
||||
//
|
||||
var companyDatas = await DataConfigSystem.Instance.GetMoreCompanyDatasByInDustry("1/7", industryIndexArray[i]);
|
||||
|
||||
//Log.Warning("projectDatas:"+projectDatas.Count);
|
||||
var childScrollRect = m_listtapContent[i].GetComponent<UIWidgetComChildScrollView>();
|
||||
if (childScrollRect !=null)
|
||||
if (childScrollRect != null)
|
||||
{
|
||||
childScrollRect.SetUp(list);
|
||||
childScrollRect.SetUp(companyDatas);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
protected override void OnUpdate()
|
||||
|
@ -25,7 +25,7 @@ namespace GameLogic
|
||||
[ShowInInspector] private LinkedList<GameObject> m_itemPool = new LinkedList<GameObject>(); // 对象池
|
||||
[ShowInInspector] private int m_firstVisibleIndex = 0; // 第一个可见元素的索引
|
||||
|
||||
public List<JsonData.QueryCompanyData> m_itemDataList = new List<JsonData.QueryCompanyData>(); // 数据集合
|
||||
public List<CompanyData> m_itemDataList = new List<CompanyData>(); // 数据集合
|
||||
|
||||
/// <summary>
|
||||
/// 外层被拦截需要正常拖动的ScrollRect
|
||||
@ -55,7 +55,7 @@ namespace GameLogic
|
||||
public override void OnStart()
|
||||
{
|
||||
base.OnStart();
|
||||
SetUpComByLayout().Forget();
|
||||
|
||||
}
|
||||
|
||||
public override void SetUp(params object[] datas)
|
||||
@ -63,16 +63,15 @@ namespace GameLogic
|
||||
base.SetUp(datas);
|
||||
if (_CurrentobjectData != null)
|
||||
{
|
||||
m_itemDataList = new List<JsonData.QueryCompanyData>();
|
||||
m_itemDataList = new List<CompanyData>();
|
||||
|
||||
foreach (var data in (List<JsonData.QueryCompanyData>)_CurrentobjectData)
|
||||
List<CompanyData> companyDatas = (List<CompanyData>)_CurrentobjectData;
|
||||
foreach (var data in companyDatas)
|
||||
{
|
||||
JsonData.QueryCompanyData newdata = new JsonData.QueryCompanyData();
|
||||
newdata.companyName = data.companyName;
|
||||
newdata.logoPath = data.logoPath;
|
||||
m_itemDataList.Add(newdata);
|
||||
m_itemDataList.Add(data);
|
||||
}
|
||||
}
|
||||
SetUpComByLayout().Forget();
|
||||
}
|
||||
|
||||
public async UniTaskVoid SetUpComByLayout()
|
||||
|
@ -13,13 +13,14 @@ namespace GameLogic
|
||||
{
|
||||
public class UIWidgetCombtnSelectCompany : UIWidgetComponent
|
||||
{
|
||||
[ShowInInspector]private MPImage m_mpimgIcon1;
|
||||
[ShowInInspector]private MPImage m_mpimgIcon2;
|
||||
[ShowInInspector]private Button m_btnselectCompany;
|
||||
[ShowInInspector]private TextMeshProUGUI m_tmpcompanyName;
|
||||
[ShowInInspector]private CanvasGroup[] m_arraycanvasGroup;
|
||||
[ShowInInspector] private MPImage m_mpimgIcon1;
|
||||
[ShowInInspector] private MPImage m_mpimgIcon2;
|
||||
[ShowInInspector] private Button m_btnselectCompany;
|
||||
[ShowInInspector] private TextMeshProUGUI m_tmpcompanyName;
|
||||
[ShowInInspector] private CanvasGroup[] m_arraycanvasGroup;
|
||||
|
||||
public string m_companyName;
|
||||
|
||||
public override void GetAndCreateComponent()
|
||||
{
|
||||
m_mpimgIcon1 = FindChildComponent<MPImage>("m_mpimgIcon1");
|
||||
@ -32,25 +33,28 @@ namespace GameLogic
|
||||
public override void RegisterEvent()
|
||||
{
|
||||
base.RegisterEvent();
|
||||
m_btnselectCompany.onClick.AddListener(() =>
|
||||
{
|
||||
var data = DataConfigSystem.Instance.GetProjectData(m_companyName);
|
||||
if (data == null) return;
|
||||
StageSystem.Instance.LoadProject(typeof(UIQueryRankAllCompany),data,typeof(UIQueryRankAllCompany));
|
||||
});
|
||||
m_btnselectCompany.onClick.AddListener(UniTask.UnityAction(OnClickCompany));
|
||||
}
|
||||
|
||||
|
||||
public async UniTaskVoid OnClickCompany()
|
||||
{
|
||||
var companyDatadata = (CompanyData)_CurrentobjectData;
|
||||
var projectData = await DataConfigSystem.Instance.GetSingleProjectData("1/14", companyDatadata.userCode);
|
||||
if (projectData == null) return;
|
||||
StageSystem.Instance.LoadProject(typeof(UIQueryRankAllCompany), projectData, typeof(UIQueryRankAllCompany));
|
||||
}
|
||||
public override void OnStart()
|
||||
{
|
||||
base.OnStart();
|
||||
|
||||
|
||||
}
|
||||
|
||||
public override void SetUp(params object[] datas)
|
||||
{
|
||||
base.SetUp(datas);
|
||||
var data = (JsonData.QueryCompanyData)_CurrentobjectData;
|
||||
if (data.companyName!=null && data.companyName.Length>0)
|
||||
var data = (CompanyData)_CurrentobjectData;
|
||||
if (data.companyName != null && data.companyName.Length > 0)
|
||||
{
|
||||
m_tmpcompanyName.text = data.companyName;
|
||||
m_companyName = data.companyName;
|
||||
@ -59,28 +63,32 @@ namespace GameLogic
|
||||
{
|
||||
m_tmpcompanyName.text = "无";
|
||||
}
|
||||
|
||||
|
||||
CoroConfigData().Forget();
|
||||
}
|
||||
|
||||
public virtual async UniTaskVoid CoroConfigData()
|
||||
{
|
||||
await UniTask.Yield();
|
||||
|
||||
if (_CurrentobjectData!=null )
|
||||
{
|
||||
var data = (JsonData.QueryCompanyData)_CurrentobjectData;
|
||||
Log.Info( m_tmpcompanyName.name);
|
||||
if (data.logoPath !=null && data.logoPath.Length>0)
|
||||
|
||||
if (_CurrentobjectData != null)
|
||||
{
|
||||
var data = (CompanyData)_CurrentobjectData;
|
||||
Log.Info(m_tmpcompanyName.name);
|
||||
if (data.logoPath != null && data.logoPath.Length > 0)
|
||||
{
|
||||
foreach (var canvasGroup in m_arraycanvasGroup)
|
||||
{
|
||||
canvasGroup.alpha = 0;
|
||||
}
|
||||
var sprite = await HttpHandleTool.DownloadSprite(data.logoPath);
|
||||
m_mpimgIcon2.sprite = sprite;
|
||||
m_mpimgIcon1.sprite = sprite;
|
||||
SetAplha(1);
|
||||
//var sprite = await HttpHandleTool.DownloadSprite(data.logoPath);
|
||||
|
||||
var tex = await ImageUtility.UnityWebDownloadTexture2D(data.logoPath, this.gameObject.GetCancellationTokenOnDestroy());
|
||||
//
|
||||
var sprite = Sprite.Create(tex, new Rect(0, 0, tex.width, tex.height), new Vector2(0.5f, 0.5f));
|
||||
m_mpimgIcon2.sprite = sprite;
|
||||
m_mpimgIcon1.sprite = sprite;
|
||||
SetAplha(1);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -89,7 +97,7 @@ namespace GameLogic
|
||||
{
|
||||
foreach (var canvasGroup in m_arraycanvasGroup)
|
||||
{
|
||||
canvasGroup.DOFade(alpha,0.1f);
|
||||
canvasGroup.DOFade(alpha, 0.1f);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -203,7 +203,7 @@ namespace GameLogic
|
||||
for (int i = 0; i < fourTopProjectDataSo.fourTopCompanyName.Count; i++)
|
||||
{
|
||||
TopCompanyConfig cfg = fourTopProjectDataSo.fourTopCompanyName[i];
|
||||
ProjectData projectData = await DataConfigSystem.Instance.GetSingleProjectAllData(cfg.page, cfg.userCode);
|
||||
ProjectData projectData = await DataConfigSystem.Instance.GetSingleProjectData(cfg.page, cfg.userCode);
|
||||
if(projectData == null) continue;
|
||||
// = DataConfigSystem.Instance.GetProjectData(fourTopProjectDataSo.fourTopCompanyName[i]) ;
|
||||
|
||||
@ -238,7 +238,7 @@ namespace GameLogic
|
||||
{
|
||||
var userCode = companyDataList[i].userCode;
|
||||
Log.Debug(userCode);
|
||||
ProjectData projectData = await DataConfigSystem.Instance.GetSingleCompanyAllData("1/14",userCode);
|
||||
ProjectData projectData = await DataConfigSystem.Instance.GetSingleProjectData("1/14",userCode);
|
||||
GameObject arprojectGo = GameModule.Resource.LoadGameObject("UIARCompanyExampleCom");
|
||||
arprojectGo.transform.SetParent(m_scrollCompanyRect.content);
|
||||
arprojectGo.transform.localPosition = Vector3.zero;
|
||||
|
@ -1,6 +1,6 @@
|
||||
|
||||
using System.Text;
|
||||
using Cysharp.Threading.Tasks;
|
||||
using Fantasy;
|
||||
using UnityEngine;
|
||||
using UnityEngine.Networking;
|
||||
|
||||
@ -10,14 +10,50 @@ namespace GameLogic
|
||||
{
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 根据用户代码获取项目数据
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public static async UniTask<string> UnityWebRequestPostJsonByUserCode(string page, string userCode)
|
||||
{
|
||||
Log.Info("UnityWebRequestPostJsonByUserCode");
|
||||
string url = $"https://www.arsnowslide.com/brounche/brochure/project/selAllProjectsOnWxByPage/{page}";
|
||||
//
|
||||
string data = $"{{\"userCode\":\"{userCode}\"}}";
|
||||
var result = await DowlandJsonData(data, url);
|
||||
Log.Info($"Request data: {data}");
|
||||
Log.Info($"Response data: {result}");
|
||||
return result;
|
||||
}
|
||||
|
||||
public static async UniTask<string> UnityWebRequestPostJsonByUserCode(string page, string data)
|
||||
/// <summary>
|
||||
/// 根据公司代码获取项目数据
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public static async UniTask<string> UnityWebRequestPostJsonByCompany(string page, string companyName)
|
||||
{
|
||||
string url = $"https://www.arsnowslide.com/brounche/brochure/project/selAllProjectsOnWxByPage/{page}";
|
||||
string data = $"{{\"companyName\":\"{companyName}\"}}";
|
||||
return await DowlandJsonData(data, url);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 根据用户代码获取公司数据
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public static async UniTask<string> UnityWebRequestPostJsonByInDustry(string page, string industry)
|
||||
{
|
||||
string url = $"https://www.arsnowslide.com/brounche/api/brochureUserDisplay/queryDisplayUserByPage/{page}";
|
||||
string data = $"{{\"industry\":{industry}}}";
|
||||
return await DowlandJsonData(data, url);
|
||||
}
|
||||
|
||||
private static async UniTask<string> DowlandJsonData(string data, string url)
|
||||
{
|
||||
using (UnityWebRequest request = new UnityWebRequest(url, "POST"))
|
||||
{
|
||||
// 手动构建 JSON 字符串
|
||||
string jsonData = data;
|
||||
string jsonData = data;
|
||||
byte[] bodyRaw = Encoding.UTF8.GetBytes(jsonData);
|
||||
request.uploadHandler = new UploadHandlerRaw(bodyRaw);
|
||||
request.downloadHandler = new DownloadHandlerBuffer();
|
||||
@ -36,8 +72,6 @@ namespace GameLogic
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -40,8 +40,8 @@ public partial class GameApp : Singleton<GameApp>
|
||||
/// </summary>
|
||||
private void StartGameLogic()
|
||||
{
|
||||
//LoadGame().Forget();
|
||||
GameModule.UI.ShowUI<UIPetInfoWindow>();
|
||||
LoadGame().Forget();
|
||||
//GameModule.UI.ShowUI<UIPetInfoWindow>();
|
||||
}
|
||||
|
||||
public async UniTask LoadGame()
|
||||
|
@ -36,7 +36,8 @@
|
||||
"GUID:46ee17e5fcc7f436f9df354a1efda6a4",
|
||||
"GUID:77cdc4b9a869f4caa8b2e41e3b794af0",
|
||||
"GUID:f712e8ae9bab041c2a043390d1a751a1",
|
||||
"GUID:1b81d8fc2a073514ba9f462aec7ffb51"
|
||||
"GUID:1b81d8fc2a073514ba9f462aec7ffb51",
|
||||
"GUID:6c99ff64c0c0f1e449657448dcdd2487"
|
||||
],
|
||||
"includePlatforms": [],
|
||||
"excludePlatforms": [],
|
||||
|
@ -33,7 +33,7 @@ namespace GameLogic
|
||||
{
|
||||
await UniTask.Yield();
|
||||
GameModule.UI.CloseUI<UIARPreviewWindow>();
|
||||
await ARBrochureHomeSystem.Instance.CoroShowAllMainUI();
|
||||
await ARBrochureHomeSystem.Instance.ShowAsyncAllMainUI();
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
8
EintooAR/Assets/Plugins/ARFoundationRemoteInstaller.meta
Normal file
8
EintooAR/Assets/Plugins/ARFoundationRemoteInstaller.meta
Normal file
@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 46eb81630db32481d99dc4ef2179cb02
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
@ -7,7 +7,9 @@
|
||||
"VoxelBusters.CoreLibrary.Editor.NativePlugins",
|
||||
"VoxelBusters.EssentialKit",
|
||||
"VoxelBusters.EssentialKit.iOSModule",
|
||||
"VoxelBusters.EssentialKit.Editor"
|
||||
"VoxelBusters.EssentialKit.Editor",
|
||||
"VoxelBusters.CoreLibrary.NativePlugins.iOSModule",
|
||||
"VoxelBusters.EssentialKit.SimulatorModule"
|
||||
],
|
||||
"includePlatforms": [
|
||||
"Editor"
|
||||
|
@ -27,7 +27,13 @@
|
||||
"GUID:66c2eb417c67ad849907d0769db96dbf",
|
||||
"GUID:b47e40ab5d617e24989e362542a01644",
|
||||
"GUID:61a68efbb0c03dc42ad7614dc4858ec4",
|
||||
"GUID:f51ebe6a0ceec4240a699833d6309b23"
|
||||
"GUID:f51ebe6a0ceec4240a699833d6309b23",
|
||||
"GUID:6c99ff64c0c0f1e449657448dcdd2487",
|
||||
"GUID:1b81d8fc2a073514ba9f462aec7ffb51",
|
||||
"GUID:46ee17e5fcc7f436f9df354a1efda6a4",
|
||||
"GUID:77cdc4b9a869f4caa8b2e41e3b794af0",
|
||||
"GUID:f712e8ae9bab041c2a043390d1a751a1",
|
||||
"GUID:bfb3a80268dac420ab25cd26e09e4475"
|
||||
],
|
||||
"includePlatforms": [
|
||||
"Editor"
|
||||
|
@ -1215,7 +1215,7 @@ MonoBehaviour:
|
||||
scrollPos: {x: 0, y: 300}
|
||||
m_SelectedIDs: d21e0100
|
||||
m_LastClickedID: 73426
|
||||
m_ExpandedIDs: 00000000e21d0100e41d0100e61d0100e81d0100ea1d0100ec1d0100ee1d0100f01d0100f21d0100f41d0100f61d0100f81d0100fa1d0100fc1d0100fe1d0100001e0100021e0100041e0100061e0100081e01000a1e01000c1e01000e1e0100101e0100121e0100141e0100161e0100181e01001a1e01001c1e01001e1e0100201e0100221e0100241e0100261e0100281e01002a1e01002c1e01002e1e0100301e0100321e0100341e0100361e0100381e01003a1e01003c1e01003e1e0100401e0100421e0100
|
||||
m_ExpandedIDs: 00000000641e0100661e0100681e01006a1e01006c1e01006e1e0100701e0100721e0100741e0100761e0100781e01007a1e01007c1e01007e1e0100801e0100821e0100841e0100861e0100881e01008a1e01008c1e01008e1e0100901e0100921e0100941e0100961e0100981e01009a1e01009c1e01009e1e0100a01e0100a21e0100a41e0100a61e0100a81e0100aa1e0100ac1e0100ae1e0100b01e0100b21e0100b41e0100b61e0100b81e0100ba1e0100bc1e0100be1e0100c01e0100c21e0100c41e0100
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
@ -1244,7 +1244,7 @@ MonoBehaviour:
|
||||
scrollPos: {x: 0, y: 0}
|
||||
m_SelectedIDs:
|
||||
m_LastClickedID: 0
|
||||
m_ExpandedIDs: 00000000e21d0100e41d0100e61d0100e81d0100ea1d0100ec1d0100ee1d0100f01d0100f21d0100f41d0100f61d0100f81d0100fa1d0100fc1d0100fe1d0100001e0100021e0100041e0100061e0100081e01000a1e01000c1e01000e1e0100101e0100121e0100141e0100161e0100181e01001a1e01001c1e01001e1e0100201e0100221e0100241e0100261e0100281e01002a1e01002c1e01002e1e0100301e0100321e0100341e0100361e0100381e01003a1e01003c1e01003e1e0100401e0100421e0100
|
||||
m_ExpandedIDs: 00000000641e0100661e0100681e01006a1e01006c1e01006e1e0100701e0100721e0100741e0100761e0100781e01007a1e01007c1e01007e1e0100801e0100821e0100841e0100861e0100881e01008a1e01008c1e01008e1e0100901e0100921e0100941e0100961e0100981e01009a1e01009c1e01009e1e0100a01e0100a21e0100a41e0100a61e0100a81e0100aa1e0100ac1e0100ae1e0100b01e0100b21e0100b41e0100b61e0100b81e0100ba1e0100bc1e0100be1e0100c01e0100c21e0100c41e0100
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
@ -1368,7 +1368,7 @@ MonoBehaviour:
|
||||
scrollPos: {x: 0, y: 175}
|
||||
m_SelectedIDs: 281e0100
|
||||
m_LastClickedID: 73256
|
||||
m_ExpandedIDs: 00000000e21d0100e41d0100e61d0100e81d0100ea1d0100ec1d0100ee1d0100f01d0100f21d0100f41d0100f61d0100f81d0100fa1d0100fc1d0100fe1d0100001e0100021e0100041e0100061e0100081e01000a1e01000c1e01000e1e0100101e0100121e0100141e0100161e0100181e01001a1e01001c1e01001e1e0100201e0100221e0100241e0100261e0100281e01002a1e01002c1e01002e1e0100301e0100321e0100341e0100361e0100381e01003a1e01003c1e01003e1e0100401e0100421e0100
|
||||
m_ExpandedIDs: 00000000641e0100661e0100681e01006a1e01006c1e01006e1e0100701e0100721e0100741e0100761e0100781e01007a1e01007c1e01007e1e0100801e0100821e0100841e0100861e0100881e01008a1e01008c1e01008e1e0100901e0100921e0100941e0100961e0100981e01009a1e01009c1e01009e1e0100a01e0100a21e0100a41e0100a61e0100a81e0100aa1e0100ac1e0100ae1e0100b01e0100b21e0100b41e0100b61e0100b81e0100ba1e0100bc1e0100be1e0100c01e0100c21e0100c41e0100
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
@ -1397,7 +1397,7 @@ MonoBehaviour:
|
||||
scrollPos: {x: 0, y: 0}
|
||||
m_SelectedIDs:
|
||||
m_LastClickedID: 0
|
||||
m_ExpandedIDs: 00000000e21d0100e41d0100e61d0100e81d0100ea1d0100ec1d0100ee1d0100f01d0100f21d0100f41d0100f61d0100f81d0100fa1d0100fc1d0100fe1d0100001e0100021e0100041e0100061e0100081e01000a1e01000c1e01000e1e0100101e0100121e0100141e0100161e0100181e01001a1e01001c1e01001e1e0100201e0100221e0100241e0100261e0100281e01002a1e01002c1e01002e1e0100301e0100321e0100341e0100361e0100381e01003a1e01003c1e01003e1e0100401e0100421e0100
|
||||
m_ExpandedIDs: 00000000641e0100661e0100681e01006a1e01006c1e01006e1e0100701e0100721e0100741e0100761e0100781e01007a1e01007c1e01007e1e0100801e0100821e0100841e0100861e0100881e01008a1e01008c1e01008e1e0100901e0100921e0100941e0100961e0100981e01009a1e01009c1e01009e1e0100a01e0100a21e0100a41e0100a61e0100a81e0100aa1e0100ac1e0100ae1e0100b01e0100b21e0100b41e0100b61e0100b81e0100ba1e0100bc1e0100be1e0100c01e0100c21e0100c41e0100
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
|
Loading…
x
Reference in New Issue
Block a user