From 829b7769cb168f6080226c6e55fab305d042ff3b Mon Sep 17 00:00:00 2001
From: hwj35 <691170510@qq.com>
Date: 星期五, 17 十月 2025 14:14:51 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_resourcesout
---
Sprite/icon.spriteatlasv2 | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Sprite/icon.spriteatlasv2 b/Sprite/icon.spriteatlasv2
index afdf1a9..50422cd 100644
--- a/Sprite/icon.spriteatlasv2
+++ b/Sprite/icon.spriteatlasv2
@@ -11,6 +11,7 @@
m_MasterAtlas: {fileID: 0}
m_ImporterData:
packables:
+ - {fileID: 2800000, guid: 734533acd8d2f504e921cf8991e43ce6, type: 3}
- {fileID: 2800000, guid: ba16a7e151509ba4b9910cb6542b1b18, type: 3}
- {fileID: 2800000, guid: 102a6b0774345314c85f4395e1667a99, type: 3}
- {fileID: 2800000, guid: 94794ea58d51f5e418731e9ae6636b5f, type: 3}
@@ -25,6 +26,7 @@
- {fileID: 2800000, guid: 04e3afe3acb5368408437ffacd0d4d55, type: 3}
- {fileID: 2800000, guid: 7b5e880781ead2d499f0f2bb93379d73, type: 3}
- {fileID: 2800000, guid: c96ffde6d41e28d409b2dd60bbbce716, type: 3}
+ - {fileID: 2800000, guid: 0dbec7f035dd0b148be58db1a859bbe5, type: 3}
- {fileID: 2800000, guid: cfcf1d6b487930845b64d6dadf8ff76a, type: 3}
- {fileID: 2800000, guid: 0972104a1a71d044882b80588f09eb0a, type: 3}
- {fileID: 2800000, guid: 79ce15469297c6b4eb0c0d59a6bfb074, type: 3}
@@ -175,6 +177,4 @@
- {fileID: 2800000, guid: 2726e2dfa91665646a7051b9a647b09d, type: 3}
- {fileID: 2800000, guid: 90c026d146b74b94cbf4fd189b1696af, type: 3}
- {fileID: 2800000, guid: 9e85afd711b4cf940b6ff306104a4032, type: 3}
- - {fileID: 2800000, guid: 0dbec7f035dd0b148be58db1a859bbe5, type: 3}
- - {fileID: 2800000, guid: 734533acd8d2f504e921cf8991e43ce6, type: 3}
m_IsVariant: 0
--
Gitblit v1.8.0