Commit 3972abab authored by 潘梓豪's avatar 潘梓豪

修改配置、下载、详情功能 区分VR PC版本

parent 8aff7879
fileFormatVersion: 2
guid: 4d5b1535ee5b5974d81860ad5c93faaf
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
using System.Collections;
using System.Collections.Generic;
using TMPro;
using UnityEngine;
public class NormalText : MonoBehaviour
{
// Start is called before the first frame update
public TMP_Text msg;
void Start()
{
}
// Update is called once per frame
void Update()
{
}
}
fileFormatVersion: 2
guid: 2cc43c996c68bc0438de94e89e3dc31d
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
......@@ -57,10 +57,18 @@ public class ZeusHub_Manager : MonoBehaviour
public TMP_InputField tanchuang_inputField;
public string _RobotCode;
public GameObject detailPage;
public GameObject normalPage;
IEnumerator Start()
{
manager = this;
_RobotCode = RobotCode.getMNum();
if (PlayerPrefs.HasKey("name"))
{
//有的话,获取name的值
......
using LitJson;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Text;
......@@ -23,6 +24,8 @@ public class ProductioRowData : MonoBehaviour
public Button[] page_btn;
private int kind;
// Start is called before the first frame update
void Start()
{
......@@ -88,23 +91,58 @@ public class ProductioRowData : MonoBehaviour
production.id = item["production_id"].ToString();
production.appname = item["app_name"] != null ? item["app_name"].ToString() : "";
production.url = item["production_download_url"] != null ? item["production_download_url"].ToString() : "";
if (item["field_kind_target_id"]!=null && item["field_kind_target_id"].ToString()=="1")
{
production.kind[1].SetActive(true);
production.kind[0].SetActive(false);
}
else
{
production.kind[0].SetActive(true);
production.kind[1].SetActive(false);
}
production.manager = manager;
production.OnReceiveMsg = OnReceiveMsg;
production.OnReceiveMsg.AddListener(production._onReceiveMsg);
production.downloadUntily = new DownloadUntily();
production.aliyunOSSDownLoad = new AliyunOSS.AliyunOSSDownLoad();
bool ishas = false;
if (production.url.IndexOf("https://") >= 0 || production.url.IndexOf("http://") >= 0)
{
string downloadingUrl = Uri.UnescapeDataString(production.url);
ishas = AliyunOSS.AliyunOSSDownLoad.isFileExeit("D://DownloadDemo/" + downloadingUrl.Substring(downloadingUrl.LastIndexOf("/") + 1));
}
if (type == 1)
{
production.set_btn(true);
if (ishas)
{
production.btn[0].SetActive(false);
production.btn[1].SetActive(true);
}
else
{
production.btn[0].SetActive(true);
production.btn[1].SetActive(false);
}
production.btn[2].SetActive(false);
}
else if(type==2)
{
production.set_btn(false);
production.btn[0].SetActive(false);
production.btn[1].SetActive(false);
production.btn[2].SetActive(true);
}
if (item.ContainsKey("logo") && item["logo"] != null && !string.IsNullOrEmpty(item["logo"].ToString()))
{
StartCoroutine(getImage(jd["oss_url"].ToString() + "/" + item["logo"].ToString(), newObj.GetComponent<Production>().rawImage));
StartCoroutine(getImage(item["logo"].ToString(), production.rawImage));
}
newObj.transform.localScale = new Vector3(1, 1, 1);
//ScrollRect sc = scrollrect_.GetComponent<ScrollRect>();
......@@ -121,6 +159,7 @@ public class ProductioRowData : MonoBehaviour
}
public IEnumerator getImage(string imageUrl,RawImage rawImage)
{
using (var rq = UnityWebRequestTexture.GetTexture(imageUrl))
{
yield return rq.SendWebRequest();
......@@ -135,17 +174,64 @@ public class ProductioRowData : MonoBehaviour
public void getall_list()
{
string json_data = "{\"limit\":10,\"page\":0}";
kind = 1;
StartCoroutine(getlist("/zeus/zeushub/getProductionView", json_data,2));
}
public void getuser_list()
{
string json_data = "{\"limit\":10,\"page\":0,\"computer_code\":\"" + RobotCode.getMNum() + "\"}";
kind = 2;
StartCoroutine(getlist("/zeus/zeushub/getProductionList", json_data,1));
}
public void getallkind_list()
{
if (kind == 1)
{
string json_data = "{\"limit\":10,\"page\":0}";
StartCoroutine(getlist("/zeus/zeushub/getProductionView", json_data, 2));
}
else if (kind == 2)
{
string json_data = "{\"limit\":10,\"page\":0,\"computer_code\":\"" + RobotCode.getMNum() + "\"}";
StartCoroutine(getlist("/zeus/zeushub/getProductionList", json_data, 1));
}
}
public void getvr_list()
{
if (kind==1)
{
string json_data = "{\"limit\":10,\"page\":0,\"kind\":2}";
StartCoroutine(getlist("/zeus/zeushub/getProductionView", json_data, 2));
}
else if (kind==2)
{
string json_data = "{\"limit\":10,\"page\":0,\"computer_code\":\"" + RobotCode.getMNum() + "\",\"kind\":2}";
StartCoroutine(getlist("/zeus/zeushub/getProductionList", json_data, 1));
}
}
public void getpc_list()
{
if (kind == 1)
{
string json_data = "{\"limit\":10,\"page\":0,\"kind\":1}";
StartCoroutine(getlist("/zeus/zeushub/getProductionView", json_data, 2));
}
else if (kind == 2)
{
string json_data = "{\"limit\":10,\"page\":0,\"computer_code\":\"" + RobotCode.getMNum() + "\",\"kind\":1}";
StartCoroutine(getlist("/zeus/zeushub/getProductionList", json_data, 1));
}
}
void del()
......
......@@ -16,7 +16,9 @@ public class Production : MonoBehaviour
public RawImage rawImage;
public Button[] button;
public GameObject[] btn;
public GameObject[] kind;
public WelBorews welBorews;
......@@ -49,6 +51,8 @@ public class Production : MonoBehaviour
public UpdateUIText updateUIText;
private bool is_save_robotcode = false;
public void Start()
{
updateUIText = new UpdateUIText(UpdateText);
......@@ -58,6 +62,12 @@ public class Production : MonoBehaviour
void LateUpdate()
{
StartCoroutine(update_progress());
if (is_save_robotcode)
{
is_save_robotcode = false;
setRpbotCode();
// manager.tishi.text = "已下载到路径" + d[id]["url"];
}
}
public IEnumerator update_progress()
......@@ -69,6 +79,8 @@ public class Production : MonoBehaviour
{
fill_data = 0;
progress_side.SetActive(false);
btn[0].SetActive(false);
btn[1].SetActive(true);
}
}
else
......@@ -107,6 +119,7 @@ public class Production : MonoBehaviour
{
//StartCoroutine(aliyunOSSDownLoad.DownLoad(url, id, appname, this));
aliyunOSSDownLoad.DownLoad(url, id, appname, this);
btn[0].GetComponentInChildren<Button>().gameObject.SetActive(false);
}
}
......@@ -127,8 +140,6 @@ public class Production : MonoBehaviour
{
if (jd["id"].ToString().Equals(id))
{
Debug.Log(jd["id"]);
Debug.Log(jd["jiedi"]);
float present = float.Parse(jd["jiedi"].ToString());
preset_image.fillAmount = present;
if (present == 1f)
......@@ -139,6 +150,7 @@ public class Production : MonoBehaviour
}
}else if (parameter.Equals("savepath"))
{
Debug.Log(parameter);
if (jd.ContainsKey("productionid") && jd["productionid"].Equals(id))
{
//JsonData jd = manager.P_Setting;
......@@ -151,19 +163,23 @@ public class Production : MonoBehaviour
d[id] = val;
ProductionSetting.setData(JsonMapper.ToJson(d));
}
manager.tishi.text = "已下载到路径" + d[id]["url"];
is_save_robotcode = true;
/* Debug.Log(manager._RobotCode);
val = new JsonData();
val["productionid"] = jd["productionid"];
val["code"] = new JsonData();
val["code"].Add(0);
val["code"][0] = jd["code"];
val["code"][0] = manager._RobotCode;
//保存注册机码
StartCoroutine(request_post(Setting.IP + "/zeus/zeushub/saveRobotCode", JsonMapper.ToJson(val), 2));
Debug.Log("数据已保存到服务器");*/
}
}else if (parameter.Equals("msg"))
{
manager.normalPage.SetActive(true);
manager.normalPage.GetComponent<NormalText>().msg.text= jd["msg"].ToString();
Debug.Log(jd["msg"]);
}
}
......@@ -175,7 +191,7 @@ public class Production : MonoBehaviour
val["productionid"] = id;
val["code"] = new JsonData();
val["code"].Add(0);
val["code"][0] = RobotCode.getMNum();
val["code"][0] =manager._RobotCode;
Debug.Log(JsonMapper.ToJson(val));
//保存注册机码
StartCoroutine(request_post(Setting.IP + "/zeus/zeushub/saveRobotCode", JsonMapper.ToJson(val), 3));
......@@ -253,9 +269,17 @@ public class Production : MonoBehaviour
fill_data = progress;
}
public void getDetail()
{
manager.detailPage.SetActive(true);
manager.detailPage.GetComponent<ProductionDetail>().manager = manager;
manager.detailPage.GetComponent<ProductionDetail>().id = id;
manager.detailPage.GetComponent<ProductionDetail>().getDetail();
}
public void set_btn(bool flag)
{
foreach(Button item in button)
foreach(GameObject item in btn)
{
item.gameObject.SetActive(flag);
}
......
using LitJson;
using System.Collections;
using System.Collections.Generic;
using System.Text;
using TMPro;
using UnityEngine;
using UnityEngine.Networking;
using UnityEngine.UI;
public class ProductionDetail : MonoBehaviour
{
// Start is called before the first frame update
public TMP_Text[] tMP_Texts;
public RawImage rawImage;
public string id;
public ZeusHub_Manager manager;
public GameObject[] kind;
void Start()
{
}
public void getDetail()
{
StartCoroutine(getnode());
}
public IEnumerator getnode()
{
var rq = UnityWebRequest.Get(Setting.IP + "/node/"+id+ "?_format=json");
if (manager.token != null)
{
rq.SetRequestHeader("Authorization", manager.token);
}
rq.SetRequestHeader("Content-Type", "application/json;charset=utf-8");
yield return rq.SendWebRequest();
if (string.IsNullOrEmpty(rq.error))
{
JsonData jd = JsonMapper.ToObject<JsonData>(rq.downloadHandler.text);
setData(jd);
}
yield return null;
}
void setData(JsonData jd)
{
tMP_Texts[0].text = jd["title"][0]["value"].ToString();
tMP_Texts[1].text = jd["field_information"].Count > 0 ? jd["field_information"][0]["value"].ToString() : "";
if (jd["field_kind"][0]["target_id"].ToString()=="1")
{
kind[1].SetActive(true);
kind[0].SetActive(false);
}
else
{
kind[1].SetActive(false);
kind[0].SetActive(true);
}
StartCoroutine(getImage(jd["field_logo"][0]["value"].ToString(), rawImage));
}
public IEnumerator getImage(string imageUrl, RawImage rawImage)
{
using (var rq = UnityWebRequestTexture.GetTexture(imageUrl))
{
yield return rq.SendWebRequest();
if (string.IsNullOrEmpty(rq.error))
{
Texture2D texture = DownloadHandlerTexture.GetContent(rq);
rawImage.texture = texture;
}
}
}
}
fileFormatVersion: 2
guid: 1ba404ede75f1104997733d0076f0bc2
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
......@@ -65,6 +65,9 @@ namespace AliyunOSS
{
isdown = true;
Thread thread = null;
UpdateUIText updateUIText = new UpdateUIText(UpdateText);
thread = new Thread(()=>{
try
{
......@@ -73,7 +76,7 @@ namespace AliyunOSS
var getObjectRequest = new GetObjectRequest(Setting.bucketName, fullFilePath);
UpdateUIText updateUIText = new UpdateUIText(UpdateText);
//下载进度
getObjectRequest.StreamTransferProgress += (obg, args) =>
......@@ -124,16 +127,15 @@ namespace AliyunOSS
//删除文件
File.Delete(downloadFilename);
//string json = "{\"code\":\"" + RobotCode.getMNum() + "\",\"productionid\":\"" + id + "\"}";
js_data = new JsonData();
js_data["apppath"] = "D://DownloadDemo/" + downloadFilename.Substring(downloadFilename.LastIndexOf("/") + 1, downloadFilename.LastIndexOf(".") - (downloadFilename.Substring(0, downloadFilename.LastIndexOf("/") + 1).Length)) + "/" + appname;
js_data["productionid"] = id;
js_data["code"] = RobotCode.getMNum();
//js_data["code"] = RobotCode.getMNum();
//保存
//production.OnReceiveMsg.Invoke(js_data, "savepath");
updateUIText.BeginInvoke(production,js_data, null, null);
isdown = false;
......@@ -142,11 +144,11 @@ namespace AliyunOSS
}
catch (OssException e)
{
Console.WriteLine("下载错误:" + e);
Debug.Log("下载错误:" + e);
}
catch (Exception e)
{
Console.WriteLine("下载错误:" + e);
Debug.Log("下载错误:" + e);
}
finally
{
......@@ -159,7 +161,8 @@ namespace AliyunOSS
// 定义一个函数,用于在UI线程中更新UI元素
void UpdateText(Production production,JsonData js_data)
{
production.OnReceiveMsg.Invoke(js_data, "sendProcess");
Debug.Log("执行委托");
production.OnReceiveMsg.Invoke(js_data, "savepath");
}
/// <summary>
......@@ -216,5 +219,11 @@ namespace AliyunOSS
}
return result;
}
}
public static bool isFileExeit(string downloadFilename)
{
Debug.Log(downloadFilename);
return Directory.Exists("D://DownloadDemo/" + downloadFilename.Substring(downloadFilename.LastIndexOf("/") + 1, downloadFilename.LastIndexOf(".") - (downloadFilename.Substring(0, downloadFilename.LastIndexOf("/") + 1).Length)) + "/");
}
}
}
This diff is collapsed.
......@@ -250,8 +250,8 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 2100911542012993372}
- {fileID: 7839643637731480554}
- {fileID: 2100911542919944819}
- {fileID: 7839643637731480554}
m_Father: {fileID: 2100911543338991448}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -290,7 +290,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2100911542816052912}
m_RootOrder: 2
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
......@@ -698,7 +698,7 @@ PrefabInstance:
- target: {fileID: 8208916088210402484, guid: 89cf152700f18884d9701f8b525fadb6,
type: 3}
propertyPath: m_RootOrder
value: 1
value: 2
objectReference: {fileID: 0}
- target: {fileID: 8208916088210402484, guid: 89cf152700f18884d9701f8b525fadb6,
type: 3}
......@@ -795,6 +795,36 @@ PrefabInstance:
propertyPath: m_Name
value: "btn-\u5173\u95ED"
objectReference: {fileID: 0}
- target: {fileID: 8208916088210402491, guid: 89cf152700f18884d9701f8b525fadb6,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8208916088210402491, guid: 89cf152700f18884d9701f8b525fadb6,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 6
objectReference: {fileID: 0}
- target: {fileID: 8208916088210402491, guid: 89cf152700f18884d9701f8b525fadb6,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 2100911543338991431}
- target: {fileID: 8208916088210402491, guid: 89cf152700f18884d9701f8b525fadb6,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 8208916088210402491, guid: 89cf152700f18884d9701f8b525fadb6,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: SetActive
objectReference: {fileID: 0}
- target: {fileID: 8208916088210402491, guid: 89cf152700f18884d9701f8b525fadb6,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 89cf152700f18884d9701f8b525fadb6, type: 3}
--- !u!224 &7839643637731480554 stripped
......
......@@ -425,6 +425,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 3886409905653077736}
- component: {fileID: 770553155364283192}
m_Layer: 5
m_Name: "\u5F39\u7A97-\u901A\u7528\u63D0\u793A\u6846-S"
m_TagString: Untagged
......@@ -456,6 +457,19 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 380, y: 200}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &770553155364283192
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3886409905653077751}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2cc43c996c68bc0438de94e89e3dc31d, type: 3}
m_Name:
m_EditorClassIdentifier:
msg: {fileID: 3229962421490710054}
--- !u!1 &3886409906016516243
GameObject:
m_ObjectHideFlags: 0
......@@ -856,6 +870,36 @@ PrefabInstance:
propertyPath: m_Name
value: "btn-\u5173\u95ED"
objectReference: {fileID: 0}
- target: {fileID: 8208916088210402491, guid: 89cf152700f18884d9701f8b525fadb6,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8208916088210402491, guid: 89cf152700f18884d9701f8b525fadb6,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 6
objectReference: {fileID: 0}
- target: {fileID: 8208916088210402491, guid: 89cf152700f18884d9701f8b525fadb6,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 3886409905653077751}
- target: {fileID: 8208916088210402491, guid: 89cf152700f18884d9701f8b525fadb6,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 8208916088210402491, guid: 89cf152700f18884d9701f8b525fadb6,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: SetActive
objectReference: {fileID: 0}
- target: {fileID: 8208916088210402491, guid: 89cf152700f18884d9701f8b525fadb6,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 89cf152700f18884d9701f8b525fadb6, type: 3}
--- !u!224 &4901218796227590746 stripped
......@@ -876,6 +920,36 @@ PrefabInstance:
propertyPath: m_Name
value: "btn-\u786E\u5B9A"
objectReference: {fileID: 0}
- target: {fileID: 7508560583783217274, guid: a4bccfd75c779c34ba1efe2fcd87d40c,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7508560583783217274, guid: a4bccfd75c779c34ba1efe2fcd87d40c,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 6
objectReference: {fileID: 0}
- target: {fileID: 7508560583783217274, guid: a4bccfd75c779c34ba1efe2fcd87d40c,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 3886409905653077751}
- target: {fileID: 7508560583783217274, guid: a4bccfd75c779c34ba1efe2fcd87d40c,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 7508560583783217274, guid: a4bccfd75c779c34ba1efe2fcd87d40c,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: SetActive
objectReference: {fileID: 0}
- target: {fileID: 7508560583783217274, guid: a4bccfd75c779c34ba1efe2fcd87d40c,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 7508560583783217275, guid: a4bccfd75c779c34ba1efe2fcd87d40c,
type: 3}
propertyPath: m_Pivot.x
......
......@@ -1331,6 +1331,36 @@ PrefabInstance:
propertyPath: m_Name
value: "btn-\u53D6\u6D88"
objectReference: {fileID: 0}
- target: {fileID: 7508560583783217274, guid: a4bccfd75c779c34ba1efe2fcd87d40c,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7508560583783217274, guid: a4bccfd75c779c34ba1efe2fcd87d40c,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 6
objectReference: {fileID: 0}
- target: {fileID: 7508560583783217274, guid: a4bccfd75c779c34ba1efe2fcd87d40c,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 7211001695590905055}
- target: {fileID: 7508560583783217274, guid: a4bccfd75c779c34ba1efe2fcd87d40c,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 7508560583783217274, guid: a4bccfd75c779c34ba1efe2fcd87d40c,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: SetActive
objectReference: {fileID: 0}
- target: {fileID: 7508560583783217274, guid: a4bccfd75c779c34ba1efe2fcd87d40c,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 7508560583783217275, guid: a4bccfd75c779c34ba1efe2fcd87d40c,
type: 3}
propertyPath: m_Pivot.x
......@@ -1686,6 +1716,36 @@ PrefabInstance:
propertyPath: m_Name
value: "btn-\u5173\u95ED"
objectReference: {fileID: 0}
- target: {fileID: 8208916088210402491, guid: 89cf152700f18884d9701f8b525fadb6,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8208916088210402491, guid: 89cf152700f18884d9701f8b525fadb6,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 6
objectReference: {fileID: 0}
- target: {fileID: 8208916088210402491, guid: 89cf152700f18884d9701f8b525fadb6,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 7211001695590905055}
- target: {fileID: 8208916088210402491, guid: 89cf152700f18884d9701f8b525fadb6,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 8208916088210402491, guid: 89cf152700f18884d9701f8b525fadb6,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: SetActive
objectReference: {fileID: 0}
- target: {fileID: 8208916088210402491, guid: 89cf152700f18884d9701f8b525fadb6,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 89cf152700f18884d9701f8b525fadb6, type: 3}
--- !u!224 &1583422530603014258 stripped
......
......@@ -2835,6 +2835,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 7644255298738451297}
- component: {fileID: 5856538793683598320}
m_Layer: 5
m_Name: "\u8BE6\u60C5\u9875"
m_TagString: Untagged
......@@ -2863,6 +2864,27 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &5856538793683598320
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7644255298738451298}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1ba404ede75f1104997733d0076f0bc2, type: 3}
m_Name:
m_EditorClassIdentifier:
tMP_Texts:
- {fileID: 7644255297644655841}
- {fileID: 7644255297590100471}
rawImage: {fileID: 5615149980882347320}
id:
manager: {fileID: 0}
kind:
- {fileID: 7907546821018503419}
- {fileID: 7760487974975504745}
--- !u!1 &7644255298742209952
GameObject:
m_ObjectHideFlags: 0
......@@ -3021,7 +3043,7 @@ GameObject:
m_Component:
- component: {fileID: 7644255298786540301}
- component: {fileID: 7644255298786540291}
- component: {fileID: 7644255298786540300}
- component: {fileID: 5615149980882347320}
m_Layer: 5
m_Name: "image-\u9884\u89C8\u56FE"
m_TagString: Untagged
......@@ -3056,7 +3078,7 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7644255298786540302}
m_CullTransparentMesh: 0
--- !u!114 &7644255298786540300
--- !u!114 &5615149980882347320
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
......@@ -3065,7 +3087,7 @@ MonoBehaviour:
m_GameObject: {fileID: 7644255298786540302}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
......@@ -3075,16 +3097,13 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 98b560a94b8b0bd4db0cdc6717803e04, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
m_Texture: {fileID: 0}
m_UVRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
--- !u!1 &8670332126002035066
GameObject:
m_ObjectHideFlags: 0
......@@ -3460,6 +3479,12 @@ RectTransform:
type: 3}
m_PrefabInstance: {fileID: 838195788311086220}
m_PrefabAsset: {fileID: 0}
--- !u!1 &7760487974975504745 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 6922899122669864421, guid: 577749bc420421d4cacc987c12858416,
type: 3}
m_PrefabInstance: {fileID: 838195788311086220}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &7644255297350997016
PrefabInstance:
m_ObjectHideFlags: 0
......@@ -3855,18 +3880,18 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 129be6bfe6954504192db0cf4acc2612, type: 3}
--- !u!224 &5336029941294224457 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 2312804313321783102, guid: 129be6bfe6954504192db0cf4acc2612,
type: 3}
m_PrefabInstance: {fileID: 7644255297354722167}
m_PrefabAsset: {fileID: 0}
--- !u!1 &5336029940114041985 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2312804312077649910, guid: 129be6bfe6954504192db0cf4acc2612,
type: 3}
m_PrefabInstance: {fileID: 7644255297354722167}
m_PrefabAsset: {fileID: 0}
--- !u!224 &5336029941294224457 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 2312804313321783102, guid: 129be6bfe6954504192db0cf4acc2612,
type: 3}
m_PrefabInstance: {fileID: 7644255297354722167}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &7644255298843920382
PrefabInstance:
m_ObjectHideFlags: 0
......@@ -3984,6 +4009,36 @@ PrefabInstance:
propertyPath: m_Name
value: "btn-\u5173\u95ED"
objectReference: {fileID: 0}
- target: {fileID: 8208916088210402491, guid: 89cf152700f18884d9701f8b525fadb6,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8208916088210402491, guid: 89cf152700f18884d9701f8b525fadb6,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 6
objectReference: {fileID: 0}
- target: {fileID: 8208916088210402491, guid: 89cf152700f18884d9701f8b525fadb6,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 7644255298738451298}
- target: {fileID: 8208916088210402491, guid: 89cf152700f18884d9701f8b525fadb6,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 8208916088210402491, guid: 89cf152700f18884d9701f8b525fadb6,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: SetActive
objectReference: {fileID: 0}
- target: {fileID: 8208916088210402491, guid: 89cf152700f18884d9701f8b525fadb6,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 89cf152700f18884d9701f8b525fadb6, type: 3}
--- !u!224 &2017106866290060106 stripped
......@@ -4122,6 +4177,12 @@ RectTransform:
type: 3}
m_PrefabInstance: {fileID: 7845488935484274931}
m_PrefabAsset: {fileID: 0}
--- !u!1 &7907546821018503419 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 98509020656037896, guid: 72bb1c72eb8ac6240951c9da9996c40f,
type: 3}
m_PrefabInstance: {fileID: 7845488935484274931}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &8594289138161304183
PrefabInstance:
m_ObjectHideFlags: 0
......
This diff is collapsed.
fileFormatVersion: 2
guid: 179d30774b871b243b216cc702e1eed2
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
......@@ -7193,3 +7193,27 @@
2023/4/10 14:04:19 api:http://8.134.114.12:11011/oauth/token Cannot connect to destination host
2023/5/4 8:33:07 api:http://8.134.114.12:11011/oauth/token Cannot connect to destination host
2023/5/5 15:13:40 api:http://8.134.114.12:11011/oauth/token HTTP/1.1 401 Unauthorized
2023/5/6 10:37:53 api:http://8.134.114.12:11011/oauth/token HTTP/1.1 502 Bad Gateway
2023/5/6 10:38:29 api:http://8.134.114.12:11011/oauth/token HTTP/1.1 502 Bad Gateway
2023/5/6 10:38:42 api:http://8.134.114.12:11011/oauth/token HTTP/1.1 502 Bad Gateway
2023/5/6 10:47:35 api:http://8.134.114.12:11011/oauth/token HTTP/1.1 502 Bad Gateway
2023/5/6 10:47:46 api:http://8.134.114.12:11011/oauth/token HTTP/1.1 502 Bad Gateway
2023/5/6 10:49:46 api:http://8.134.114.12:11011/oauth/token HTTP/1.1 502 Bad Gateway
2023/5/6 10:49:53 api:http://8.134.114.12:11011/oauth/token HTTP/1.1 502 Bad Gateway
2023/5/6 10:53:45 api:http://8.134.114.12:11011/oauth/token HTTP/1.1 502 Bad Gateway
2023/5/6 10:53:54 api:http://8.134.114.12:11011/oauth/token HTTP/1.1 502 Bad Gateway
2023/5/6 10:54:03 api:http://8.134.114.12:11011/oauth/token HTTP/1.1 502 Bad Gateway
2023/5/6 10:54:14 api:http://8.134.114.12:11011/oauth/token HTTP/1.1 502 Bad Gateway
2023/5/6 10:54:22 api:http://8.134.114.12:11011/oauth/token HTTP/1.1 502 Bad Gateway
2023/5/6 10:54:30 api:http://8.134.114.12:11011/oauth/token HTTP/1.1 502 Bad Gateway
2023/5/6 10:54:39 api:http://8.134.114.12:11011/oauth/token HTTP/1.1 502 Bad Gateway
2023/5/6 10:54:49 api:http://8.134.114.12:11011/oauth/token HTTP/1.1 502 Bad Gateway
2023/5/6 10:54:54 api:http://8.134.114.12:11011/oauth/token HTTP/1.1 502 Bad Gateway
2023/5/6 10:55:36 api:http://8.134.114.12:11011/oauth/token HTTP/1.1 502 Bad Gateway
2023/5/6 10:55:52 api:http://8.134.114.12:11011/oauth/token HTTP/1.1 502 Bad Gateway
2023/5/6 10:56:02 api:http://8.134.114.12:11011/oauth/token HTTP/1.1 502 Bad Gateway
2023/5/6 11:04:54 api:http://8.134.114.12:11011/oauth/token HTTP/1.1 502 Bad Gateway
2023/5/6 11:05:25 api:http://8.134.114.12:11011/oauth/token HTTP/1.1 502 Bad Gateway
2023/5/6 11:05:40 api:http://8.134.114.12:11011/oauth/token HTTP/1.1 502 Bad Gateway
2023/5/6 11:07:21 api:http://8.134.114.12:11011/oauth/token HTTP/1.1 502 Bad Gateway
2023/5/6 16:56:58 api:http://8.134.114.12:11011/oauth/token HTTP/1.1 502 Bad Gateway
{"token":"Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsImp0aSI6IjQ4ZWJiOGM3MjU1ZjhmNGE4ZDBmYTNjNTM2NTU1MzM3MzYzZjFiYzA0ZDY4NmIwNDRjZjQ0MTZmYzIxNGZkNjVmZmY1N2ZiYmUyMTZhYjFkIn0.eyJhdWQiOiIyYmM1ZjE1Zi0wNzE3LTQ4ZjktYTc4Mi03NzQ5M2FjNDUwODQiLCJqdGkiOiI0OGViYjhjNzI1NWY4ZjRhOGQwZmEzYzUzNjU1NTMzNzM2M2YxYmMwNGQ2ODZiMDQ0Y2Y0NDE2ZmMyMTRmZDY1ZmZmNTdmYmJlMjE2YWIxZCIsImlhdCI6MTY4MTExMjE4NywibmJmIjoxNjgxMTEyMTg3LCJleHAiOjE2ODE0MTIxODcsInN1YiI6IjkwNCIsInNjb3BlcyI6WyJhdXRoZW50aWNhdGVkIiwiZW50ZXJwcmlzZSIsIndlYm1hc3RlciJdfQ.aHkQbzwOh3tpM_dDiCa8of01UU5BEDNTTydix62wQdchrz7eGU-V69N5Qs9b0ybZEI1gli6oBRtOAV7Dt4E4pzQc61jaIfNW-nTfRu3Do6ms1R6zqU2V81WD44qpRo0dB0PAIet52u8qW8Xsab3N76Yfdzvpdz4RKuMlkKHweFbfmx7QpbmYf5rgcEk27cv87VtlPulM1xnhalRXb2us6Z8sR42X5Qld5LBYsweC03yctnPgtXGfgZ3jDz5xH-8Zy2Rf0XIskmMJt7CA4QWsXmduKnHmhKk8R4ixBIFW02fRNKTjeYXK7vypp_EspMSZcBIY4uN2WYjjyCcGcVEPbhJ_l6hfWEU4tfN9ikEe-XxEzjimH_163045RaNKbUtBrBU9grtWlLfhxL8OmcE12UtOpS3Jd2T_udg63t9sfpekK7Ca1_p1zISfHDwKtys-MVA0ZskVGhZIUKSqxWJmpsEZNCHVw6vXmfG3OHxMlEM6QS60uHplV26BWg_Ozyi_xtE3iX8vkmDvVbJfIxMNwiY3kqH0YQRE-TPJt14gku0boZ1IEOS2CBbh6zTKEflLyRFJ8R14YOLpAhJ-9y4ZFKx3GbWC66irw0osuS_Uaic3M1MC_jize0aMorOi6gPST_LZ8vT_EBBRcWqGkMwAYF4FMZF0xzFrMeLkhaZ9fgI","productionid":"12890","filepath":"D://DownloadDemo/新盛世HUB/Zsnewcentury.exe"}
\ No newline at end of file
{"token":"Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsImp0aSI6IjAzZjUzNDNmN2U5NWRmMjYyZGQ2NTJiOTUwZTM4YTUwNzQwZDBjM2Y2MWI2OTU3MTZmZTQ2NjA2MTVlZjJiYzVhYjgzZjRmMGFiMWU4YWM1In0.eyJhdWQiOiIyYmM1ZjE1Zi0wNzE3LTQ4ZjktYTc4Mi03NzQ5M2FjNDUwODQiLCJqdGkiOiIwM2Y1MzQzZjdlOTVkZjI2MmRkNjUyYjk1MGUzOGE1MDc0MGQwYzNmNjFiNjk1NzE2ZmU0NjYwNjE1ZWYyYmM1YWI4M2Y0ZjBhYjFlOGFjNSIsImlhdCI6MTY4MzM2MzY4NCwibmJmIjoxNjgzMzYzNjg0LCJleHAiOjE2ODM2NjM2ODQsInN1YiI6IjkwMSIsInNjb3BlcyI6WyJhdXRoZW50aWNhdGVkIiwiZW50ZXJwcmlzZSIsIndlYm1hc3RlciJdfQ.lMSJ309oPU3SHGem4DEEFjeQsCizAevbpWXmlTH_M-AVugKxqLHGG0xwmHDZ9uvPYLOuhIDLCkCjmo2cF3AhK9Cwj_AKBFAbIs0APcST6xUBGQyjLykz8ddd49NXxe5ti4QHxO-ZJY3G5FOPWMP4LjtY0eOTsgw12slqMN1TM60Yr3snxtS6AF0n7kTDAq8ehkZx6zm36A1cr_pUAuMlmQisydUEz_1IIy9podNaPwJT1EOd5LVuzdh_pbo5_2VU-9y2EAR7AzCmxNUuVaxAYbLR349Q9llYUSeQxZTKquWRAoR6bMD4Rq2op28D5AkE7NFQfPvbgSKTD-N6vwekN7yHuoYTrXx1MQRngH84JvcmaWADoP3zpHOUZKF4aw0TOi91qQFM334MNYWlw1WBs3oNf68GDCEWCQ-i1bEm9tR7USJ-mI5uKld4aB1kS8UZi-MyY4wVzQSJxZAzJqKt4ttanY8SXvOWYnfcFQjI5u4YGj39X9L-rlqG_TkZ84juIqx2z1A9bVlL8l583_pQ1dXBnLW-IV18ZayN7CUa0i30kOo2xYdIt23QpjOAafx6bsIpTlSZt5hS2p6xlNPyX4-hW8WD_l-u_AWWBnkMHBAkrwzye_p6lMQJfEVO8C542PlyhwqlQZahZz81uU1V1ax6Frlx9CvLnufp8ZRgQcI","productionid":"12890","filepath":"D://DownloadDemo/新盛世HUB/Zsnewcentury.exe"}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment