Merge pull request #130 from Unity-Technologies/develop

release: v1.3.0
Unity-Technologies · Jul 7, 2023 · f675409 · f675409
2 parents 6e39bc2 + ee3cfdc
commit f675409
Show file tree

Hide file tree

Showing 161 changed files with 2,756 additions and 843 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,7 +13,7 @@ upm-ci.log
 !/[Aa]ssets/**/*.meta
 
 # User's project-specific settings implemented using Settings Manager
-/ProjectSettings/Packages
+**/ProjectSettings/Packages
 
 # The rest are general best practices for Unity projects
 **/.Editor/
@@ -27,7 +27,7 @@ upm-ci.log
 **/[Vv]alidationSuiteResults/
 
 # Project/user-specific settings using Settings Manager
-/ProjectSettings/Packages/
+**/ProjectSettings/Packages/
 # UserSettings introduced in 2020.1
 **/UserSettings/
 
@@ -89,3 +89,5 @@ crashlytics-build.properties
 
 # Mac file setting
 .DS_Store
+
+**/*_clone_*/
diff --git a/.yamato/project.metafile b/.yamato/project.metafile
@@ -4,7 +4,7 @@
 # Therefore, **do not** put an older V1-lifecycle ver. 
 #  like 2020.x or 2019.x on top of 'test_editors'
 test_editors:
-  - 2021.3
+  - 2022.3
 
 # Platforms that will be tested. The first entry in this array will also
 # be used for validation

