Merge branch 'master' of git@gitlab.sd-zeus.com:testcii/UnitySubTest.git

6c1c0a2a · 林杨欢 · a6a34dac · 2824d2aa · 6c1c0a2a · 6c1c0a2a
Commit 6c1c0a2a authored Nov 25, 2023 by 林杨欢
Showing with 500 additions and 3 deletions

Test.unity Assets/Scenes/Test.unity +497 -0

Test.unity.meta Assets/Scenes/Test.unity.meta +1 -1

mat1 1.mat.meta Assets/Texture/mat1 1.mat.meta +1 -1

mat1 2.mat.meta Assets/Texture/mat1 2.mat.meta +1 -1

No files found.
--- a/Assets/Scenes/Test.unity
+++ b/Assets/Scenes/Test.unity
--- a/Assets/DynamicPanels.unitypackage.meta
+++ b/Assets/DynamicPanels.unitypackage.meta
 fileFormatVersion: 2
-guid: 4f5f32b4b2883c84db404a1979675958
+guid: 099f1f0dec469d04090a620b4064bc18
 DefaultImporter:
  externalObjects: {}
  userData: 

--- a/Assets/Texture/mat1 1.mat.meta
+++ b/Assets/Texture/mat1 1.mat.meta
 fileFormatVersion: 2
-guid: 045ca7331700a454c947f5951c9a48c2
+guid: f5f05d4d5fd6dd54fa2f1b0b56309539
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 2100000

--- a/Assets/Texture/mat1 2.mat.meta
+++ b/Assets/Texture/mat1 2.mat.meta
 fileFormatVersion: 2
-guid: 1cf8e8e5fb23f654fba86d23c68035d0
+guid: 863e84b7d5ee63a419771e6cc685a059
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 2100000