[Unity 组件参考手册]iOS：资源服务器指南之资源服务器的日常使用

.

This section explains the common tasks, workflow and best practices for using the Asset Server on a day-to-day basis.这一部分讲的是通用任务，工作流程和基于日常资源服务器使用的惯例。
Getting Started 开始If you are joining a team that has a lot of work stored on the Asset Server already, this is the quickest way to get up and&nbsp***nning correctly. If you are starting your own project from scratch, you can skip down to the Workflow Fundamentals section.如果你加入一个已经有大量工作存储在资源服务器上的团队，这是开始工作和正确运行最快的方法。如果你从头开始你自己的项目，你可以翻到工作流程的基本原理（Workflow Fundamentals）章节。    Create a new empty Project with no packages imported
    创建一个没有导入任何包的新的空工程
    Go to Edit->roject Settings->Editor and select Asset Server as the version control mode
    找到Edit->roject Settings->Editor并在版本控制模式下选择资源服务器(Asset Server)
    From the menubar, select Window->Version
    从菜单栏选择Window->Version
    Click the Connection button
    点击连接（Connection）按钮
    Enter your user name and password (provided by your Asset Server administrator)
    输入你的用户名和密码（从你的资源服务器管理员处获得）
    Click Show Projects and select the desired project
    点击显示工程（Show Projects）并选择想要的工程
    Click Connect
    点击连接（Connect）
    Click the Update tab
    点击更新(Update)标签页
    Click the Update button
    点击更新（Update）按钮
    If a conflict occurs, discard all local versions
    如果发生冲突，忽略所有的本地版本
    Wait for the update to complete
    等待更新直到完成
    You are ready to go
    现在你准备好啦 Continue reading for detailed information on how to use the Asset Server effectively every day.继续每天阅读如何有效的使用资源服务器的细节信息。Workflow Fundamentals 工作流程的基本原理When using the Asset Server with a multi-person team, it is generally good practice to Update all changed assets from the server when you begin working, and Commit your changes at the end of the day, or whenever you're done working. You should also commit changes when you have made significant progress on something, even if it is in the middle of the day. Committing your changes regularly and frequently is recommended.当在一个多人团队中使用资源服务器时，有个通用的好方法是，当你开始工作时从服务器更新所有有改变的资源，并在每天结束时或完成你的工作后提交你的更改。你还需要在某方面有重要进展时提交更改，即使是在当天中午。
Understanding the Server View 理解服务器视图The Server View is your window into the Asset Server you're connected to. You can open the Server View by selecting Window->Version Control.服务器视图（Server View）就是你连接到的资源服务器的窗口。你可以选择Window->Version Control打开服务器视图。
The Overview tab 概览标签页The Server View is broken into tabs: Overview Update, and Commit. Overview will show you any differences between your local project and the latest version on the server with options to quickly commit local changes or download the latest updates. Update will show you the latest remote changes on the server and allow you to download them to your local project. Commit allows you to create a Changeset and commit it to the server for others to download.服务器视图被划分成几个标签页：概览（Overview），更新（Update），和提交（Commit）。概览（Overview）将显示你本地项目和服务器上最后一个版本的所有区别，并有选项可以快速的提交本地更改或是下载最后的更新。更新（Update）将显示服务器上之后的更改并允许你下载到你本地的工程。提交（Commit）允许你创建一个更改集合（Changeset）并提交到服务器供其他人下载。
Connecting to the server 连接到服务器Before you can use the asset server, you must connect to it. To do this you click the Connection button, which takes you to the connection screen:在你可以使用资源服务器之前，你必需连接到服务器。你点击连接（Connection）按钮来连接，这将把你带到连接页面：
The Asset Server connection screen 资源服务器连接截屏Here you need to fill in:这里是需要你填写的：    Server address 服务器地址
    Username 用户名称
    Password 密码By clicking Show projects you can now see the available projects on the asset server, and choose which one to connect to by clicking Connect. Note that the username and password you use can be obtain from your system administrator. Your system administrator created accounts when they installed Asset Server.点击显示工程（Show projects）你可以马上看到资源服务器上可用的工程，然后选择想要更新的点击连接（Connect）。注意你使用的用户名和密码可以向你的系统管理员索取。你的系统管理员在他安装资源服务器时创建了账号。
