Merge remote-tracking branch 'origin/main' into work_branch

2026-05-28 13:39:01 +05:45
parent 84fea79158 874c18df1c
commit f1f3a35c6d
39 changed files with 1092 additions and 266 deletions
--- a/Assets/Darkmatter/Content/Intro.meta
+++ b/Assets/Darkmatter/Content/Intro.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 15b7f9e434b1446aabb77bffc9f22780
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Darkmatter/Content/Intro/Create_intro_for_kids_game_202605272007.mp4
+++ b/Assets/Darkmatter/Content/Intro/Create_intro_for_kids_game_202605272007.mp4
--- a/Assets/Darkmatter/Content/Intro/Create_intro_for_kids_game_202605272007.mp4.meta
+++ b/Assets/Darkmatter/Content/Intro/Create_intro_for_kids_game_202605272007.mp4.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: ec78f9cae5b834662a0005dcbadd12c6
+VideoClipImporter:
+  externalObjects: {}
+  serializedVersion: 3
+  frameRange: 0
+  startFrame: -1
+  endFrame: -1
+  colorSpace: 0
+  deinterlace: 0
+  encodeAlpha: 0
+  flipVertical: 0
+  flipHorizontal: 0
+  importAudio: 1
+  targetSettings: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: