Merge branch 'dev' into feat/pet
Showing
- Assets/DungeonFreeVersion/Prefabs/_Boxes.prefab 26 additions, 5 deletionsAssets/DungeonFreeVersion/Prefabs/_Boxes.prefab
- Assets/Resources/Data/Cutscene/Story1_1.asset 1 addition, 1 deletionAssets/Resources/Data/Cutscene/Story1_1.asset
- Assets/Resources/Data/Cutscene/Test_Cutscene.asset 4 additions, 1 deletionAssets/Resources/Data/Cutscene/Test_Cutscene.asset
- Assets/Resources/Data/Cutscene/Tutorial0.asset 75 additions, 0 deletionsAssets/Resources/Data/Cutscene/Tutorial0.asset
- Assets/Resources/Data/Cutscene/Tutorial0.asset.meta 8 additions, 0 deletionsAssets/Resources/Data/Cutscene/Tutorial0.asset.meta
- Assets/Resources/Data/Cutscene/Tutorial1.asset 156 additions, 0 deletionsAssets/Resources/Data/Cutscene/Tutorial1.asset
- Assets/Resources/Data/Cutscene/Tutorial1.asset.meta 8 additions, 0 deletionsAssets/Resources/Data/Cutscene/Tutorial1.asset.meta
- Assets/Resources/Data/Cutscene/Tutorial2.asset 106 additions, 0 deletionsAssets/Resources/Data/Cutscene/Tutorial2.asset
- Assets/Resources/Data/Cutscene/Tutorial2.asset.meta 8 additions, 0 deletionsAssets/Resources/Data/Cutscene/Tutorial2.asset.meta
- Assets/Resources/Data/Cutscene/Tutorial3.asset 55 additions, 0 deletionsAssets/Resources/Data/Cutscene/Tutorial3.asset
- Assets/Resources/Data/Cutscene/Tutorial3.asset.meta 8 additions, 0 deletionsAssets/Resources/Data/Cutscene/Tutorial3.asset.meta
- Assets/Resources/Data/Weapon/NoWeapon/NoWeaponData.asset 1 addition, 1 deletionAssets/Resources/Data/Weapon/NoWeapon/NoWeaponData.asset
- Assets/Resources/Prefabs/InGameUI.prefab 1 addition, 0 deletionsAssets/Resources/Prefabs/InGameUI.prefab
- Assets/Resources/Prefabs/Interactable/Shop.prefab 9 additions, 1 deletionAssets/Resources/Prefabs/Interactable/Shop.prefab
- Assets/Resources/Prefabs/Player.prefab 1 addition, 3 deletionsAssets/Resources/Prefabs/Player.prefab
- Assets/UI/MainMenuScene/MainMenu/MainMenuController.cs 3 additions, 1 deletionAssets/UI/MainMenuScene/MainMenu/MainMenuController.cs
- Assets/UI/MainMenuScene/MainMenuManager.cs 7 additions, 3 deletionsAssets/UI/MainMenuScene/MainMenuManager.cs
- Assets/_Resources/Models/Characters/Jean/Animations/JeanModel.controller 53 additions, 1 deletion...es/Models/Characters/Jean/Animations/JeanModel.controller
- Assets/_Scenes/DevRoom.unity 68 additions, 112 deletionsAssets/_Scenes/DevRoom.unity
- Assets/_Scenes/MainMenu.unity 2524 additions, 2522 deletionsAssets/_Scenes/MainMenu.unity
Please register or sign in to comment