Merge fix
Showing
- Assets/Resources/Prefabs/Stage_Default.prefab 317 additions, 27 deletionsAssets/Resources/Prefabs/Stage_Default.prefab
- Assets/Resources/Prefabs/TestPrefabs/HidingCanvas.prefab 652 additions, 113 deletionsAssets/Resources/Prefabs/TestPrefabs/HidingCanvas.prefab
- Assets/Resources/Prefabs/TestPrefabs/HidingCanvas.prefab.meta 1 addition, 1 deletion...ts/Resources/Prefabs/TestPrefabs/HidingCanvas.prefab.meta
- Assets/Resources/Prefabs/UI/Facts/Factscreen_mobile.prefab 0 additions, 121 deletionsAssets/Resources/Prefabs/UI/Facts/Factscreen_mobile.prefab
- Assets/Resources/Prefabs/UI/Facts/Factscreen_mobile.prefab.meta 0 additions, 7 deletions.../Resources/Prefabs/UI/Facts/Factscreen_mobile.prefab.meta
- Assets/Resources/Prefabs/UI/FrameITUI.prefab 107 additions, 101 deletionsAssets/Resources/Prefabs/UI/FrameITUI.prefab
- Assets/Resources/Prefabs/UI/Ingame/FrameITUI_mobile.prefab 107 additions, 251 deletionsAssets/Resources/Prefabs/UI/Ingame/FrameITUI_mobile.prefab
- Assets/Resources/Prefabs/UI/Ingame/HidingCanvas.prefab 1515 additions, 1628 deletionsAssets/Resources/Prefabs/UI/Ingame/HidingCanvas.prefab
- Assets/Resources/Prefabs/UI/Ingame/HidingCanvas.prefab.meta 1 addition, 1 deletionAssets/Resources/Prefabs/UI/Ingame/HidingCanvas.prefab.meta
- Assets/Resources/Prefabs/UI/Ingame/HidingCanvas_mobile.prefab 0 additions, 121 deletions...ts/Resources/Prefabs/UI/Ingame/HidingCanvas_mobile.prefab
- Assets/Resources/Prefabs/UI/Ingame/HidingCanvas_mobile.prefab.meta 0 additions, 7 deletions...sources/Prefabs/UI/Ingame/HidingCanvas_mobile.prefab.meta
- Assets/ScriptableObjects/Gadgets/MiddlePointDataContainerGadgetInit.asset 0 additions, 0 deletions...eObjects/Gadgets/MiddlePointDataContainerGadgetInit.asset
- Assets/ScriptableObjects/Gadgets/MiddlePointDataContainerGadgetInit.asset.meta 0 additions, 0 deletions...cts/Gadgets/MiddlePointDataContainerGadgetInit.asset.meta
- Assets/Scripts/InventoryStuff/DisplayFacts.cs 1 addition, 1 deletionAssets/Scripts/InventoryStuff/DisplayFacts.cs
- Assets/Scripts/InventoryStuff/ToggleRotateImage.cs 1 addition, 1 deletionAssets/Scripts/InventoryStuff/ToggleRotateImage.cs
- Assets/Scripts/MeshGenerator/ShapeGenerator.cs 5 additions, 1 deletionAssets/Scripts/MeshGenerator/ShapeGenerator.cs
Loading
Please register or sign in to comment