diff --git a/Basic/2DSpaceShooter/.gitignore b/Basic/2DSpaceShooter/.gitignore
diff --git a/Basic/2DSpaceShooter/Assets/Materials/asteroids.mat b/Basic/2DSpaceShooter/Assets/Materials/asteroids.mat
@@ -10,6 +10,8 @@ Material:
   m_Name: asteroids
   m_Shader: {fileID: -6465566751694194690, guid: 95c504d90ae813849bd0dc5cde1b0f2f,
     type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
   m_ValidKeywords:
   - _SURFACE_TYPE_TRANSPARENT
   m_InvalidKeywords: []
@@ -22,6 +24,7 @@ Material:
   disabledShaderPasses:
   - DepthOnly
   - SHADOWCASTER
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -49,6 +52,7 @@ Material:
     m_Floats:
     - _Alpha: 1
     - _AlphaClip: 0
+    - _AlphaToMask: 0
     - _Blend: 0
     - _CastShadows: 0
     - _Cull: 2
@@ -80,4 +84,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 5
+  version: 7
diff --git a/Basic/2DSpaceShooter/Assets/Materials/blockGlow.mat b/Basic/2DSpaceShooter/Assets/Materials/blockGlow.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 5
+  version: 7
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -23,6 +23,8 @@ Material:
   m_Name: blockGlow
   m_Shader: {fileID: -6465566751694194690, guid: 95c504d90ae813849bd0dc5cde1b0f2f,
     type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
   m_ValidKeywords:
   - _SURFACE_TYPE_TRANSPARENT
   m_InvalidKeywords: []
@@ -35,6 +37,7 @@ Material:
   disabledShaderPasses:
   - DepthOnly
   - SHADOWCASTER
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -95,6 +98,7 @@ Material:
     - PixelSnap: 0
     - _Alpha: 0.3
     - _AlphaClip: 0
+    - _AlphaToMask: 0
     - _Blend: 0
     - _BlendOp: 0
     - _BumpScale: 1

diff --git a/Basic/2DSpaceShooter/Assets/Materials/blockGlow02.mat b/Basic/2DSpaceShooter/Assets/Materials/blockGlow02.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 5
+  version: 7
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -23,6 +23,8 @@ Material:
   m_Name: blockGlow02
   m_Shader: {fileID: -6465566751694194690, guid: 95c504d90ae813849bd0dc5cde1b0f2f,
     type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
   m_ValidKeywords:
   - _SURFACE_TYPE_TRANSPARENT
   m_InvalidKeywords: []
@@ -35,6 +37,7 @@ Material:
   disabledShaderPasses:
   - DepthOnly
   - SHADOWCASTER
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -95,6 +98,7 @@ Material:
     - PixelSnap: 0
     - _Alpha: 0.3
     - _AlphaClip: 0
+    - _AlphaToMask: 0
     - _Blend: 0
     - _BlendOp: 0
     - _BumpScale: 1

diff --git a/Basic/2DSpaceShooter/Assets/Materials/blocks.mat b/Basic/2DSpaceShooter/Assets/Materials/blocks.mat
@@ -2,21 +2,28 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: blocks
   m_Shader: {fileID: -6465566751694194690, guid: 79336e0b0e19a5c46be170f3cb26de75,
     type: 3}
-  m_ShaderKeywords: _ALPHABLEND_ON _GLOSSYREFLECTIONS_OFF _SPECULARHIGHLIGHTS_OFF
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords:
+  - _ALPHABLEND_ON
+  - _GLOSSYREFLECTIONS_OFF
+  - _SPECULARHIGHLIGHTS_OFF
   m_LightmapFlags: 0
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses: []
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -72,6 +79,7 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - PixelSnap: 0
     - _Alpha: 1
@@ -120,3 +128,16 @@ Material:
     - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
     - _TilingOffset: {r: 1, g: 1, b: 0, a: 0}
   m_BuildTextureStacks: []
+--- !u!114 &6249219236255181419
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7
diff --git a/Basic/2DSpaceShooter/Assets/Materials/bounds.mat b/Basic/2DSpaceShooter/Assets/Materials/bounds.mat
@@ -10,6 +10,8 @@ Material:
   m_Name: bounds
   m_Shader: {fileID: -6465566751694194690, guid: 95c504d90ae813849bd0dc5cde1b0f2f,
     type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
   m_ValidKeywords:
   - _SURFACE_TYPE_TRANSPARENT
   m_InvalidKeywords: []
@@ -22,6 +24,7 @@ Material:
   disabledShaderPasses:
   - DepthOnly
   - SHADOWCASTER
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -49,6 +52,7 @@ Material:
     m_Floats:
     - _Alpha: 0.67
     - _AlphaClip: 0
+    - _AlphaToMask: 0
     - _Blend: 2
     - _CastShadows: 0
     - _Cull: 2
@@ -79,4 +83,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 5
+  version: 7
diff --git a/Basic/2DSpaceShooter/Assets/Materials/bounds02.mat b/Basic/2DSpaceShooter/Assets/Materials/bounds02.mat
@@ -10,6 +10,8 @@ Material:
   m_Name: bounds02
   m_Shader: {fileID: -6465566751694194690, guid: 95c504d90ae813849bd0dc5cde1b0f2f,
     type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
   m_ValidKeywords:
   - _SURFACE_TYPE_TRANSPARENT
   m_InvalidKeywords: []
@@ -22,6 +24,7 @@ Material:
   disabledShaderPasses:
   - DepthOnly
   - SHADOWCASTER
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -49,6 +52,7 @@ Material:
     m_Floats:
     - _Alpha: 0.67
     - _AlphaClip: 0
+    - _AlphaToMask: 0
     - _Blend: 2
     - _CastShadows: 0
     - _Cull: 2
@@ -80,4 +84,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 5
+  version: 7
diff --git a/Basic/2DSpaceShooter/Assets/Materials/bullet.mat b/Basic/2DSpaceShooter/Assets/Materials/bullet.mat
@@ -10,6 +10,8 @@ Material:
   m_Name: bullet
   m_Shader: {fileID: -6465566751694194690, guid: 95c504d90ae813849bd0dc5cde1b0f2f,
     type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
   m_ValidKeywords:
   - _SURFACE_TYPE_TRANSPARENT
   m_InvalidKeywords: []
@@ -22,6 +24,7 @@ Material:
   disabledShaderPasses:
   - SHADOWCASTER
   - DepthOnly
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -49,6 +52,7 @@ Material:
     m_Floats:
     - _Alpha: 1
     - _AlphaClip: 0
+    - _AlphaToMask: 0
     - _Blend: 2
     - _CastShadows: 0
     - _Cull: 2
@@ -79,4 +83,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 5
+  version: 7