版本控制
This commit is contained in:
hahwu
parent
0390507b17
commit
2e13506a49
94
markdown/client.drawio
Normal file
94
markdown/client.drawio
Normal file
@ -0,0 +1,94 @@
|
||||
<mxfile host="65bd71144e">
|
||||
<diagram id="yXfoVTe7h1JpJVX9uj15" name="第 1 页">
|
||||
<mxGraphModel dx="756" dy="537" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" background="#616161" math="0" shadow="0">
|
||||
<root>
|
||||
<mxCell id="0"/>
|
||||
<mxCell id="1" parent="0"/>
|
||||
<mxCell id="2" value="ver1.04" style="ellipse;whiteSpace=wrap;html=1;aspect=fixed;" parent="1" vertex="1">
|
||||
<mxGeometry x="240" y="560" width="80" height="80" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="3" value="" style="endArrow=classic;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;" parent="1" source="2" edge="1">
|
||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
||||
<mxPoint x="390" y="420" as="sourcePoint"/>
|
||||
<mxPoint x="280" y="480" as="targetPoint"/>
|
||||
</mxGeometry>
|
||||
</mxCell>
|
||||
<mxCell id="4" value="ver1.05" style="ellipse;whiteSpace=wrap;html=1;aspect=fixed;" parent="1" vertex="1">
|
||||
<mxGeometry x="240" y="400" width="80" height="80" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="5" value="" style="endArrow=classic;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;" parent="1" source="4" edge="1">
|
||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
||||
<mxPoint x="390" y="420" as="sourcePoint"/>
|
||||
<mxPoint x="280" y="320" as="targetPoint"/>
|
||||
</mxGeometry>
|
||||
</mxCell>
|
||||
<mxCell id="6" value="ver1.06" style="ellipse;whiteSpace=wrap;html=1;aspect=fixed;" parent="1" vertex="1">
|
||||
<mxGeometry x="240" y="240" width="80" height="80" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="7" value="客户端版本控制<br>根据游戏版本进行分支创建，每次版本开发时个人都在新分支的基础上<br>新建自己的开发分支。版本发布时，只遴选需要提交的代码。确保QA是<br>稳定的分支（ver1.04）。QA测试通过时，直接使用版本分支代码进行打<br>包发布" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;" parent="1" vertex="1">
|
||||
<mxGeometry x="80" y="95" width="400" height="90" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="11" value="develop" style="ellipse;whiteSpace=wrap;html=1;aspect=fixed;" vertex="1" parent="1">
|
||||
<mxGeometry x="240" y="720" width="80" height="80" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="12" value="" style="endArrow=classic;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" edge="1" parent="1" source="11" target="2">
|
||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
||||
<mxPoint x="390" y="620" as="sourcePoint"/>
|
||||
<mxPoint x="440" y="570" as="targetPoint"/>
|
||||
</mxGeometry>
|
||||
</mxCell>
|
||||
<mxCell id="13" value="sence" style="ellipse;whiteSpace=wrap;html=1;aspect=fixed;" vertex="1" parent="1">
|
||||
<mxGeometry x="110" y="640" width="60" height="60" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="14" value="card" style="ellipse;whiteSpace=wrap;html=1;aspect=fixed;" vertex="1" parent="1">
|
||||
<mxGeometry x="415" y="560" width="60" height="60" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="15" value="playroom" style="ellipse;whiteSpace=wrap;html=1;aspect=fixed;" vertex="1" parent="1">
|
||||
<mxGeometry x="130" y="555" width="60" height="60" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="16" value="shop" style="ellipse;whiteSpace=wrap;html=1;aspect=fixed;" vertex="1" parent="1">
|
||||
<mxGeometry x="360" y="660" width="60" height="60" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="17" value="" style="endArrow=classic;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;exitX=0;exitY=0.5;exitDx=0;exitDy=0;" edge="1" parent="1" source="14" target="2">
|
||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
||||
<mxPoint x="390" y="620" as="sourcePoint"/>
|
||||
<mxPoint x="440" y="570" as="targetPoint"/>
|
||||
</mxGeometry>
|
||||
</mxCell>
|
||||
<mxCell id="18" value="" style="endArrow=classic;html=1;entryX=0.963;entryY=0.775;entryDx=0;entryDy=0;entryPerimeter=0;exitX=0.054;exitY=0.26;exitDx=0;exitDy=0;exitPerimeter=0;" edge="1" parent="1" source="16" target="2">
|
||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
||||
<mxPoint x="490" y="680" as="sourcePoint"/>
|
||||
<mxPoint x="540" y="630" as="targetPoint"/>
|
||||
</mxGeometry>
|
||||
</mxCell>
|
||||
<mxCell id="19" value="" style="endArrow=classic;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;exitX=0.967;exitY=0.676;exitDx=0;exitDy=0;exitPerimeter=0;" edge="1" parent="1" source="15" target="2">
|
||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
||||
<mxPoint x="190" y="600" as="sourcePoint"/>
|
||||
<mxPoint x="540" y="530" as="targetPoint"/>
|
||||
</mxGeometry>
|
||||
</mxCell>
|
||||
<mxCell id="20" value="" style="endArrow=classic;html=1;entryX=0;entryY=1;entryDx=0;entryDy=0;" edge="1" parent="1" target="2">
|
||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
||||
<mxPoint x="170" y="670" as="sourcePoint"/>
|
||||
<mxPoint x="540" y="530" as="targetPoint"/>
|
||||
</mxGeometry>
|
||||
</mxCell>
|
||||
<mxCell id="21" value="<font style="font-size: 9px;">遴选代码</font>" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;" vertex="1" parent="1">
|
||||
<mxGeometry x="190" y="570" width="60" height="30" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="22" value="<font style="font-size: 9px;">遴选代码</font>" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;" vertex="1" parent="1">
|
||||
<mxGeometry x="180" y="615" width="60" height="30" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="23" value="<font style="font-size: 9px;">遴选代码</font>" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;" vertex="1" parent="1">
|
||||
<mxGeometry x="210" y="670" width="60" height="30" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="24" value="<font style="font-size: 9px;">遴选代码</font>" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;" vertex="1" parent="1">
|
||||
<mxGeometry x="340" y="620" width="60" height="30" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="27" value="<font style="font-size: 9px;">遴选代码</font>" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;" vertex="1" parent="1">
|
||||
<mxGeometry x="340" y="570" width="60" height="30" as="geometry"/>
|
||||
</mxCell>
|
||||
</root>
|
||||
</mxGraphModel>
|
||||
</diagram>
|
||||
</mxfile>
|
||||
BIN
markdown/client.png
Normal file
BIN
markdown/client.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 48 KiB |
40
markdown/server.drawio
Normal file
40
markdown/server.drawio
Normal file
@ -0,0 +1,40 @@
|
||||
<mxfile host="65bd71144e">
|
||||
<diagram id="yXfoVTe7h1JpJVX9uj15" name="第 1 页">
|
||||
<mxGraphModel dx="1096" dy="779" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" background="#616161" math="0" shadow="0">
|
||||
<root>
|
||||
<mxCell id="0"/>
|
||||
<mxCell id="1" parent="0"/>
|
||||
<mxCell id="2" value="Develop" style="ellipse;whiteSpace=wrap;html=1;aspect=fixed;" vertex="1" parent="1">
|
||||
<mxGeometry x="240" y="600" width="80" height="80" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="3" value="" style="endArrow=classic;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;" edge="1" parent="1" source="2">
|
||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
||||
<mxPoint x="390" y="420" as="sourcePoint"/>
|
||||
<mxPoint x="280" y="480" as="targetPoint"/>
|
||||
</mxGeometry>
|
||||
</mxCell>
|
||||
<mxCell id="4" value="QA" style="ellipse;whiteSpace=wrap;html=1;aspect=fixed;" vertex="1" parent="1">
|
||||
<mxGeometry x="240" y="400" width="80" height="80" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="5" value="" style="endArrow=classic;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;" edge="1" parent="1" source="4">
|
||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
||||
<mxPoint x="390" y="420" as="sourcePoint"/>
|
||||
<mxPoint x="280" y="280" as="targetPoint"/>
|
||||
</mxGeometry>
|
||||
</mxCell>
|
||||
<mxCell id="6" value="Online" style="ellipse;whiteSpace=wrap;html=1;aspect=fixed;" vertex="1" parent="1">
|
||||
<mxGeometry x="240" y="200" width="80" height="80" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="7" value="服务端代码版本控制：<br>1.Develop branch:开发分支，目前在开发中的功能代码集合<br>2.QA branch:测试分支，包含版本发布前所有的功能代码<br>3.Online branch:线上分支，包含版本所有功能且测试通过，环境稳定" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;" vertex="1" parent="1">
|
||||
<mxGeometry x="85" y="105" width="390" height="70" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="8" value="遴选需要提交的代码" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;" vertex="1" parent="1">
|
||||
<mxGeometry x="320" y="530" width="130" height="30" as="geometry"/>
|
||||
</mxCell>
|
||||
<mxCell id="9" value="版本测试通过之后，直接合并分支" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;" vertex="1" parent="1">
|
||||
<mxGeometry x="320" y="330" width="200" height="30" as="geometry"/>
|
||||
</mxCell>
|
||||
</root>
|
||||
</mxGraphModel>
|
||||
</diagram>
|
||||
</mxfile>
|
||||
BIN
markdown/server.png
Normal file
BIN
markdown/server.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 31 KiB |
Loading…
Reference in New Issue
Block a user