resolution conflit v2
Showing
- .gitignore 1 addition, 0 deletions.gitignore
- .vs/cityescape/xs/UserPrefs.xml 0 additions, 30 deletions.vs/cityescape/xs/UserPrefs.xml
- .vs/cityescape/xs/project-cache/Assembly-CSharp-Debug.json 0 additions, 1 deletion.vs/cityescape/xs/project-cache/Assembly-CSharp-Debug.json
- Assets/Animations/Transition.meta 8 additions, 0 deletionsAssets/Animations/Transition.meta
- Assets/Animations/Transition/Canvas.controller 228 additions, 0 deletionsAssets/Animations/Transition/Canvas.controller
- Assets/Animations/Transition/Canvas.controller.meta 8 additions, 0 deletionsAssets/Animations/Transition/Canvas.controller.meta
- Assets/Animations/Transition/CircleSwipe.anim 116 additions, 0 deletionsAssets/Animations/Transition/CircleSwipe.anim
- Assets/Animations/Transition/CircleSwipe.anim.meta 8 additions, 0 deletionsAssets/Animations/Transition/CircleSwipe.anim.meta
- Assets/Animations/Transition/Image.prefab 77 additions, 0 deletionsAssets/Animations/Transition/Image.prefab
- Assets/Animations/Transition/Image.prefab.meta 7 additions, 0 deletionsAssets/Animations/Transition/Image.prefab.meta
- Assets/Import/Font.meta 8 additions, 0 deletionsAssets/Import/Font.meta
- Assets/Import/Font/CHARRED ZARD.ttf 0 additions, 0 deletionsAssets/Import/Font/CHARRED ZARD.ttf
- Assets/Import/Font/CHARRED ZARD.ttf.meta 21 additions, 0 deletionsAssets/Import/Font/CHARRED ZARD.ttf.meta
- Assets/Import/Image.meta 8 additions, 0 deletionsAssets/Import/Image.meta
- Assets/Import/Image/circle.png 0 additions, 0 deletionsAssets/Import/Image/circle.png
- Assets/Import/Image/circle.png.meta 96 additions, 0 deletionsAssets/Import/Image/circle.png.meta
- Assets/Import/Image/fond.jpg 0 additions, 0 deletionsAssets/Import/Image/fond.jpg
- Assets/Import/Image/fond.jpg.meta 96 additions, 0 deletionsAssets/Import/Image/fond.jpg.meta
- Assets/Prefabs/Player.prefab 22 additions, 1 deletionAssets/Prefabs/Player.prefab
- Assets/Scenes/Melvyn.unity 17257 additions, 0 deletionsAssets/Scenes/Melvyn.unity
Please register or sign in to comment