flag

chrysalisXu · Apr 9, 2023 · 421c522 · 421c522
1 parent 0f81dbb
commit 421c522
Show file tree

Hide file tree

Showing 10 changed files with 280 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,8 @@
 /Logs/
 /Packages/
 /Usersettings/
-
+Assembly-CSharp-Editor-firstpass.csproj
+Assembly-CSharp.csproj
+PhysicsProject.sln
 .vs/
 .vscode/
diff --git a/Assets/Resources/images/UU_Flag.png b/Assets/Resources/images/UU_Flag.png
diff --git a/Assets/Resources/images/UU_Flag.png.meta b/Assets/Resources/images/UU_Flag.png.meta
diff --git a/Assets/Resources/images/UU_Flag_mirrored.png b/Assets/Resources/images/UU_Flag_mirrored.png
diff --git a/Assets/Resources/images/UU_Flag_mirrored.png.meta b/Assets/Resources/images/UU_Flag_mirrored.png.meta
diff --git a/Assets/Resources/material/UNFlag.mat → Assets/Resources/material/UUFlag.mat b/Assets/Resources/material/UNFlag.mat → Assets/Resources/material/UUFlag.mat
@@ -7,7 +7,7 @@ Material:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: UNFlag
+  m_Name: UUFlag
   m_Shader: {fileID: 4800000, guid: 735c2ca2e215f794cafd0447f53d66ac, type: 3}
   m_ValidKeywords: []
   m_InvalidKeywords:
@@ -51,7 +51,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 906b8ea5c4d9e114c9b1bd3f2d26e6d6, type: 3}
+        m_Texture: {fileID: 2800000, guid: 658a2fb438bc5b84fa7c6724723a4030, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MetallicGlossMap:
@@ -121,7 +121,7 @@ Material:
     - _ZWrite: 1
     - __dirty: 1
     m_Colors:
-    - _Color: {r: 0.023139918, g: 0.3773585, b: 0.086178824, a: 1}
+    - _Color: {r: 0.11320752, g: 0.11320752, b: 0.11320752, a: 1}
     - _DetailColor: {r: 1, g: 1, b: 1, a: 0}
     - _DetailSpecularColor: {r: 1, g: 1, b: 1, a: 0}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

diff --git a/Assets/Resources/material/UNFlag.mat.meta → Assets/Resources/material/UUFlag.mat.meta b/Assets/Resources/material/UNFlag.mat.meta → Assets/Resources/material/UUFlag.mat.meta
diff --git a/obj/Debug/.NETFramework,Version=v4.7.1.AssemblyAttributes.cs b/obj/Debug/.NETFramework,Version=v4.7.1.AssemblyAttributes.cs
@@ -0,0 +1,4 @@
+// <autogenerated />
+using System;
+using System.Reflection;
+[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.7.1", FrameworkDisplayName = ".NET Framework 4.7.1")]
diff --git a/obj/Debug/Assembly-CSharp-Editor-firstpass.csproj.AssemblyReference.cache b/obj/Debug/Assembly-CSharp-Editor-firstpass.csproj.AssemblyReference.cache
diff --git a/obj/Debug/Assembly-CSharp.csproj.AssemblyReference.cache b/obj/Debug/Assembly-CSharp.csproj.AssemblyReference.cache