main char and subRepo (#28)

Metaverse-Crowdsource · Nov 28, 2023 · 1da5062 · 1da5062
2 parents b162d40 + 25a557f
commit 1da5062
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 3 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,4 @@
+[submodule "DarkFlowPrivate"]
+	path = DarkFlowPrivate
+	url = https://github.com/Metaverse-Crowdsource/DarkFlowPrivate
+	branch = main
diff --git a/DarkFlow/Assets/Prefabs/Main CHAR.prefab → DarkFlow/Assets/Prefabs/Main CHARTEST.prefab b/DarkFlow/Assets/Prefabs/Main CHAR.prefab → DarkFlow/Assets/Prefabs/Main CHARTEST.prefab
@@ -10,7 +10,7 @@ GameObject:
   m_Component:
   - component: {fileID: 6083757005595752213}
   m_Layer: 0
-  m_Name: Main CHAR
+  m_Name: Main CHARTEST
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

diff --git a/...Flow/Assets/Prefabs/Main CHAR.prefab.meta → .../Assets/Prefabs/Main CHARTEST.prefab.meta b/...Flow/Assets/Prefabs/Main CHAR.prefab.meta → .../Assets/Prefabs/Main CHARTEST.prefab.meta
diff --git a/...Flow/Assets/Prefabs/PlayerArmature.prefab → DarkFlow/Assets/Prefabs/MainChar.prefab b/...Flow/Assets/Prefabs/PlayerArmature.prefab → DarkFlow/Assets/Prefabs/MainChar.prefab
@@ -1038,7 +1038,7 @@ GameObject:
   - component: {fileID: 135756642000475821}
   - component: {fileID: 4416926081852918493}
   m_Layer: 8
-  m_Name: PlayerArmature
+  m_Name: MainChar
   m_TagString: Player
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

diff --git a/...Assets/Prefabs/PlayerArmature.prefab.meta → DarkFlow/Assets/Prefabs/MainChar.prefab.meta b/...Assets/Prefabs/PlayerArmature.prefab.meta → DarkFlow/Assets/Prefabs/MainChar.prefab.meta
diff --git a/DarkFlow/Assets/Scenes/DemoNight.unity b/DarkFlow/Assets/Scenes/DemoNight.unity
@@ -634,7 +634,7 @@ PrefabInstance:
     - target: {fileID: 4416926081852918481, guid: 64dce48905ffd9b4293e595fa6941544,
         type: 3}
       propertyPath: m_Name
-      value: PlayerArmature
+      value: MainChar
       objectReference: {fileID: 0}
     - target: {fileID: 4416926081852918493, guid: 64dce48905ffd9b4293e595fa6941544,
         type: 3}

diff --git a/DarkFlowPrivate b/DarkFlowPrivate