Table of contents
Work progress, enter the front stage
The back-end already has some functions, but the front-end has not been developed from the content of the previous back-end due to materials and game logic, so this part cannot be tested in time.
At the same time, because the front-end workload is too large, it is transferred to the front-end work according to the source plan. Wait until the last integration test.
Before officially transferring to the front end, the hosting of the plasticSCM project should be implemented.
First of all, implement the multi-person collaborative development environment on the unity side.
Unity collaborative development environment plasticSCM
There are many differences in the unity engine development project. If version control is still performed through git, it will increase the time and cost of project management version control to a certain extent.
compared to git
plasticSCM is a multi-person collaborative development platform officially launched by unity.
- The client has
可视化functions such as branching and file difference comparison. - unityEditor与plasticSCM
高度集成，使用方便。 高效、自动解决大部分冲突。
It greatly facilitates the collaborative development of unity projects.
If you encounter any usage problems, you can go to the Unity (China) community to ask questions, and there are many community customer service staff who will be very enthusiastic and responsible to provide help.
An introduction to plasticSCM published by the official customer service in the community (including all concepts and functions):
developer.unity.cn/projects/602e2034edbc2a002040ee7c
Some key concept points, operation, interface are listed below
1. Create a new Branch
Here you need to pay attention to the difference between the Main branch and the Branch branch! While creating the PlasticSCM project, we will create a remote warehouse for your project.并在Main主线分支之外，自动创建一个新的Branch分支，作为您正在工作的分支，其目的是为了避免Main分支被作为直接修改和工作的位置。
You can see that in addition to the main branch, a person creates his own exclusive branch and transfers his workspace to his own branch. Do not directly modify the main branch. !
The visual interface can also be distinguished by configuring colors for each account.
This picture is a visualization after a long time of development. The change visualization view of the entire project branch will basically be kept for 30 days, that is, this screenshot was taken in 6.11, and the ones before 5.11 are all lost.
2. Push, pull, merge, etc.
pull：
Right-click on the Main mainline branch and select "Merge from this changeset..."
push:
In Unity, you can open the PlasticSCM panel and check in it. Don't forget to add comments (good habit), you can submit to your own branch after checkin.
merge：
To continue submitting to the main branch,
right-click on the Branch branch at this time, select "Merge from this changeset to...", and select main. Don't forget to write a comment, you can record the changes this time, etc.
When something goes wrong, it is convenient to determine which node to return to.
另外大家要注意尽量避免冲突。 比如不要同时开发一个场景然后一起推到主分支，这回引发冲突并且会导致一个人白做！
If in doubt, please refer to the official explanation.
An extra mention:
when merging or pulling 发生冲突时, there are often 保留源、保留目标options.
The source here refers to the source branch of the operation data.
target refers to the destination branch for this operation.
For example, I want to pull, but there is a conflict between my branch and the main branch. At this time, the source is main and the target is my branch (because this is main→my branch), so if you choose to keep the source, it will be main. content override own branch...
Summarize
Enter the front end and learn to configure plasticSCM.
Implemented a multi-person collaborative development environment on the unity side.