Updating from the Server 从服务器更新To download all updates from the server, select the Update tab from the Overview tab and you will see a list of the latest committed Changesets. By selecting one of these you can see what was changed in the project as well as the provided commit message. Click Update and you will begin downloading all Changeset updates.要从服务器上下载任何更新，在概览标签页（Overview）中选择更新（Update）标签页之后你将看到最终提交更改集合的列表。通过选择其中一个你可以看到工程中都改变了些什么还有提供的提交信息。点击更新（Update）然后你可以开始下载所有的更改集合更新。
The Update Tab 更新标签页
Committing Changes to the Server 提交修改到服务器When you have made a change to your local project and you want to store those changes on the server, you use the top Commit tab.当你对你本地的工程做了一些修改然后你想把这些更改保存到服务器上，使用顶部的提交（Commit）标签页。
The Commit tab 提交标签页Now you will be able to see all the local changes made to the project since your last update, and will be able to select which changes you wish to upload to the server. You can add changes to the changeset either by manually dragging them into the changeset field, or by using the buttons placed below the commit message field. Remember to type in a commit message which will help you when you compare versions or revert to an earlier version later on, both of which are discussed below.现在你将可以查看自从你最后一次更新后所有对工程所做的本地修改，并将可以选择你希望上传哪些更新到服务器。你可以手动的拖动这些项目到修改集合区域将它们添加修改到修改集合中，或者使用提交信息区域上的按钮。记住要输入一条提交信息，这将在你对比版本或者在以后回滚到一个早期的版本时帮到你，这两者都是在下面讨论。
Resolving conflicts 解决冲突With multiple people working on the same collection of data, conflicts will inevitably arise. Remember, there is no need to panic! If a conflict exists, you will be presented with the Conflict Resolution dialog when updating your project.当多个人在同一个数据集上工作，冲突将会不可避免的发生。记住，这不需要恐慌！如果存在一个冲突，当年你更新你的工程时将显示给你一个冲突解决（Conflict Resolution）对话框。
The Conflict Resolution screen 冲突解决截屏Here, you will be informed of each individual conflict, and be presented with different options to resolve each individual conflict. For any single conflict, you can select Skip Asset (which will not download that asset from the server), Discard My Changes (which will completely overwrite your local version of the asset) or Ignore Server Changes (which will ignore the changes others made to the asset and after this update you will be able to commit your local changes over server ones) for each individual conflict. Additionally, you can select Merge for text assets like scripts to merge the server version with the local version.看，每个单独的冲突都会通知你，并且带有解决每个单独冲突的不同的选项。对任何的单个冲突，你可以为每个单独的冲突选择忽略资源（Skip Asset）（这将不会从服务器下载这个资源），丢弃我的修改（Discard My Changes）（这将会完全的覆盖掉你这个资源的本地版本）或者忽略服务器修改（Ignore Server Changes）（这将会忽略别人对这个资源所做的修改并且这次更新后允许你提交你的本地修改以覆盖掉服务器上的版本）。另外，你可以为文本资源如脚本选择融合（Merge）来融合服务器版本和本地版本。Note: If you choose to discard your changes, the asset will be updated to the latest version from the server (i.e., it will incorporate other users' changes that have been made while you were working). If you want to get the asset back as it was when you started working, you should revert to the specific version that you checked out. (See Browsing revision history and reverting assets below.)注意：如果你选择丢弃你的修改，资源将被更新到服务器上最新的版本（也就是说，这将包含其他用户在你工作期间所做的的更改）。如果你想要找回当你开始工作时的资源，你需要恢复到你检出的指定版本。（参看下面的浏览历史版本和恢复资源。）If you&nbsp***n into a conflict while you are committing your local changes, Unity will refuse to commit your changes and inform you that a conflict exists. To resolve the conflicts, select Update. Your local changes will not automatically be overwritten. At this point you will see the Conflict Resolution dialog, and can follow the ins***ctions in the above paragraph.如果在你提交你的本地修改时遇到冲突，Unity将拒绝提交你的修改并提示你存在一个冲突。要解决这些冲突，选择更新（Update）。你的本地更改将自动被覆盖。在这一点上你可以查看冲突解决（Conflict Resolution）对话框，并按照上面段落中的指令操作。
Browsing revision history and reverting assets
浏览历史版本并恢复资源The Asset Server retains all uploaded versions of an asset in its database, so you can revert your local version to an earlier version at any time. You can either select to restore the entire project or single files. To revert to an older version of an asset or a project, select the Overview tab then click Show History listed under Asset Server Actions. You will now see a list of all commits and be able to select and restore any file or all project to an older version.资源服务器在它的数据库中保留了所有上传的版本，所以你能够恢复你的本地版本到一个任意时间的早期版本。你还可以选择还原整个工程或是单个文件。若要将一个资源或一个工程还原到一个旧的版本，选择概览（Overview）标签页然后点击列出在资源服务器动作（Asset Server Actions）下的显示历史（Show History）。你现在将可以看到一个所有可选择并还原任意文件或所有工程到一个旧版本的提交列表。
The History dialog 历史对话框Here, you can see the version number and added comments with each version of the asset or project. This is one reason why descriptive comments are helpful. Select any asset to see its history or Entire Project for all changes made in project. Find revision you need. You can either select whole revision or particular asset in revision. Then click Download Selected File to get your local asset replaced with a copy of the selected revision. Revert All Project will revert entire project to selected revision.在这里，你能够看到版本号和资源或工程的每一个版本的附加注释。这是为何描述注释会有所帮助的一个原因。选择任意的资源查看其历史或选择整个工程（Entire Project）查看对工程所做的所有修改。找到你需要的修订。你可以选择整个修订或是修订中的一部分。点击下载选择的文件（Download Selected File）使用一个选择的修订副本替换掉你的本地资源。恢复所有工程（Revert All Project）将恢复整个工程到选定的修订。Prior to reverting, if there are any differences between your local version and the selected server version, those changes will be lost when the local version is reverted.在恢复之前，如果在你本地版本和选择的服务器版本之间有任何不同，这些修改将在本地版本恢复后丢失。If you only want to abandon the changes made to the local copy, you don't have to revert. You can discard those local modifications by selecting Discard Changes in the main asset server window. This will immediately download the current version of the project from the server to your local Project.如果你仅仅想要丢弃对本地拷贝所做的修改，你不需要进行恢复。你可以选择主资源服务器窗口中的丢弃修改（Discard Changes）丢弃这些本地修改。这将立即从服务器下载工程的当前版本到你的本地工程。
Comparing asset versions 比较资源版本If you're curious to see the differences between two particular versions you can explicitly compare them. To do this, open History window, select revision and asset you want to compare and press Compare to Local Version. If you need to compare two different revisions of an asset - right click on it, in the context menu select Compare to Another Revision then find revision you want to compare to and select it.如果你很好奇想要看看两个指定版本之间的不同你可以明确的比较它们。想要做到这一点，打开历史（History）窗口，选择你想要比较的修订和资源并按下与本地版本比较（Compare to Local Version）。如果你需要比较一个资源的两个不同的修订——在它上面右键点击，在上下文菜单中选择与另外的修订比较（Compare to Another Revision）然后找到你想要比较的修订并选择它。Note: this feature requires that you have one of supported file diff/merge tools installed. Supported tools are:注意：这个特性需要你安装有支持文件比较、融合（diff/merge）的工具。支持的工具有：    On Windows:
        TortoiseMerge: part of TortoiseSVN or a separate download from the project site.
        TortoiseMerge：TortoiseSVN的一部分或者从项目站点单独的下载。
        WinMerge.
        SourceGear Diff/Merge.
        Perforce Merge (p4merge): part of Perforce's visual client suite (P4V).
        Perforce Merge (p4merge)：Perforce的可视化客户端工具（P4V）的一部分
        TkDiff.
    On Mac OS X:
        SourceGear Diff/Merge.
        FileMerge: part of Apple's XCode development tools.
        苹果XCode开发工具的一部分
        TkDiff.
        Perforce Merge (p4merge): part of Perforce's visual client suite (P4V).
        Perforce Merge (p4merge)：Perforce的可视化客户端工具（P4V）的一部分 Recovering deleted assets 找回删除的资源Deleting a local asset and committing the delete to the server will in fact not delete an asset permanently. Just as any previous version of an asset can be restored through History window from the Overview tab.删除一个本地资源并提交删除到服务器实际上并不会永久地删除一个资源。仅仅是像任何之前的版本一样一个资源可以从概览（Overview）标签页通过历史（History）窗口还原。
The History dialog 历史对话框Expand Deleted Assets item, find and select assets from the list and hit Recover, the selected assets will be downloaded and re-added to the local project. If the folder that the asset was located in before the deletion still exists, the asset will be restored to the original location, otherwise it will be added to the root of the Assets folder in the local project.展开删除的资源（Deleted Assets）项，从列表中找到并选择资源然后点击还原（Recover），选择的资源将会下载并重新添加到本地的工程中。如果资源在删除之前所在的文件夹依然存在，资源将被还原到原始位置，否则它将被添加到本地工程中的资源文件夹根目录下。
Asset Server training complete 资源服务器训练结束You should now be equipped with the knowledge you need to start using the Asset Server effectively. Get to it, and don't forget the good workflow fundamentals. Commit changes often, and don't be afraid of losing anything.你现在应该已经具备了开始实际使用资源服务器所需的知识。开始吧，不要忘记好的工作流程是必要的。经常提交修改，并且别害怕忘记什么。 【来源：互联网】
更多精彩教程，尽在web3D纳金网http://www.narkii.com/college/