Commit 7bfd162a authored by 潘梓豪's avatar 潘梓豪

修改部分汇总问题

parent adf5c5d9
...@@ -36,6 +36,8 @@ public class DloadMission : Production ...@@ -36,6 +36,8 @@ public class DloadMission : Production
private Coroutine myCoroutine; private Coroutine myCoroutine;
private bool isflush;
void Start() void Start()
{ {
updateUIText = new UpdateUIText(UpdateText); updateUIText = new UpdateUIText(UpdateText);
...@@ -51,27 +53,28 @@ public class DloadMission : Production ...@@ -51,27 +53,28 @@ public class DloadMission : Production
if (progress_side.active) if (progress_side.active)
{ {
preset_image.fillAmount = fill_data; preset_image.fillAmount = fill_data;
}
if (isflush)
{
if (fill_data == 1f) if (fill_data == 1f)
{ {
Debug.Log("刷新界面"); Debug.Log("刷新界面");
JsonData val = new JsonData(); JsonData val = new JsonData();
val["productionid"] = id; val["productionid"] = id;
val["code"] = new JsonData(); val["code"] = new JsonData();
val["code"].Add(0); val["code"].Add(0);
val["code"][0] = manager._RobotCode; val["code"][0] = manager._RobotCode;
//保存注册机码 //保存注册机码
StartCoroutine(request_post(Setting.IP + "/zeus/zeushub/saveRobotCode", JsonMapper.ToJson(val), 2)); StartCoroutine(request_post(Setting.IP + "/zeus/zeushub/saveRobotCode", JsonMapper.ToJson(val), 2));
btn[0].SetActive(true);
//btn[0].SetActive(true);
//刷新产品页
manager.SceneceAddress[1].GetComponent<ProductioRowData>().getlist();
//停止协程
StopCoroutine(myCoroutine);
//delMission(); //delMission();
} }
//刷新产品页
manager.SceneceAddress[1].GetComponent<ProductioRowData>().getlist();
//停止协程
StopCoroutine(myCoroutine);
isflush = false;
} }
yield return new WaitForSeconds(1f); yield return new WaitForSeconds(1f);
} }
...@@ -119,21 +122,16 @@ public class DloadMission : Production ...@@ -119,21 +122,16 @@ public class DloadMission : Production
fs.Close(); fs.Close();
//File.Delete(downloadFilename); //File.Delete(downloadFilename);
UnZip(downloadFilename, AppUrl, downloadFilename.Substring(downloadFilename.LastIndexOf('/') + 1, downloadFilename.LastIndexOf('.') - downloadFilename.LastIndexOf('/') - 1)); UnZip(downloadFilename, AppUrl, downloadFilename.Substring(downloadFilename.LastIndexOf('/') + 1, downloadFilename.LastIndexOf('.') - downloadFilename.LastIndexOf('/') - 1));
//删除文件 //删除文件
File.Delete(downloadFilename); File.Delete(downloadFilename);
//string json = "{\"code\":\"" + RobotCode.getMNum() + "\",\"productionid\":\"" + id + "\"}";
JsonData js_data = new JsonData();
js_data["apppath"] = AppUrl + downloadFilename.Substring(downloadFilename.LastIndexOf("/") + 1, downloadFilename.LastIndexOf(".") - (downloadFilename.Substring(0, downloadFilename.LastIndexOf("/") + 1).Length)) + "/" + appname;
js_data["productionid"] = id;
//保存启动路径 //保存启动路径
JsonData val = new JsonData(); JsonData val = new JsonData();
val["url"] = js_data["apppath"]; val["url"] = AppUrl + downloadFilename.Substring(downloadFilename.LastIndexOf("/") + 1, downloadFilename.LastIndexOf(".") - (downloadFilename.Substring(0, downloadFilename.LastIndexOf("/") + 1).Length)) + "/" + appname;
JsonData d = ProductionSetting.LoadData(); JsonData d = ProductionSetting.LoadData();
if (d != null) if (d != null)
...@@ -141,7 +139,17 @@ public class DloadMission : Production ...@@ -141,7 +139,17 @@ public class DloadMission : Production
d[id] = val; d[id] = val;
ProductionSetting.setData(JsonMapper.ToJson(d)); ProductionSetting.setData(JsonMapper.ToJson(d));
} }
isflush = true;
this.updateUIText.BeginInvoke(1, null, null);
/*//string json = "{\"code\":\"" + RobotCode.getMNum() + "\",\"productionid\":\"" + id + "\"}";
JsonData js_data = new JsonData();
js_data["apppath"] = AppUrl + downloadFilename.Substring(downloadFilename.LastIndexOf("/") + 1, downloadFilename.LastIndexOf(".") - (downloadFilename.Substring(0, downloadFilename.LastIndexOf("/") + 1).Length)) + "/" + appname;
js_data["productionid"] = id;*/
} }
} }
catch (OssException e) catch (OssException e)
......
...@@ -14,8 +14,6 @@ public class NoticeRowData : MonoBehaviour ...@@ -14,8 +14,6 @@ public class NoticeRowData : MonoBehaviour
public ZeusHub_Manager manager; public ZeusHub_Manager manager;
public AnalysisHtml5Tools analysisHtml5 = new AnalysisHtml5Tools();
void Start() void Start()
{ {
/* while (!manager) /* while (!manager)
...@@ -71,7 +69,7 @@ public class NoticeRowData : MonoBehaviour ...@@ -71,7 +69,7 @@ public class NoticeRowData : MonoBehaviour
noticeData.date.text = item["created"].ToString(); noticeData.date.text = item["created"].ToString();
//noticeData.html = item["field_notice_info"].ToString(); //noticeData.html = item["field_notice_info"].ToString();
noticeData.manager = this.manager; noticeData.manager = this.manager;
noticeData.html = analysisHtml5.AnalysisRichTextMethod(item["field_notice_info"].ToString()); noticeData.html = AnalysisHtml5Tools.AnalysisRichTextMethod(item["field_notice_info"].ToString());
newObj.transform.localScale = new Vector3(1, 1, 1); newObj.transform.localScale = new Vector3(1, 1, 1);
} }
} }
......
...@@ -20,7 +20,7 @@ public class ProductioRowData : MonoBehaviour ...@@ -20,7 +20,7 @@ public class ProductioRowData : MonoBehaviour
[Header("收到服务器信息事件")] [Header("收到服务器信息事件")]
public ReceiveMsgEvent<object, string> OnReceiveMsg = new ReceiveMsgEvent<object, string>(); public ReceiveMsgEvent<object, string> OnReceiveMsg = new ReceiveMsgEvent<object, string>();
ZeusHub_Manager manager; public ZeusHub_Manager manager;
public Button[] page_btn; public Button[] page_btn;
...@@ -30,10 +30,12 @@ public class ProductioRowData : MonoBehaviour ...@@ -30,10 +30,12 @@ public class ProductioRowData : MonoBehaviour
public TMP_Text title; public TMP_Text title;
public bool isInstall;
// Start is called before the first frame update // Start is called before the first frame update
void Start() void Start()
{ {
kind = 1; //kind = 1;
while (!manager) while (!manager)
{ {
manager = ZeusHub_Manager.manager; manager = ZeusHub_Manager.manager;
...@@ -53,10 +55,12 @@ public class ProductioRowData : MonoBehaviour ...@@ -53,10 +55,12 @@ public class ProductioRowData : MonoBehaviour
public IEnumerator getlist(string api, string json_data,int type) public IEnumerator getlist(string api, string json_data,int type)
{ {
del(); del();
manager.P_Setting = ProductionSetting.LoadData(); manager.P_Setting = ProductionSetting.LoadData();
yield return null; yield return null;
Debug.Log(api+"=="+json_data); Debug.Log(api+"=="+json_data);
...@@ -86,74 +90,20 @@ public class ProductioRowData : MonoBehaviour ...@@ -86,74 +90,20 @@ public class ProductioRowData : MonoBehaviour
{ {
foreach (JsonData item in jd["result"]) foreach (JsonData item in jd["result"])
{ {
var newObj = Instantiate(RowPrefab) as GameObject; if (isInstall)
newObj.transform.SetParent(content.transform);
Production production = newObj.GetComponent<Production>();
TMP_Text tmp_txt = production.title;
tmp_txt.text = item["title"].ToString();
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);
if (manager.P_Setting.ContainsKey(production.id)){
ishas= AliyunOSS.AliyunOSSDownLoad.isFileExeit(manager.P_Setting[production.id]["url"].ToString());
}
}
if (type == 1)
{ {
if (ishas) if (manager.P_Setting.ContainsKey(item["production_id"].ToString()))
{
production.btn[0].SetActive(false);
production.btn[1].SetActive(true);
}
else
{ {
production.btn[0].SetActive(true); if (AliyunOSS.AliyunOSSDownLoad.isFileExeit(manager.P_Setting[item["production_id"].ToString()]["url"].ToString()))
production.btn[1].SetActive(false); {
setJsonData(item, type);
}
} }
production.btn[2].SetActive(false);
}
else if(type==2)
{
production.btn[0].SetActive(false);
production.btn[1].SetActive(false);
production.btn[2].SetActive(true);
} }
else
if (item.ContainsKey("logo") && item["logo"] != null && !string.IsNullOrEmpty(item["logo"].ToString()))
{ {
StartCoroutine(getImage(item["logo"].ToString(), production.rawImage)); setJsonData(item, type);
} }
newObj.transform.localScale = new Vector3(1, 1, 1);
//ScrollRect sc = scrollrect_.GetComponent<ScrollRect>();
//sc.verticalNormalizedPosition = 0;
} }
} }
} }
...@@ -164,6 +114,83 @@ public class ProductioRowData : MonoBehaviour ...@@ -164,6 +114,83 @@ public class ProductioRowData : MonoBehaviour
} }
} }
} }
void setJsonData(JsonData item,int type)
{
var newObj = Instantiate(RowPrefab) as GameObject;
newObj.transform.SetParent(content.transform);
Production production = newObj.GetComponent<Production>();
TMP_Text tmp_txt = production.title;
tmp_txt.text = item["title"].ToString();
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);
if (manager.P_Setting.ContainsKey(production.id))
{
ishas = AliyunOSS.AliyunOSSDownLoad.isFileExeit(manager.P_Setting[production.id]["url"].ToString());
}
}
if (type == 1)
{
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.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(item["logo"].ToString(), production.rawImage));
}
newObj.transform.localScale = new Vector3(1, 1, 1);
//ScrollRect sc = scrollrect_.GetComponent<ScrollRect>();
//sc.verticalNormalizedPosition = 0;
}
public IEnumerator getImage(string imageUrl,RawImage rawImage) public IEnumerator getImage(string imageUrl,RawImage rawImage)
{ {
...@@ -193,6 +220,7 @@ public class ProductioRowData : MonoBehaviour ...@@ -193,6 +220,7 @@ public class ProductioRowData : MonoBehaviour
} }
else if (kind == 2) else if (kind == 2)
{ {
Debug.Log(manager);
string json_data = "{\"limit\":10,\"page\":0,\"computer_code\":\"" +manager._RobotCode + "\",\"kind\":\""+ pro_kind + "\",\"title_name\":\"" + TextTool.relacestr(title.text) + "\"}"; string json_data = "{\"limit\":10,\"page\":0,\"computer_code\":\"" +manager._RobotCode + "\",\"kind\":\""+ pro_kind + "\",\"title_name\":\"" + TextTool.relacestr(title.text) + "\"}";
// string json_data = "{\"limit\":10,\"page\":0,\"computer_code\":\"" + manager._RobotCode + "\",\"kind\":" + (pro_kind.Equals("1") ? 1 : 2) + "}"; // string json_data = "{\"limit\":10,\"page\":0,\"computer_code\":\"" + manager._RobotCode + "\",\"kind\":" + (pro_kind.Equals("1") ? 1 : 2) + "}";
StartCoroutine(getlist("/zeus/zeushub/getProductionList", json_data, 1)); StartCoroutine(getlist("/zeus/zeushub/getProductionList", json_data, 1));
......
...@@ -85,6 +85,7 @@ public class Production : MonoBehaviour ...@@ -85,6 +85,7 @@ public class Production : MonoBehaviour
{ {
if (fill_data > 0 && fill_data < 1) if (fill_data > 0 && fill_data < 1)
{ {
preset_image.fillAmount = 0;
progress_side.SetActive(true); progress_side.SetActive(true);
} }
} }
...@@ -106,6 +107,7 @@ public class Production : MonoBehaviour ...@@ -106,6 +107,7 @@ public class Production : MonoBehaviour
//下载按钮 //下载按钮
public void downProgress() public void downProgress()
{ {
manager.APP_setting = SetSetting.LoadData();
if (manager.APP_setting.AppUrl!=null && !manager.APP_setting.AppUrl.Equals("")) if (manager.APP_setting.AppUrl!=null && !manager.APP_setting.AppUrl.Equals(""))
{ {
if (url != null && !url.Equals("")) if (url != null && !url.Equals(""))
...@@ -285,6 +287,10 @@ public class Production : MonoBehaviour ...@@ -285,6 +287,10 @@ public class Production : MonoBehaviour
manager.normalPage.GetComponent<NormalText>().msg.text = "没有订单"; manager.normalPage.GetComponent<NormalText>().msg.text = "没有订单";
//manager.tishi.text = "没有订单"; //manager.tishi.text = "没有订单";
break; break;
case "nocomputer_code":
manager.normalPage.GetComponent<NormalText>().msg.text = "没有绑定计算机";
//manager.bingcomPage.SetActive(true);
break;
} }
} }
break; break;
......
...@@ -19,6 +19,7 @@ public class ProductionDetail : MonoBehaviour ...@@ -19,6 +19,7 @@ public class ProductionDetail : MonoBehaviour
public ZeusHub_Manager manager; public ZeusHub_Manager manager;
public GameObject[] kind; public GameObject[] kind;
void Start() void Start()
{ {
...@@ -55,6 +56,14 @@ public class ProductionDetail : MonoBehaviour ...@@ -55,6 +56,14 @@ public class ProductionDetail : MonoBehaviour
tMP_Texts[1].text = jd["field_information"].Count > 0 ? jd["field_information"][0]["value"].ToString() : ""; tMP_Texts[1].text = jd["field_information"].Count > 0 ? jd["field_information"][0]["value"].ToString() : "";
tMP_Texts[2].text =jd.ContainsKey("field_course")?AnalysisHtml5Tools.AnalysisRichTextMethod(jd["field_course"][0]["value"].ToString()):"";
tMP_Texts[3].text = jd.ContainsKey("field_base_setting") ?AnalysisHtml5Tools.AnalysisRichTextMethod(jd["field_base_setting"][0]["value"].ToString()):"";
tMP_Texts[4].text = jd["field_like_num"][0]["value"].ToString();
tMP_Texts[5].text = jd["field_read_num"][0]["value"].ToString();
if (jd["field_kind"][0]["target_id"].ToString()=="1") if (jd["field_kind"][0]["target_id"].ToString()=="1")
{ {
kind[1].SetActive(true); kind[1].SetActive(true);
...@@ -67,8 +76,49 @@ public class ProductionDetail : MonoBehaviour ...@@ -67,8 +76,49 @@ public class ProductionDetail : MonoBehaviour
} }
StartCoroutine(getImage(jd["field_logo"][0]["value"].ToString(), rawImage)); StartCoroutine(getImage(jd["field_logo"][0]["value"].ToString(), rawImage));
setApi(2);
}
public void setApi(int type)
{
if (type==1)
{
StartCoroutine(requestApi("/zeus/zeushub/addLike?productionid="+id, type));
}
else if (type==2)
{
StartCoroutine(requestApi("/zeus/zeushub/addRead?productionid="+id, type));
}
}
public IEnumerator requestApi(string ip,int type)
{
var rq = UnityWebRequest.Get(Setting.IP + ip);
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);
if (type==1)
{
tMP_Texts[4].text = jd["num"].ToString();
}
else if (type==2)
{
tMP_Texts[5].text = jd["num"].ToString();
}
}
yield return null;
} }
public IEnumerator getImage(string imageUrl, RawImage rawImage) public IEnumerator getImage(string imageUrl, RawImage rawImage)
{ {
using (var rq = UnityWebRequestTexture.GetTexture(imageUrl)) using (var rq = UnityWebRequestTexture.GetTexture(imageUrl))
......
...@@ -19,7 +19,7 @@ public class AnalysisHtml5Tools ...@@ -19,7 +19,7 @@ public class AnalysisHtml5Tools
/// </summary> /// </summary>
/// <param name="richText">html富文本字符串</param> /// <param name="richText">html富文本字符串</param>
/// <returns>解析后字符串</returns> /// <returns>解析后字符串</returns>
public string AnalysisRichTextMethod(string richText) public static string AnalysisRichTextMethod(string richText)
{ {
LuaEnv luaEnv = new LuaEnv(); LuaEnv luaEnv = new LuaEnv();
...@@ -61,7 +61,7 @@ public class AnalysisHtml5Tools ...@@ -61,7 +61,7 @@ public class AnalysisHtml5Tools
} }
public byte[] myLoader(ref string filePath) public static byte[] myLoader(ref string filePath)
{ {
string path = Application.streamingAssetsPath + "/" + filePath + ".lua"; string path = Application.streamingAssetsPath + "/" + filePath + ".lua";
......
This diff is collapsed.
...@@ -570,6 +570,7 @@ RectTransform: ...@@ -570,6 +570,7 @@ RectTransform:
- {fileID: 7119647756621128577} - {fileID: 7119647756621128577}
- {fileID: 5574886299292168500} - {fileID: 5574886299292168500}
- {fileID: 6794177039675862224} - {fileID: 6794177039675862224}
- {fileID: 9028832665041427554}
m_Father: {fileID: 5455300078322386040} m_Father: {fileID: 5455300078322386040}
m_RootOrder: 4 m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
...@@ -849,7 +850,7 @@ MonoBehaviour: ...@@ -849,7 +850,7 @@ MonoBehaviour:
title: {fileID: 452572634745476164} title: {fileID: 452572634745476164}
rawImage: {fileID: 0} rawImage: {fileID: 0}
btn: btn:
- {fileID: 7119647756621128576} - {fileID: 6858535362784837705}
kind: [] kind: []
welBorews: {fileID: 0} welBorews: {fileID: 0}
path: path:
...@@ -1129,6 +1130,140 @@ MonoBehaviour: ...@@ -1129,6 +1130,140 @@ MonoBehaviour:
m_OnClick: m_OnClick:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
--- !u!1 &6858535362784837705
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 9028832665041427554}
- component: {fileID: 8426890244090162776}
- component: {fileID: 1422701241034568420}
m_Layer: 5
m_Name: "\u4E0B\u8F7D\u5B8C\u6210"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &9028832665041427554
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6858535362784837705}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6793451945099674491}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -100, y: 0}
m_SizeDelta: {x: 200, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8426890244090162776
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6858535362784837705}
m_CullTransparentMesh: 0
--- !u!114 &1422701241034568420
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6858535362784837705}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: "\u4E0B\u8F7D\u5B8C\u6210"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 1f5786cba7bb56f4095b58a2db83e2b2, type: 2}
m_sharedMaterial: {fileID: 21679760276028976, guid: 1f5786cba7bb56f4095b58a2db83e2b2,
type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 24
m_fontSizeBase: 24
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 4
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &7119647756621128576 --- !u!1 &7119647756621128576
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
......
...@@ -35,7 +35,7 @@ RectTransform: ...@@ -35,7 +35,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 30} m_AnchoredPosition: {x: 0, y: -16.73}
m_SizeDelta: {x: 100, y: 30} m_SizeDelta: {x: 100, y: 30}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8948163009216762161 --- !u!222 &8948163009216762161
......
...@@ -28,7 +28,8 @@ RectTransform: ...@@ -28,7 +28,8 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children:
- {fileID: 6155738136812182717}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
...@@ -74,3 +75,137 @@ MonoBehaviour: ...@@ -74,3 +75,137 @@ MonoBehaviour:
m_FillOrigin: 0 m_FillOrigin: 0
m_UseSpriteMesh: 0 m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1 m_PixelsPerUnitMultiplier: 1
--- !u!1 &7727261846254046543
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6155738136812182717}
- component: {fileID: 129509275338715708}
- component: {fileID: 6260857402201264375}
m_Layer: 5
m_Name: "\u5185\u5BB9"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6155738136812182717
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7727261846254046543}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2112423377739292073}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &129509275338715708
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7727261846254046543}
m_CullTransparentMesh: 0
--- !u!114 &6260857402201264375
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7727261846254046543}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text:
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 1f5786cba7bb56f4095b58a2db83e2b2, type: 2}
m_sharedMaterial: {fileID: 21679760276028976, guid: 1f5786cba7bb56f4095b58a2db83e2b2,
type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 36
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 1
m_VerticalAlignment: 256
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!1 &5306039261931306865
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8325830114397059280}
- component: {fileID: 2570420426014248881}
- component: {fileID: 1589025631176360973}
m_Layer: 5
m_Name: "\u914D\u7F6E"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8325830114397059280
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5306039261931306865}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7522423192027836007}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2570420426014248881
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5306039261931306865}
m_CullTransparentMesh: 0
--- !u!114 &1589025631176360973
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5306039261931306865}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text:
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 1f5786cba7bb56f4095b58a2db83e2b2, type: 2}
m_sharedMaterial: {fileID: 21679760276028976, guid: 1f5786cba7bb56f4095b58a2db83e2b2,
type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 36
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 1
m_VerticalAlignment: 256
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &7522423192027836006 --- !u!1 &7522423192027836006
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -28,7 +162,8 @@ RectTransform: ...@@ -28,7 +162,8 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children:
- {fileID: 8325830114397059280}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......
This diff is collapsed.
{"12890":{"url":"D://DownloadDemo/新盛世HUB/Zsnewcentury.exe"},"12720":{"url":"D://DownloadDemo/zeus_office/EduTemplate.exe"}} {"12890":{"url":"D://DownloadDemo/新盛世HUB/Zsnewcentury.exe"}}
\ No newline at end of file \ 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