Week7 Sunday update character type3#9
Open
qjunchen wants to merge 4 commits intoYiMysty:masterfrom
qjunchen:master
Open
Week7 Sunday update character type3#9qjunchen wants to merge 4 commits intoYiMysty:masterfrom qjunchen:master
qjunchen wants to merge 4 commits intoYiMysty:masterfrom
qjunchen:master
Conversation
Like the title, add a new character pattern in our game. The new guy can use a weapon.
Conflicts: pixel/Assets/2DPlatformTutorial.unity pixel/Assets/SampleAssets/2D/Sprites/Scripts/PlatformerCharacter2D.cs pixel/Library/CurrentLayout.dwlt pixel/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll pixel/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb pixel/Library/ScriptAssemblies/Assembly-CSharp.dll pixel/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb pixel/Library/assetDatabase3 pixel/Library/expandedItems pixel/Library/guidmapper pixel/Library/metadata/d0/d08f91df3bd212f429df17f53ce2f364 pixel/pixel-csharp.sln pixel/pixel.sln
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Like the title, add a new character pattern in our game. The new guy
can use a weapon.