兄弟会話シーンPrefab化/ シーン情報更新

2021-10-13 14:08:56 +09:00 · 2021-10-13 14:08:56 +09:00 · 937c271de9
parent 8cec1b3f81
commit 937c271de9
6 changed files with 5679 additions and 5530 deletions
--- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Conversation.meta
+++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Conversation.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 467dcc008e4b64c73ac38d5ef65f8cf2
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Conversation/Canvas.prefab
+++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Conversation/Canvas.prefab
--- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Conversation/Canvas.prefab.meta
+++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Conversation/Canvas.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: dcd945ce96b2149a0a5f9f2be4b2fbea
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/popcorn/Assets/MyGame/Scenes/marketing/conversation.unity
+++ b/popcorn/Assets/MyGame/Scenes/marketing/conversation.unity
--- a/popcorn/Assets/MyGame/Scripts/TransitionManager.cs
+++ b/popcorn/Assets/MyGame/Scripts/TransitionManager.cs
@ -27,6 +27,8 @@ public enum GameScenes
    BulkOrderAchievement,
    BulkOrderCancel,
    BulkOrderTelephone,
+    ShopLevel,
+    Conversation,
    SettingsDialog,
    DebugOption,
    UnableWatchVideoDialog,
--- a/popcorn/ProjectSettings/EditorBuildSettings.asset
+++ b/popcorn/ProjectSettings/EditorBuildSettings.asset
@ -71,4 +71,10 @@ EditorBuildSettings:
  - enabled: 1
    path: Assets/MyGame/Scenes/Main/BulkOrderTelephone.unity
    guid: a943c2b7756a1c844a07e291f084523e
+  - enabled: 1
+    path: Assets/MyGame/Scenes/marketing/StoreLevel.unity
+    guid: dc598de0b6795c7438594565a5c87cba
+  - enabled: 1
+    path: Assets/MyGame/Scenes/marketing/Conversation.unity
+    guid: 92908ec648b4a114c80cb309941b14f4
  m_configObjects: {}