Merge branch '1.0'

knowlife4 · Mar 10, 2023 · a250785 · a250785
2 parents 3298c41 + 2ed819e
commit a250785
Show file tree

Hide file tree

Showing 142 changed files with 14 additions and 5,720 deletions.
diff --git a/.gitignore b/.gitignore
@@ -72,7 +72,5 @@ crashlytics-build.properties
 # Temporary auto-generated Android Assets
 /[Aa]ssets/[Ss]treamingAssets/aa.meta
 /[Aa]ssets/[Ss]treamingAssets/aa/*
-BBT URP Conversion/ProjectSettings/TimeManager.asset
-BBT URP Conversion/ProjectSettings/TimeManager.asset
 *.dwlt
 *.dwlt
diff --git a/ECT/.vscode/settings.json b/ECT/.vscode/settings.json
diff --git a/ECT/Assets/Runtime/Attributes/SceneReferenceAttribute.cs.meta b/ECT/Assets/Runtime/Attributes/SceneReferenceAttribute.cs.meta
diff --git a/ECT/Assets/Runtime/Groups/ECTSceneReferenceGroup.cs.meta b/ECT/Assets/Runtime/Groups/ECTSceneReferenceGroup.cs.meta
diff --git a/ECT/Assets/Runtime/Interfaces/IReferenceComponent.cs.meta b/ECT/Assets/Runtime/Interfaces/IReferenceComponent.cs.meta
diff --git a/ECT/Assets/Runtime/Interfaces/ISceneReference.cs.meta b/ECT/Assets/Runtime/Interfaces/ISceneReference.cs.meta
diff --git a/ECT/Assets/Samples.meta b/ECT/Assets/Samples.meta
diff --git a/ECT/Assets/Samples/Platformer.meta b/ECT/Assets/Samples/Platformer.meta
diff --git a/ECT/Assets/Samples/Platformer/Components/Player.meta b/ECT/Assets/Samples/Platformer/Components/Player.meta
diff --git a/ECT/Assets/Samples/Platformer/Components/Player/MovementRotate.asset b/ECT/Assets/Samples/Platformer/Components/Player/MovementRotate.asset
diff --git a/ECT/Assets/Samples/Platformer/Components/Player/MovementRotate.asset.meta b/ECT/Assets/Samples/Platformer/Components/Player/MovementRotate.asset.meta
diff --git a/ECT/Assets/Samples/Platformer/Components/Player/MovementWalk.asset b/ECT/Assets/Samples/Platformer/Components/Player/MovementWalk.asset
diff --git a/ECT/Assets/Samples/Platformer/Components/Player/MovementWalk.asset.meta b/ECT/Assets/Samples/Platformer/Components/Player/MovementWalk.asset.meta
diff --git a/ECT/Assets/Samples/Platformer/Components/Player/PlayerMovement.asset b/ECT/Assets/Samples/Platformer/Components/Player/PlayerMovement.asset
diff --git a/ECT/Assets/Samples/Platformer/Components/Player/PlayerMovement.asset.meta b/ECT/Assets/Samples/Platformer/Components/Player/PlayerMovement.asset.meta
diff --git a/ECT/Assets/Samples/Platformer/Materials.meta b/ECT/Assets/Samples/Platformer/Materials.meta
diff --git a/ECT/Assets/Samples/Platformer/Materials/Test.mat b/ECT/Assets/Samples/Platformer/Materials/Test.mat
diff --git a/ECT/Assets/Samples/Platformer/Materials/Test.mat.meta b/ECT/Assets/Samples/Platformer/Materials/Test.mat.meta