diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 1308a0b..ce3d784 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -92,17 +92,21 @@ jobs: 随后在项目添加“${{ github.event.repository.name }}”包。 ## License restrictions 许可限制 - Non Chinese Mainland (except Hong Kong China, Macau China, and Taiwan Province of China) individuals or companies are subject to an LGPL license. - - 非中国大陆地区(中国香港、中国澳门和中国台湾除外)的个人或公司须遵守 LGPL 许可证。 Individuals or companies in Chinese Mainland (except Hong Kong China, Macau China, and Taiwan Province of China) are prohibited from using this LGPL license and using this repository and products if the following circumstances apply: + + 1. The map/world is not created in an individual capacity + 2. The map/world involves more than two participants in its creation (not including two participants) + 3. Any individual user or company explicitly prohibited by Sonic853 中国大陆地区(中国香港、中国澳门和中国台湾除外)的个人或公司如含有以下任一情况禁止使用该 LGPL 许可并禁止使用此储存库以及商品(包括此储存库以及商品的任一文件): + 1. 不以个人名义创建的地图/世界 2. 地图/世界参与制作人数超过 2 人以上(不含 2 人) 3. 由 Sonic853 明确禁止的个人用户、公司 + If you wish to obtain authorization to use this repository and its products, please contact the author Sonic853 (sonic853@qq.com) or manually acquire authorization via [爱发电](https://afdian.com/a/Sonic853). + 如需获得使用此储存库以及商品的授权,请联系作者 Sonic853 (sonic853@qq.com) 获取授权或访问 [爱发电](https://afdian.com/a/Sonic853) 手动获取授权。 tag_name: ${{ steps.read_version.outputs.current_version }} files: | @@ -110,7 +114,7 @@ jobs: ${{ steps.read_version.outputs.name }}-${{ steps.read_version.outputs.current_version }}.unitypackage - name: Dispatch version to vpm-repos - if: steps.read_version.outputs.last_tag != steps.read_version.outputs.current_version + if: github.event.repository.private == false && steps.read_version.outputs.last_tag != steps.read_version.outputs.current_version uses: peter-evans/repository-dispatch@v3 with: token: ${{ secrets.PAT }} diff --git a/Demo.unity b/Demo.unity index 0e3e127..4a76f3f 100644 --- a/Demo.unity +++ b/Demo.unity @@ -702,57 +702,65 @@ PrefabInstance: propertyPath: serializationData.Prefab value: objectReference: {fileID: 73936863104981042, guid: 2e6d4da05b9372e44a379d1f42b5f6b5, type: 3} + - target: {fileID: 83830431941011217, guid: 2e6d4da05b9372e44a379d1f42b5f6b5, type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 0} - target: {fileID: 203955425876214521, guid: 2e6d4da05b9372e44a379d1f42b5f6b5, type: 3} propertyPath: m_Name value: PosterUI objectReference: {fileID: 0} + - target: {fileID: 701747094331560062, guid: 2e6d4da05b9372e44a379d1f42b5f6b5, type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 2100000, guid: 1598ebc0ee523a5418d9635d2f926a27, type: 2} - target: {fileID: 704099937579214710, guid: 2e6d4da05b9372e44a379d1f42b5f6b5, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 704099937579214710, guid: 2e6d4da05b9372e44a379d1f42b5f6b5, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 704099937579214710, guid: 2e6d4da05b9372e44a379d1f42b5f6b5, type: 3} propertyPath: m_SizeDelta.x - value: 682 + value: 0 objectReference: {fileID: 0} - target: {fileID: 704099937579214710, guid: 2e6d4da05b9372e44a379d1f42b5f6b5, type: 3} propertyPath: m_SizeDelta.y - value: 1024 + value: 0 objectReference: {fileID: 0} - target: {fileID: 704099937579214710, guid: 2e6d4da05b9372e44a379d1f42b5f6b5, type: 3} propertyPath: m_AnchoredPosition.x - value: 341 + value: 0 objectReference: {fileID: 0} - target: {fileID: 704099937579214710, guid: 2e6d4da05b9372e44a379d1f42b5f6b5, type: 3} propertyPath: m_AnchoredPosition.y - value: -512 + value: 0 objectReference: {fileID: 0} - target: {fileID: 879972686423036504, guid: 2e6d4da05b9372e44a379d1f42b5f6b5, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 879972686423036504, guid: 2e6d4da05b9372e44a379d1f42b5f6b5, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 879972686423036504, guid: 2e6d4da05b9372e44a379d1f42b5f6b5, type: 3} propertyPath: m_SizeDelta.x - value: 682 + value: 0 objectReference: {fileID: 0} - target: {fileID: 879972686423036504, guid: 2e6d4da05b9372e44a379d1f42b5f6b5, type: 3} propertyPath: m_SizeDelta.y - value: 1024 + value: 0 objectReference: {fileID: 0} - target: {fileID: 879972686423036504, guid: 2e6d4da05b9372e44a379d1f42b5f6b5, type: 3} propertyPath: m_AnchoredPosition.x - value: 1705 + value: 0 objectReference: {fileID: 0} - target: {fileID: 879972686423036504, guid: 2e6d4da05b9372e44a379d1f42b5f6b5, type: 3} propertyPath: m_AnchoredPosition.y - value: -512 + value: 0 objectReference: {fileID: 0} - target: {fileID: 983936361649074068, guid: 2e6d4da05b9372e44a379d1f42b5f6b5, type: 3} propertyPath: serializationData.Prefab @@ -768,27 +776,27 @@ PrefabInstance: objectReference: {fileID: 1139405462216457472, guid: 2e6d4da05b9372e44a379d1f42b5f6b5, type: 3} - target: {fileID: 1322660423407401065, guid: 2e6d4da05b9372e44a379d1f42b5f6b5, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1322660423407401065, guid: 2e6d4da05b9372e44a379d1f42b5f6b5, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1322660423407401065, guid: 2e6d4da05b9372e44a379d1f42b5f6b5, type: 3} propertyPath: m_SizeDelta.x - value: 682 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1322660423407401065, guid: 2e6d4da05b9372e44a379d1f42b5f6b5, type: 3} propertyPath: m_SizeDelta.y - value: 1024 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1322660423407401065, guid: 2e6d4da05b9372e44a379d1f42b5f6b5, type: 3} propertyPath: m_AnchoredPosition.x - value: 1023 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1322660423407401065, guid: 2e6d4da05b9372e44a379d1f42b5f6b5, type: 3} propertyPath: m_AnchoredPosition.y - value: -512 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1371361395343513520, guid: 2e6d4da05b9372e44a379d1f42b5f6b5, type: 3} propertyPath: serializationData.Prefab @@ -796,27 +804,27 @@ PrefabInstance: objectReference: {fileID: 1371361395343513520, guid: 2e6d4da05b9372e44a379d1f42b5f6b5, type: 3} - target: {fileID: 2288217399244384512, guid: 2e6d4da05b9372e44a379d1f42b5f6b5, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2288217399244384512, guid: 2e6d4da05b9372e44a379d1f42b5f6b5, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2288217399244384512, guid: 2e6d4da05b9372e44a379d1f42b5f6b5, type: 3} propertyPath: m_SizeDelta.x - value: 682 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2288217399244384512, guid: 2e6d4da05b9372e44a379d1f42b5f6b5, type: 3} propertyPath: m_SizeDelta.y - value: 1024 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2288217399244384512, guid: 2e6d4da05b9372e44a379d1f42b5f6b5, type: 3} propertyPath: m_AnchoredPosition.x - value: 3751 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2288217399244384512, guid: 2e6d4da05b9372e44a379d1f42b5f6b5, type: 3} propertyPath: m_AnchoredPosition.y - value: -512 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2605787817858188809, guid: 2e6d4da05b9372e44a379d1f42b5f6b5, type: 3} propertyPath: url.url @@ -826,66 +834,82 @@ PrefabInstance: propertyPath: serializationData.Prefab value: objectReference: {fileID: 2605787817858188809, guid: 2e6d4da05b9372e44a379d1f42b5f6b5, type: 3} + - target: {fileID: 2864381599143535218, guid: 2e6d4da05b9372e44a379d1f42b5f6b5, type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 2100000, guid: 1598ebc0ee523a5418d9635d2f926a27, type: 2} - target: {fileID: 2955122698765548385, guid: 2e6d4da05b9372e44a379d1f42b5f6b5, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 2955122698765548385, guid: 2e6d4da05b9372e44a379d1f42b5f6b5, type: 3} + - target: {fileID: 3900782852044598521, guid: 2e6d4da05b9372e44a379d1f42b5f6b5, type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 2100000, guid: 1598ebc0ee523a5418d9635d2f926a27, type: 2} - target: {fileID: 4185392489294340979, guid: 2e6d4da05b9372e44a379d1f42b5f6b5, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 4185392489294340979, guid: 2e6d4da05b9372e44a379d1f42b5f6b5, type: 3} - target: {fileID: 4417805992793371687, guid: 2e6d4da05b9372e44a379d1f42b5f6b5, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4417805992793371687, guid: 2e6d4da05b9372e44a379d1f42b5f6b5, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4417805992793371687, guid: 2e6d4da05b9372e44a379d1f42b5f6b5, type: 3} propertyPath: m_SizeDelta.x - value: 682 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4417805992793371687, guid: 2e6d4da05b9372e44a379d1f42b5f6b5, type: 3} propertyPath: m_SizeDelta.y - value: 1024 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4417805992793371687, guid: 2e6d4da05b9372e44a379d1f42b5f6b5, type: 3} propertyPath: m_AnchoredPosition.x - value: 3069 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4417805992793371687, guid: 2e6d4da05b9372e44a379d1f42b5f6b5, type: 3} propertyPath: m_AnchoredPosition.y - value: -512 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5139299493652673828, guid: 2e6d4da05b9372e44a379d1f42b5f6b5, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 5139299493652673828, guid: 2e6d4da05b9372e44a379d1f42b5f6b5, type: 3} + - target: {fileID: 6800962140894956957, guid: 2e6d4da05b9372e44a379d1f42b5f6b5, type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 2100000, guid: 1598ebc0ee523a5418d9635d2f926a27, type: 2} - target: {fileID: 7109908718713310726, guid: 2e6d4da05b9372e44a379d1f42b5f6b5, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7109908718713310726, guid: 2e6d4da05b9372e44a379d1f42b5f6b5, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7109908718713310726, guid: 2e6d4da05b9372e44a379d1f42b5f6b5, type: 3} propertyPath: m_SizeDelta.x - value: 682 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7109908718713310726, guid: 2e6d4da05b9372e44a379d1f42b5f6b5, type: 3} propertyPath: m_SizeDelta.y - value: 1024 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7109908718713310726, guid: 2e6d4da05b9372e44a379d1f42b5f6b5, type: 3} propertyPath: m_AnchoredPosition.x - value: 2387 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7109908718713310726, guid: 2e6d4da05b9372e44a379d1f42b5f6b5, type: 3} propertyPath: m_AnchoredPosition.y - value: -512 + value: 0 objectReference: {fileID: 0} + - target: {fileID: 7223475314033094201, guid: 2e6d4da05b9372e44a379d1f42b5f6b5, type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 2100000, guid: 1598ebc0ee523a5418d9635d2f926a27, type: 2} - target: {fileID: 8554904679551377264, guid: 2e6d4da05b9372e44a379d1f42b5f6b5, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -997,27 +1021,27 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2896899534324345576, guid: cb0144373c786c14f9d7b32b7beea709, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2896899534324345576, guid: cb0144373c786c14f9d7b32b7beea709, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2896899534324345576, guid: cb0144373c786c14f9d7b32b7beea709, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 1024 objectReference: {fileID: 0} - target: {fileID: 2896899534324345576, guid: cb0144373c786c14f9d7b32b7beea709, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 682 objectReference: {fileID: 0} - target: {fileID: 2896899534324345576, guid: cb0144373c786c14f9d7b32b7beea709, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 512 objectReference: {fileID: 0} - target: {fileID: 2896899534324345576, guid: cb0144373c786c14f9d7b32b7beea709, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -341 objectReference: {fileID: 0} - target: {fileID: 3388878087900855253, guid: cb0144373c786c14f9d7b32b7beea709, type: 3} propertyPath: serializationData.Prefab @@ -1029,75 +1053,75 @@ PrefabInstance: objectReference: {fileID: 3654634286846566688, guid: cb0144373c786c14f9d7b32b7beea709, type: 3} - target: {fileID: 3920146628741813750, guid: cb0144373c786c14f9d7b32b7beea709, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3920146628741813750, guid: cb0144373c786c14f9d7b32b7beea709, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3920146628741813750, guid: cb0144373c786c14f9d7b32b7beea709, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 1024 objectReference: {fileID: 0} - target: {fileID: 3920146628741813750, guid: cb0144373c786c14f9d7b32b7beea709, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 682 objectReference: {fileID: 0} - target: {fileID: 3920146628741813750, guid: cb0144373c786c14f9d7b32b7beea709, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 1536 objectReference: {fileID: 0} - target: {fileID: 3920146628741813750, guid: cb0144373c786c14f9d7b32b7beea709, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -341 objectReference: {fileID: 0} - target: {fileID: 4229517129413013418, guid: cb0144373c786c14f9d7b32b7beea709, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4229517129413013418, guid: cb0144373c786c14f9d7b32b7beea709, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4229517129413013418, guid: cb0144373c786c14f9d7b32b7beea709, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 1024 objectReference: {fileID: 0} - target: {fileID: 4229517129413013418, guid: cb0144373c786c14f9d7b32b7beea709, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 682 objectReference: {fileID: 0} - target: {fileID: 4229517129413013418, guid: cb0144373c786c14f9d7b32b7beea709, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 2560 objectReference: {fileID: 0} - target: {fileID: 4229517129413013418, guid: cb0144373c786c14f9d7b32b7beea709, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -341 objectReference: {fileID: 0} - target: {fileID: 4515058677893620452, guid: cb0144373c786c14f9d7b32b7beea709, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4515058677893620452, guid: cb0144373c786c14f9d7b32b7beea709, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4515058677893620452, guid: cb0144373c786c14f9d7b32b7beea709, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 1024 objectReference: {fileID: 0} - target: {fileID: 4515058677893620452, guid: cb0144373c786c14f9d7b32b7beea709, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 682 objectReference: {fileID: 0} - target: {fileID: 4515058677893620452, guid: cb0144373c786c14f9d7b32b7beea709, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 4608 objectReference: {fileID: 0} - target: {fileID: 4515058677893620452, guid: cb0144373c786c14f9d7b32b7beea709, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -341 objectReference: {fileID: 0} - target: {fileID: 5010530695798650499, guid: cb0144373c786c14f9d7b32b7beea709, type: 3} propertyPath: serializationData.Prefab @@ -1105,27 +1129,27 @@ PrefabInstance: objectReference: {fileID: 5010530695798650499, guid: cb0144373c786c14f9d7b32b7beea709, type: 3} - target: {fileID: 5491862363197529333, guid: cb0144373c786c14f9d7b32b7beea709, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5491862363197529333, guid: cb0144373c786c14f9d7b32b7beea709, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5491862363197529333, guid: cb0144373c786c14f9d7b32b7beea709, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 1024 objectReference: {fileID: 0} - target: {fileID: 5491862363197529333, guid: cb0144373c786c14f9d7b32b7beea709, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 682 objectReference: {fileID: 0} - target: {fileID: 5491862363197529333, guid: cb0144373c786c14f9d7b32b7beea709, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 3584 objectReference: {fileID: 0} - target: {fileID: 5491862363197529333, guid: cb0144373c786c14f9d7b32b7beea709, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -341 objectReference: {fileID: 0} - target: {fileID: 5811229088435545655, guid: cb0144373c786c14f9d7b32b7beea709, type: 3} propertyPath: serializationData.Prefab @@ -1213,27 +1237,27 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6899078059837333126, guid: cb0144373c786c14f9d7b32b7beea709, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6899078059837333126, guid: cb0144373c786c14f9d7b32b7beea709, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6899078059837333126, guid: cb0144373c786c14f9d7b32b7beea709, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 1024 objectReference: {fileID: 0} - target: {fileID: 6899078059837333126, guid: cb0144373c786c14f9d7b32b7beea709, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 682 objectReference: {fileID: 0} - target: {fileID: 6899078059837333126, guid: cb0144373c786c14f9d7b32b7beea709, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 5632 objectReference: {fileID: 0} - target: {fileID: 6899078059837333126, guid: cb0144373c786c14f9d7b32b7beea709, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -341 objectReference: {fileID: 0} - target: {fileID: 7553714973640372087, guid: cb0144373c786c14f9d7b32b7beea709, type: 3} propertyPath: serializationData.Prefab diff --git a/Prefabs/PosterUI.prefab b/Prefabs/PosterUI.prefab index 42d1f7e..8fede68 100644 --- a/Prefabs/PosterUI.prefab +++ b/Prefabs/PosterUI.prefab @@ -412,7 +412,7 @@ MonoBehaviour: meshRenderer: {fileID: 0} material: {fileID: 0} textureName: _MainTex - uiImage: {fileID: 0} + uiImage: {fileID: 701747094331560062} rawImage: {fileID: 0} atlasWidth: 3 atlasHeight: 2 @@ -423,7 +423,7 @@ MonoBehaviour: positionWidth: 2048 positionHeight: 2048 texture: {fileID: 0} - image: {fileID: 701747094331560062} + image: {fileID: 0} sprite: {fileID: 0} --- !u!114 &4332817297409862544 MonoBehaviour: @@ -816,7 +816,7 @@ MonoBehaviour: meshRenderer: {fileID: 0} material: {fileID: 0} textureName: _MainTex - uiImage: {fileID: 0} + uiImage: {fileID: 7223475314033094201} rawImage: {fileID: 0} atlasWidth: 3 atlasHeight: 2 @@ -827,7 +827,7 @@ MonoBehaviour: positionWidth: 2048 positionHeight: 2048 texture: {fileID: 0} - image: {fileID: 7223475314033094201} + image: {fileID: 0} sprite: {fileID: 0} --- !u!114 &1191564886110254233 MonoBehaviour: @@ -1109,7 +1109,7 @@ MonoBehaviour: meshRenderer: {fileID: 0} material: {fileID: 0} textureName: _MainTex - uiImage: {fileID: 0} + uiImage: {fileID: 6800962140894956957} rawImage: {fileID: 0} atlasWidth: 3 atlasHeight: 2 @@ -1120,7 +1120,7 @@ MonoBehaviour: positionWidth: 2048 positionHeight: 2048 texture: {fileID: 0} - image: {fileID: 6800962140894956957} + image: {fileID: 0} sprite: {fileID: 0} --- !u!114 &7293255888288625599 MonoBehaviour: @@ -1387,7 +1387,7 @@ MonoBehaviour: meshRenderer: {fileID: 0} material: {fileID: 0} textureName: _MainTex - uiImage: {fileID: 0} + uiImage: {fileID: 2864381599143535218} rawImage: {fileID: 0} atlasWidth: 3 atlasHeight: 2 @@ -1398,7 +1398,7 @@ MonoBehaviour: positionWidth: 2048 positionHeight: 2048 texture: {fileID: 0} - image: {fileID: 2864381599143535218} + image: {fileID: 0} sprite: {fileID: 0} --- !u!114 &9048059279449120946 MonoBehaviour: @@ -1527,7 +1527,7 @@ MonoBehaviour: meshRenderer: {fileID: 0} material: {fileID: 0} textureName: _MainTex - uiImage: {fileID: 0} + uiImage: {fileID: 3900782852044598521} rawImage: {fileID: 0} atlasWidth: 3 atlasHeight: 2 @@ -1538,7 +1538,7 @@ MonoBehaviour: positionWidth: 2048 positionHeight: 2048 texture: {fileID: 0} - image: {fileID: 3900782852044598521} + image: {fileID: 0} sprite: {fileID: 0} --- !u!114 &485908368006217124 MonoBehaviour: @@ -1852,7 +1852,7 @@ MonoBehaviour: meshRenderer: {fileID: 0} material: {fileID: 0} textureName: _MainTex - uiImage: {fileID: 0} + uiImage: {fileID: 83830431941011217} rawImage: {fileID: 0} atlasWidth: 3 atlasHeight: 2 @@ -1863,7 +1863,7 @@ MonoBehaviour: positionWidth: 2048 positionHeight: 2048 texture: {fileID: 0} - image: {fileID: 83830431941011217} + image: {fileID: 0} sprite: {fileID: 0} --- !u!114 &7227303875033065503 MonoBehaviour: diff --git a/Prefabs/PosterUI_Horizontal.prefab b/Prefabs/PosterUI_Horizontal.prefab index a9a8fc0..563c689 100644 --- a/Prefabs/PosterUI_Horizontal.prefab +++ b/Prefabs/PosterUI_Horizontal.prefab @@ -102,7 +102,7 @@ MonoBehaviour: meshRenderer: {fileID: 0} material: {fileID: 0} textureName: _MainTex - uiImage: {fileID: 0} + uiImage: {fileID: 4606929385375544482} rawImage: {fileID: 0} atlasWidth: 2 atlasHeight: 3 @@ -113,7 +113,7 @@ MonoBehaviour: positionWidth: 2048 positionHeight: 2048 texture: {fileID: 0} - image: {fileID: 4606929385375544482} + image: {fileID: 0} sprite: {fileID: 0} --- !u!114 &6050846218465245546 MonoBehaviour: @@ -510,7 +510,7 @@ MonoBehaviour: meshRenderer: {fileID: 0} material: {fileID: 0} textureName: _MainTex - uiImage: {fileID: 0} + uiImage: {fileID: 3419438123486895133} rawImage: {fileID: 0} atlasWidth: 2 atlasHeight: 3 @@ -521,7 +521,7 @@ MonoBehaviour: positionWidth: 2048 positionHeight: 2048 texture: {fileID: 0} - image: {fileID: 3419438123486895133} + image: {fileID: 0} sprite: {fileID: 0} --- !u!114 &698386856649143226 MonoBehaviour: @@ -1067,7 +1067,7 @@ MonoBehaviour: meshRenderer: {fileID: 0} material: {fileID: 0} textureName: _MainTex - uiImage: {fileID: 0} + uiImage: {fileID: 4534080792197668411} rawImage: {fileID: 0} atlasWidth: 2 atlasHeight: 3 @@ -1078,7 +1078,7 @@ MonoBehaviour: positionWidth: 2048 positionHeight: 2048 texture: {fileID: 0} - image: {fileID: 4534080792197668411} + image: {fileID: 0} sprite: {fileID: 0} --- !u!114 &3433912787193711221 MonoBehaviour: @@ -1207,7 +1207,7 @@ MonoBehaviour: meshRenderer: {fileID: 0} material: {fileID: 0} textureName: _MainTex - uiImage: {fileID: 0} + uiImage: {fileID: 6099077424357276968} rawImage: {fileID: 0} atlasWidth: 2 atlasHeight: 3 @@ -1218,7 +1218,7 @@ MonoBehaviour: positionWidth: 2048 positionHeight: 2048 texture: {fileID: 0} - image: {fileID: 6099077424357276968} + image: {fileID: 0} sprite: {fileID: 0} --- !u!114 &7469674043052404503 MonoBehaviour: @@ -1617,7 +1617,7 @@ MonoBehaviour: meshRenderer: {fileID: 0} material: {fileID: 0} textureName: _MainTex - uiImage: {fileID: 0} + uiImage: {fileID: 4670774916854005010} rawImage: {fileID: 0} atlasWidth: 2 atlasHeight: 3 @@ -1628,7 +1628,7 @@ MonoBehaviour: positionWidth: 2048 positionHeight: 2048 texture: {fileID: 0} - image: {fileID: 4670774916854005010} + image: {fileID: 0} sprite: {fileID: 0} --- !u!114 &2019283863982267078 MonoBehaviour: @@ -1852,7 +1852,7 @@ MonoBehaviour: meshRenderer: {fileID: 0} material: {fileID: 0} textureName: _MainTex - uiImage: {fileID: 0} + uiImage: {fileID: 5353034580499120266} rawImage: {fileID: 0} atlasWidth: 2 atlasHeight: 3 @@ -1863,7 +1863,7 @@ MonoBehaviour: positionWidth: 2048 positionHeight: 2048 texture: {fileID: 0} - image: {fileID: 5353034580499120266} + image: {fileID: 0} sprite: {fileID: 0} --- !u!114 &6819877487213413694 MonoBehaviour: diff --git a/Scripts/ImageDisplayer.cs b/Scripts/ImageDisplayer.cs index 2de99bb..afd9e7e 100644 --- a/Scripts/ImageDisplayer.cs +++ b/Scripts/ImageDisplayer.cs @@ -62,9 +62,9 @@ public bool SetTexture(Texture2D _texture) else material.SetTexture(textureName, _texture); } - if (image != null) + if (uiImage != null) { - image.sprite = Sprite.Create( + uiImage.sprite = Sprite.Create( _texture, new Rect(0, 0, _texture.width, _texture.height), new Vector2(0.5f, 0.5f), @@ -113,9 +113,9 @@ public bool SetSprite(Sprite _sprite) else material.SetTexture(textureName, _sprite.texture); } - if (image != null) + if (uiImage != null) { - image.sprite = _sprite; + uiImage.sprite = _sprite; } if (rawImage != null) { diff --git "a/Textures/\346\265\267\346\212\245853_682x1024.png" "b/Textures/\346\265\267\346\212\245853_682x1024.png" new file mode 100644 index 0000000..e86d3db Binary files /dev/null and "b/Textures/\346\265\267\346\212\245853_682x1024.png" differ diff --git "a/Textures/\346\265\267\346\212\245853_682x1024.png.meta" "b/Textures/\346\265\267\346\212\245853_682x1024.png.meta" new file mode 100644 index 0000000..182ca09 --- /dev/null +++ "b/Textures/\346\265\267\346\212\245853_682x1024.png.meta" @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: fe978261b5037414f8a301353f5f5bce +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/package.json b/package.json index a896ba3..663559a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "com.sonic853.udonlab.posterui", - "version": "1.0.3", + "version": "1.0.4", "displayName": "Udon Lab - PosterUI", "description": "Automatically update News and Events", "unity": "2022.3", @@ -16,7 +16,7 @@ "url": "https://github.com/Sonic853" }, "vpmDependencies": { - "com.sonic853.udonlab.urlloader": "1.x.x" + "com.sonic853.udonlab.urlloader": "2.x.x" }, "legacyFolders": { "Assets\\Sonic853\\Udon Lab\\PosterUI": "9a12694fc1b4af04fb039755178819a6"