leoncheng@unity3d.com
3 年前
当前提交
cc2b5f40
共有 2536 个文件被更改,包括 16510 次插入 和 0 次删除
-
13.gitattributes
-
46.gitignore
-
0.gitmodules
-
6.vsconfig
-
5LICENSE.md
-
88README.md
-
16.git/config
-
1.git/description
-
0.git/FETCH_HEAD
-
1.git/HEAD
-
15.git/hooks/applypatch-msg.sample
-
24.git/hooks/commit-msg.sample
-
114.git/hooks/fsmonitor-watchman.sample
-
3.git/hooks/post-checkout
-
3.git/hooks/post-commit
-
3.git/hooks/post-merge
-
8.git/hooks/post-update.sample
-
14.git/hooks/pre-applypatch.sample
-
49.git/hooks/pre-commit.sample
-
42.git/hooks/prepare-commit-msg.sample
-
3.git/hooks/pre-push
-
53.git/hooks/pre-push.sample
-
169.git/hooks/pre-rebase.sample
-
24.git/hooks/pre-receive.sample
-
128.git/hooks/update.sample
-
280.git/index
-
6.git/info/exclude
-
1001.git/lfs/objects/02/9b/029b4d728e5b3391ea19d9e6d1f2ed46306bd4bc7743a833598eea532abfd9a7
-
1001.git/lfs/objects/02/fe/02febbbb9316bcfd92b49f299373f778ac9645b2d4c536688b69fdd2ceee8acc
-
1001.git/lfs/objects/03/43/0343b4f0d1c9df24d7bce27790523340eb3e3d20e3fe2f6156b5311a86116d17
-
1001.git/lfs/objects/04/25/042573a00eb32b83e9cffc8068ede270ffbc66d77e46f78926ae26da94a48433
-
1001.git/lfs/objects/06/52/065232cbc1ed2779a4e103138c80e743ab349fd2e4bbe448e02d6f5a2d3620e8
-
1001.git/lfs/objects/07/7a/077ac143fda414557a6a0d37e0cf66f169dcdd2a0c6f11f241bfd979c9414297
-
1001.git/lfs/objects/09/4f/094f591a5c2f622a068645076197fc4c05dcd67185891af1211b9d4f42246aa2
-
1001.git/lfs/objects/0c/be/0cbe4f867ed6bceeac3158247aad143ca608b778c078296221c1b6f28f439568
-
1001.git/lfs/objects/0c/fd/0cfd59cae2f6a7ee5bad24f450b6b3c28bf96c0e74bbda90b0fcf9013ab388f6
-
1001.git/lfs/objects/0d/60/0d6060d66154d601ba4d2d2be87f82a9ff78990dfd94d306e721643b39c70a2f
-
1001.git/lfs/objects/0d/d0/0dd0126e4a3a9a12c5f6c628382bd55096bf728ec52d5850ca576f735579af9e
-
1001.git/lfs/objects/0e/17/0e171c77fe8b17a9412135b95f1c7ef70a66912273c6a1a59492fba98a5101a1
-
1001.git/lfs/objects/10/47/1047face5a9dd55e6464e54ca1bbadae8b55c8cb9c8bcce2ce6b934b7049b080
-
1001.git/lfs/objects/11/38/11384195b06e6cbb2f6d10025a57e96944d08455702487babc4497d4d9d9c3d1
-
137.git/lfs/objects/11/d4/11d436494f6dccfede25ec7ca2abef67af381662966067af6332aea9722d8bd9
-
1001.git/lfs/objects/12/64/12645878f3f623b65810da5d6475e3f114be53b4aec9a056f17e606689e75d6b
-
244.git/lfs/objects/12/fc/12fc7fcebbbc726c4ea1b49314ba4bb55f459fa40d52c3a92e4504fe49b80841
|
|||
*.psd filter=lfs diff=lfs merge=lfs -text |
|||
*.png filter=lfs diff=lfs merge=lfs -text |
|||
*.exr filter=lfs diff=lfs merge=lfs -text |
|||
*.zip filter=lfs diff=lfs merge=lfs -text |
|||
*.tiff filter=lfs diff=lfs merge=lfs -text |
|||
*.tif filter=lfs diff=lfs merge=lfs -text |
|||
*.raw filter=lfs diff=lfs merge=lfs -text |
|||
*.fbx filter=lfs diff=lfs merge=lfs -text |
|||
*.jpg filter=lfs diff=lfs merge=lfs -text |
|||
*.wav filter=lfs diff=lfs merge=lfs -text |
|||
*.obj filter=lfs diff=lfs merge=lfs -text |
|||
*.aiff filter=lfs diff=lfs merge=lfs -text |
|||
*.tga filter=lfs diff=lfs merge=lfs -text |
|
|||
/[Ll]ibrary/ |
|||
/[Tt]emp/ |
|||
/[Oo]bj/ |
|||
/[Bb]uild/ |
|||
/[Bb]uilds/ |
|||
/Assets/AssetStoreTools* |
|||
|
|||
# Visual Studio 2015 cache directory |
|||
/.vs/ |
|||
|
|||
# Autogenerated VS/MD/Consulo solution and project files |
|||
ExportedObj/ |
|||
.consulo/ |
|||
*.csproj |
|||
*.unityproj |
|||
*.sln |
|||
*.suo |
|||
*.tmp |
|||
*.user |
|||
*.userprefs |
|||
*.pidb |
|||
*.booproj |
|||
*.svd |
|||
*.pdb |
|||
|
|||
# Unity3D generated meta files |
|||
*.pidb.meta |
|||
|
|||
# Unity3D Generated File On Crash Reports |
|||
sysinfo.txt |
|||
|
|||
# Builds |
|||
*.apk |
|||
*.unitypackage |
|||
Assets/_Ignore |
|||
_Ignore.meta |
|||
.idea |
|||
Logs |
|||
Assets/Plugins/Editor/JetBrains |
|||
Assets/Plugins/Editor/JetBrains.meta |
|||
Recordings |
|||
Packages/com.unity.* |
|||
MemoryCaptures |
|||
Assets/BuildReports |
|||
SerializedBuildInfo |
|||
SwitchIL2CPP* |
|
|||
{ |
|||
"version": "1.0", |
|||
"components": [ |
|||
"Microsoft.VisualStudio.Workload.ManagedGame" |
|||
] |
|||
} |
|
|||
Boat Attack copyright © 2018 Unity Technologies ApS |
|||
|
|||
Licensed under the Unity Companion License for Unity-dependent projects--see [Unity Companion License](http://www.unity3d.com/legal/licenses/Unity_Companion_License). |
|||
|
|||
Unless expressly provided otherwise, the Software under this license is made available strictly on an “AS IS” BASIS WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED. Please review the license for details on these and other terms and conditions. |
|
|||
**_Note:This repository uses GitLFS, to use this repo you need to pull via Git and make sure GitLFS is installed locally_** |
|||
|
|||
# Boat Attack |
|||
###### Demo Project using the Universal RP from Unity3D |
|||
|
|||
[![Click for Youtube Video](https://media.githubusercontent.com/media/Verasl/BoatAttack/release/2019.3/Assets/Textures/UI/welcome-title.png)](https://drive.google.com/file/d/1PTNdhnqbhzSWUCfAinIefP5cfr6Dezuw/view) |
|||
|
|||
This Unity project has been created to aid the testing and development of Universal RP. The project is a small vertical slice of a boat racing game, complete with race-able boats and island environment. |
|||
|
|||
Feel free to post any issues, but know this is a 'as is' repo, it's meant more for discovery of how some of the Universal RP features work and a learning resource for some tricks. |
|||
|
|||
**Project Features**: |
|||
* Uses Universal RP from Unity |
|||
* Mobile optimized, low poly, LODs, no compute |
|||
* C# Jobs buoyancy system |
|||
* Cinemachine camera setups |
|||
* Shader Graph usage |
|||
* Post-processing v3 with Volume blending |
|||
* Addressables asset management package |
|||
* Custom Universal RP rendering for planar reflections via [SRP callbacks](https://docs.unity3d.com/ScriptReference/Rendering.RenderPipelineManager.html) |
|||
* Custom SciptableRenderPass usage for WaterFX and Caustics |
|||
* Gerstner based water system in local package(WIP) |
|||
* Much more.. |
|||
|
|||
[Demo Footage](https://drive.google.com/file/d/1PTNdhnqbhzSWUCfAinIefP5cfr6Dezuw/view) |
|||
|
|||
# Usage |
|||
|
|||
#### Getting the project |
|||
via Git: |
|||
1. Make sure you have GitLFS installed, check [here](https://git-lfs.github.com) for details. |
|||
2. Clone the repo as usual via cmd/terminal or in your favourite Git GUI software. |
|||
3. Checkout the branch that matches the Unity verison you are using, eg `release/2019.4` |
|||
|
|||
Downloadable zips: |
|||
1. [2019.4 Project (Unity 2019.4.2f1)](https://drive.google.com/file/d/19SRLm_jp9z0yeDgmHpwBdGaPShwc4FDW/view?usp=sharing) |
|||
|
|||
#### Load the project: |
|||
Once you have the project files locally you can load the project, ideally in the Unity version that is noted in the `ProjectSettings/ProjectVersion.txt` for the best experience. |
|||
Upon loading the project will display a small welcome screen with some buttons to load starting scenes. |
|||
|
|||
Scenes worth noting: |
|||
- `scenes/main_menu.unity` - Starting menu scene if you want to have a full play-through of the demo. |
|||
- `scenes/demo_island.unity` - Setup to play in the editor and go straight into an AI based race. |
|||
- `scenes/_levels/level_Island.unity` - The scene loaded when entering from the main menu. |
|||
- `scenes/Testing/***.unity` - Assorted test scenes, these are in need of updating and come as is. |
|||
|
|||
#### Build the project: |
|||
One thing to make sure you do before building is make sure to build the addressable assets, this can be done via the addressables window, for more information please checkout the addressables [package documentation](https://docs.unity3d.com/Packages/com.unity.addressables@latest). |
|||
Once the addressable assets are built you can continue to build a player as usual. |
|||
|
|||
One thing to mention is not all controls and platforms have been tested, especially for the menu work. if you want to just see the project running on a device you can add the `scenes/demo_island.unity` scene to the build list and disable/remove the others. |
|||
|
|||
# Todo |
|||
|
|||
As this project is on going there is a lot more left that needs to be worked on, so I repeat this is not a resource for production ready workflow ideas or systems and lots of it was put together very quickly. |
|||
|
|||
Some of the things left to do: |
|||
* Make water system more modular and improve UX |
|||
* Improve boat AI |
|||
* Add imposter rendering for vegetation |
|||
* Cleanup menu system to switch between Demoing/Playing/Benchmarking |
|||
* Implement Unity Physics |
|||
* Optimize cross platform performance and stability |
|||
* Continue code cleanup |
|||
* Wiki explaining features/systems in more depth |
|||
* Add more sizzle.... |
|||
|
|||
![Sunny Island](https://gdurl.com/STO1) |
|||
|
|||
# Credits |
|||
[Andre McGrail](http://www.andremcgrail.com) - Design, Programming, Modeling, Textures, SFX |
|||
|
|||
[Alex Best](https://big_ally.artstation.com) - Modeling, Textures |
|||
|
|||
[Stintah](https://soundcloud.com/stintah) - Soundtrack |
|||
|
|||
Special thanks to: |
|||
|
|||
[Felipe Lira](https://github.com/phi-lira) - For Making Universal RP & LWRP |
|||
|
|||
[Tim Cooper](https://github.com/stramit) - Assorted SRP code help |
|||
|
|||
And thanks to many more who have helped with suggestions and feedback! |
|||
|
|||
# Notes |
|||
|
|||
*Make sure you clone the repo as downloading the zip will not contain the GitLFS files(all textures/meshes etc) |
|
|||
[core] |
|||
repositoryformatversion = 0 |
|||
filemode = false |
|||
bare = false |
|||
logallrefupdates = true |
|||
symlinks = false |
|||
ignorecase = true |
|||
[remote "origin"] |
|||
url = https://github.com/Unity-Technologies/BoatAttack.git |
|||
fetch = +refs/heads/*:refs/remotes/origin/* |
|||
[branch "master"] |
|||
remote = origin |
|||
merge = refs/heads/master |
|||
[branch "release/2019.4-LTS"] |
|||
remote = origin |
|||
merge = refs/heads/release/2019.4-LTS |
|
|||
Unnamed repository; edit this file 'description' to name the repository. |
|
|||
ref: refs/heads/release/2019.4-LTS |
|
|||
#!/bin/sh |
|||
# |
|||
# An example hook script to check the commit log message taken by |
|||
# applypatch from an e-mail message. |
|||
# |
|||
# The hook should exit with non-zero status after issuing an |
|||
# appropriate message if it wants to stop the commit. The hook is |
|||
# allowed to edit the commit message file. |
|||
# |
|||
# To enable this hook, rename this file to "applypatch-msg". |
|||
|
|||
. git-sh-setup |
|||
commitmsg="$(git rev-parse --git-path hooks/commit-msg)" |
|||
test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"} |
|||
: |
|
|||
#!/bin/sh |
|||
# |
|||
# An example hook script to check the commit log message. |
|||
# Called by "git commit" with one argument, the name of the file |
|||
# that has the commit message. The hook should exit with non-zero |
|||
# status after issuing an appropriate message if it wants to stop the |
|||
# commit. The hook is allowed to edit the commit message file. |
|||
# |
|||
# To enable this hook, rename this file to "commit-msg". |
|||
|
|||
# Uncomment the below to add a Signed-off-by line to the message. |
|||
# Doing this in a hook is a bad idea in general, but the prepare-commit-msg |
|||
# hook is more suited to it. |
|||
# |
|||
# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') |
|||
# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" |
|||
|
|||
# This example catches duplicate Signed-off-by lines. |
|||
|
|||
test "" = "$(grep '^Signed-off-by: ' "$1" | |
|||
sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || { |
|||
echo >&2 Duplicate Signed-off-by lines. |
|||
exit 1 |
|||
} |
|
|||
#!/usr/bin/perl |
|||
|
|||
use strict; |
|||
use warnings; |
|||
use IPC::Open2; |
|||
|
|||
# An example hook script to integrate Watchman |
|||
# (https://facebook.github.io/watchman/) with git to speed up detecting |
|||
# new and modified files. |
|||
# |
|||
# The hook is passed a version (currently 1) and a time in nanoseconds |
|||
# formatted as a string and outputs to stdout all files that have been |
|||
# modified since the given time. Paths must be relative to the root of |
|||
# the working tree and separated by a single NUL. |
|||
# |
|||
# To enable this hook, rename this file to "query-watchman" and set |
|||
# 'git config core.fsmonitor .git/hooks/query-watchman' |
|||
# |
|||
my ($version, $time) = @ARGV; |
|||
|
|||
# Check the hook interface version |
|||
|
|||
if ($version == 1) { |
|||
# convert nanoseconds to seconds |
|||
$time = int $time / 1000000000; |
|||
} else { |
|||
die "Unsupported query-fsmonitor hook version '$version'.\n" . |
|||
"Falling back to scanning...\n"; |
|||
} |
|||
|
|||
my $git_work_tree; |
|||
if ($^O =~ 'msys' || $^O =~ 'cygwin') { |
|||
$git_work_tree = Win32::GetCwd(); |
|||
$git_work_tree =~ tr/\\/\//; |
|||
} else { |
|||
require Cwd; |
|||
$git_work_tree = Cwd::cwd(); |
|||
} |
|||
|
|||
my $retry = 1; |
|||
|
|||
launch_watchman(); |
|||
|
|||
sub launch_watchman { |
|||
|
|||
my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty') |
|||
or die "open2() failed: $!\n" . |
|||
"Falling back to scanning...\n"; |
|||
|
|||
# In the query expression below we're asking for names of files that |
|||
# changed since $time but were not transient (ie created after |
|||
# $time but no longer exist). |
|||
# |
|||
# To accomplish this, we're using the "since" generator to use the |
|||
# recency index to select candidate nodes and "fields" to limit the |
|||
# output to file names only. Then we're using the "expression" term to |
|||
# further constrain the results. |
|||
# |
|||
# The category of transient files that we want to ignore will have a |
|||
# creation clock (cclock) newer than $time_t value and will also not |
|||
# currently exist. |
|||
|
|||
my $query = <<" END"; |
|||
["query", "$git_work_tree", { |
|||
"since": $time, |
|||
"fields": ["name"], |
|||
"expression": ["not", ["allof", ["since", $time, "cclock"], ["not", "exists"]]] |
|||
}] |
|||
END |
|||
|
|||
print CHLD_IN $query; |
|||
close CHLD_IN; |
|||
my $response = do {local $/; <CHLD_OUT>}; |
|||
|
|||
die "Watchman: command returned no output.\n" . |
|||
"Falling back to scanning...\n" if $response eq ""; |
|||
die "Watchman: command returned invalid output: $response\n" . |
|||
"Falling back to scanning...\n" unless $response =~ /^\{/; |
|||
|
|||
my $json_pkg; |
|||
eval { |
|||
require JSON::XS; |
|||
$json_pkg = "JSON::XS"; |
|||
1; |
|||
} or do { |
|||
require JSON::PP; |
|||
$json_pkg = "JSON::PP"; |
|||
}; |
|||
|
|||
my $o = $json_pkg->new->utf8->decode($response); |
|||
|
|||
if ($retry > 0 and $o->{error} and $o->{error} =~ m/unable to resolve root .* directory (.*) is not watched/) { |
|||
print STDERR "Adding '$git_work_tree' to watchman's watch list.\n"; |
|||
$retry--; |
|||
qx/watchman watch "$git_work_tree"/; |
|||
die "Failed to make watchman watch '$git_work_tree'.\n" . |
|||
"Falling back to scanning...\n" if $? != 0; |
|||
|
|||
# Watchman will always return all files on the first query so |
|||
# return the fast "everything is dirty" flag to git and do the |
|||
# Watchman query just to get it over with now so we won't pay |
|||
# the cost in git to look up each individual file. |
|||
print "/\0"; |
|||
eval { launch_watchman() }; |
|||
exit 0; |
|||
} |
|||
|
|||
die "Watchman: $o->{error}.\n" . |
|||
"Falling back to scanning...\n" if $o->{error}; |
|||
|
|||
binmode STDOUT, ":utf8"; |
|||
local $, = "\0"; |
|||
print @{$o->{files}}; |
|||
} |
|
|||
#!/bin/sh |
|||
command -v git-lfs >/dev/null 2>&1 || { echo >&2 "\nThis repository is configured for Git LFS but 'git-lfs' was not found on your path. If you no longer wish to use Git LFS, remove this hook by deleting .git/hooks/post-checkout.\n"; exit 2; } |
|||
git lfs post-checkout "$@" |
|
|||
#!/bin/sh |
|||
command -v git-lfs >/dev/null 2>&1 || { echo >&2 "\nThis repository is configured for Git LFS but 'git-lfs' was not found on your path. If you no longer wish to use Git LFS, remove this hook by deleting .git/hooks/post-commit.\n"; exit 2; } |
|||
git lfs post-commit "$@" |
|
|||
#!/bin/sh |
|||
command -v git-lfs >/dev/null 2>&1 || { echo >&2 "\nThis repository is configured for Git LFS but 'git-lfs' was not found on your path. If you no longer wish to use Git LFS, remove this hook by deleting .git/hooks/post-merge.\n"; exit 2; } |
|||
git lfs post-merge "$@" |
|
|||
#!/bin/sh |
|||
# |
|||
# An example hook script to prepare a packed repository for use over |
|||
# dumb transports. |
|||
# |
|||
# To enable this hook, rename this file to "post-update". |
|||
|
|||
exec git update-server-info |
|
|||
#!/bin/sh |
|||
# |
|||
# An example hook script to verify what is about to be committed |
|||
# by applypatch from an e-mail message. |
|||
# |
|||
# The hook should exit with non-zero status after issuing an |
|||
# appropriate message if it wants to stop the commit. |
|||
# |
|||
# To enable this hook, rename this file to "pre-applypatch". |
|||
|
|||
. git-sh-setup |
|||
precommit="$(git rev-parse --git-path hooks/pre-commit)" |
|||
test -x "$precommit" && exec "$precommit" ${1+"$@"} |
|||
: |
|
|||
#!/bin/sh |
|||
# |
|||
# An example hook script to verify what is about to be committed. |
|||
# Called by "git commit" with no arguments. The hook should |
|||
# exit with non-zero status after issuing an appropriate message if |
|||
# it wants to stop the commit. |
|||
# |
|||
# To enable this hook, rename this file to "pre-commit". |
|||
|
|||
if git rev-parse --verify HEAD >/dev/null 2>&1 |
|||
then |
|||
against=HEAD |
|||
else |
|||
# Initial commit: diff against an empty tree object |
|||
against=$(git hash-object -t tree /dev/null) |
|||
fi |
|||
|
|||
# If you want to allow non-ASCII filenames set this variable to true. |
|||
allownonascii=$(git config --bool hooks.allownonascii) |
|||
|
|||
# Redirect output to stderr. |
|||
exec 1>&2 |
|||
|
|||
# Cross platform projects tend to avoid non-ASCII filenames; prevent |
|||
# them from being added to the repository. We exploit the fact that the |
|||
# printable range starts at the space character and ends with tilde. |
|||
if [ "$allownonascii" != "true" ] && |
|||
# Note that the use of brackets around a tr range is ok here, (it's |
|||
# even required, for portability to Solaris 10's /usr/bin/tr), since |
|||
# the square bracket bytes happen to fall in the designated range. |
|||
test $(git diff --cached --name-only --diff-filter=A -z $against | |
|||
LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 |
|||
then |
|||
cat <<\EOF |
|||
Error: Attempt to add a non-ASCII file name. |
|||
|
|||
This can cause problems if you want to work with people on other platforms. |
|||
|
|||
To be portable it is advisable to rename the file. |
|||
|
|||
If you know what you are doing you can disable this check using: |
|||
|
|||
git config hooks.allownonascii true |
|||
EOF |
|||
exit 1 |
|||
fi |
|||
|
|||
# If there are whitespace errors, print the offending file names and fail. |
|||
exec git diff-index --check --cached $against -- |
|
|||
#!/bin/sh |
|||
# |
|||
# An example hook script to prepare the commit log message. |
|||
# Called by "git commit" with the name of the file that has the |
|||
# commit message, followed by the description of the commit |
|||
# message's source. The hook's purpose is to edit the commit |
|||
# message file. If the hook fails with a non-zero status, |
|||
# the commit is aborted. |
|||
# |
|||
# To enable this hook, rename this file to "prepare-commit-msg". |
|||
|
|||
# This hook includes three examples. The first one removes the |
|||
# "# Please enter the commit message..." help message. |
|||
# |
|||
# The second includes the output of "git diff --name-status -r" |
|||
# into the message, just before the "git status" output. It is |
|||
# commented because it doesn't cope with --amend or with squashed |
|||
# commits. |
|||
# |
|||
# The third example adds a Signed-off-by line to the message, that can |
|||
# still be edited. This is rarely a good idea. |
|||
|
|||
COMMIT_MSG_FILE=$1 |
|||
COMMIT_SOURCE=$2 |
|||
SHA1=$3 |
|||
|
|||
/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE" |
|||
|
|||
# case "$COMMIT_SOURCE,$SHA1" in |
|||
# ,|template,) |
|||
# /usr/bin/perl -i.bak -pe ' |
|||
# print "\n" . `git diff --cached --name-status -r` |
|||
# if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;; |
|||
# *) ;; |
|||
# esac |
|||
|
|||
# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') |
|||
# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE" |
|||
# if test -z "$COMMIT_SOURCE" |
|||
# then |
|||
# /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE" |
|||
# fi |
|
|||
#!/bin/sh |
|||
command -v git-lfs >/dev/null 2>&1 || { echo >&2 "\nThis repository is configured for Git LFS but 'git-lfs' was not found on your path. If you no longer wish to use Git LFS, remove this hook by deleting .git/hooks/pre-push.\n"; exit 2; } |
|||
git lfs pre-push "$@" |
|
|||
#!/bin/sh |
|||
|
|||
# An example hook script to verify what is about to be pushed. Called by "git |
|||
# push" after it has checked the remote status, but before anything has been |
|||
# pushed. If this script exits with a non-zero status nothing will be pushed. |
|||
# |
|||
# This hook is called with the following parameters: |
|||
# |
|||
# $1 -- Name of the remote to which the push is being done |
|||
# $2 -- URL to which the push is being done |
|||
# |
|||
# If pushing without using a named remote those arguments will be equal. |
|||
# |
|||
# Information about the commits which are being pushed is supplied as lines to |
|||
# the standard input in the form: |
|||
# |
|||
# <local ref> <local sha1> <remote ref> <remote sha1> |
|||
# |
|||
# This sample shows how to prevent push of commits where the log message starts |
|||
# with "WIP" (work in progress). |
|||
|
|||
remote="$1" |
|||
url="$2" |
|||
|
|||
z40=0000000000000000000000000000000000000000 |
|||
|
|||
while read local_ref local_sha remote_ref remote_sha |
|||
do |
|||
if [ "$local_sha" = $z40 ] |
|||
then |
|||
# Handle delete |
|||
: |
|||
else |
|||
if [ "$remote_sha" = $z40 ] |
|||
then |
|||
# New branch, examine all commits |
|||
range="$local_sha" |
|||
else |
|||
# Update to existing branch, examine new commits |
|||
range="$remote_sha..$local_sha" |
|||
fi |
|||
|
|||
# Check for WIP commit |
|||
commit=`git rev-list -n 1 --grep '^WIP' "$range"` |
|||
if [ -n "$commit" ] |
|||
then |
|||
echo >&2 "Found WIP commit in $local_ref, not pushing" |
|||
exit 1 |
|||
fi |
|||
fi |
|||
done |
|||
|
|||
exit 0 |
|
|||
#!/bin/sh |
|||
# |
|||
# Copyright (c) 2006, 2008 Junio C Hamano |
|||
# |
|||
# The "pre-rebase" hook is run just before "git rebase" starts doing |
|||
# its job, and can prevent the command from running by exiting with |
|||
# non-zero status. |
|||
# |
|||
# The hook is called with the following parameters: |
|||
# |
|||
# $1 -- the upstream the series was forked from. |
|||
# $2 -- the branch being rebased (or empty when rebasing the current branch). |
|||
# |
|||
# This sample shows how to prevent topic branches that are already |
|||
# merged to 'next' branch from getting rebased, because allowing it |
|||
# would result in rebasing already published history. |
|||
|
|||
publish=next |
|||
basebranch="$1" |
|||
if test "$#" = 2 |
|||
then |
|||
topic="refs/heads/$2" |
|||
else |
|||
topic=`git symbolic-ref HEAD` || |
|||
exit 0 ;# we do not interrupt rebasing detached HEAD |
|||
fi |
|||
|
|||
case "$topic" in |
|||
refs/heads/??/*) |
|||
;; |
|||
*) |
|||
exit 0 ;# we do not interrupt others. |
|||
;; |
|||
esac |
|||
|
|||
# Now we are dealing with a topic branch being rebased |
|||
# on top of master. Is it OK to rebase it? |
|||
|
|||
# Does the topic really exist? |
|||
git show-ref -q "$topic" || { |
|||
echo >&2 "No such branch $topic" |
|||
exit 1 |
|||
} |
|||
|
|||
# Is topic fully merged to master? |
|||
not_in_master=`git rev-list --pretty=oneline ^master "$topic"` |
|||
if test -z "$not_in_master" |
|||
then |
|||
echo >&2 "$topic is fully merged to master; better remove it." |
|||
exit 1 ;# we could allow it, but there is no point. |
|||
fi |
|||
|
|||
# Is topic ever merged to next? If so you should not be rebasing it. |
|||
only_next_1=`git rev-list ^master "^$topic" ${publish} | sort` |
|||
only_next_2=`git rev-list ^master ${publish} | sort` |
|||
if test "$only_next_1" = "$only_next_2" |
|||
then |
|||
not_in_topic=`git rev-list "^$topic" master` |
|||
if test -z "$not_in_topic" |
|||
then |
|||
echo >&2 "$topic is already up to date with master" |
|||
exit 1 ;# we could allow it, but there is no point. |
|||
else |
|||
exit 0 |
|||
fi |
|||
else |
|||
not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"` |
|||
/usr/bin/perl -e ' |
|||
my $topic = $ARGV[0]; |
|||
my $msg = "* $topic has commits already merged to public branch:\n"; |
|||
my (%not_in_next) = map { |
|||
/^([0-9a-f]+) /; |
|||
($1 => 1); |
|||
} split(/\n/, $ARGV[1]); |
|||
for my $elem (map { |
|||
/^([0-9a-f]+) (.*)$/; |
|||
[$1 => $2]; |
|||
} split(/\n/, $ARGV[2])) { |
|||
if (!exists $not_in_next{$elem->[0]}) { |
|||
if ($msg) { |
|||
print STDERR $msg; |
|||
undef $msg; |
|||
} |
|||
print STDERR " $elem->[1]\n"; |
|||
} |
|||
} |
|||
' "$topic" "$not_in_next" "$not_in_master" |
|||
exit 1 |
|||
fi |
|||
|
|||
<<\DOC_END |
|||
|
|||
This sample hook safeguards topic branches that have been |
|||
published from being rewound. |
|||
|
|||
The workflow assumed here is: |
|||
|
|||
* Once a topic branch forks from "master", "master" is never |
|||
merged into it again (either directly or indirectly). |
|||
|
|||
* Once a topic branch is fully cooked and merged into "master", |
|||
it is deleted. If you need to build on top of it to correct |
|||
earlier mistakes, a new topic branch is created by forking at |
|||
the tip of the "master". This is not strictly necessary, but |
|||
it makes it easier to keep your history simple. |
|||
|
|||
* Whenever you need to test or publish your changes to topic |
|||
branches, merge them into "next" branch. |
|||
|
|||
The script, being an example, hardcodes the publish branch name |
|||
to be "next", but it is trivial to make it configurable via |
|||
$GIT_DIR/config mechanism. |
|||
|
|||
With this workflow, you would want to know: |
|||
|
|||
(1) ... if a topic branch has ever been merged to "next". Young |
|||
topic branches can have stupid mistakes you would rather |
|||
clean up before publishing, and things that have not been |
|||
merged into other branches can be easily rebased without |
|||
affecting other people. But once it is published, you would |
|||
not want to rewind it. |
|||
|
|||
(2) ... if a topic branch has been fully merged to "master". |
|||
Then you can delete it. More importantly, you should not |
|||
build on top of it -- other people may already want to |
|||
change things related to the topic as patches against your |
|||
"master", so if you need further changes, it is better to |
|||
fork the topic (perhaps with the same name) afresh from the |
|||
tip of "master". |
|||
|
|||
Let's look at this example: |
|||
|
|||
o---o---o---o---o---o---o---o---o---o "next" |
|||
/ / / / |
|||
/ a---a---b A / / |
|||
/ / / / |
|||
/ / c---c---c---c B / |
|||
/ / / \ / |
|||
/ / / b---b C \ / |
|||
/ / / / \ / |
|||
---o---o---o---o---o---o---o---o---o---o---o "master" |
|||
|
|||
|
|||
A, B and C are topic branches. |
|||
|
|||
* A has one fix since it was merged up to "next". |
|||
|
|||
* B has finished. It has been fully merged up to "master" and "next", |
|||
and is ready to be deleted. |
|||
|
|||
* C has not merged to "next" at all. |
|||
|
|||
We would want to allow C to be rebased, refuse A, and encourage |
|||
B to be deleted. |
|||
|
|||
To compute (1): |
|||
|
|||
git rev-list ^master ^topic next |
|||
git rev-list ^master next |
|||
|
|||
if these match, topic has not merged in next at all. |
|||
|
|||
To compute (2): |
|||
|
|||
git rev-list master..topic |
|||
|
|||
if this is empty, it is fully merged to "master". |
|||
|
|||
DOC_END |
|
|||
#!/bin/sh |
|||
# |
|||
# An example hook script to make use of push options. |
|||
# The example simply echoes all push options that start with 'echoback=' |
|||
# and rejects all pushes when the "reject" push option is used. |
|||
# |
|||
# To enable this hook, rename this file to "pre-receive". |
|||
|
|||
if test -n "$GIT_PUSH_OPTION_COUNT" |
|||
then |
|||
i=0 |
|||
while test "$i" -lt "$GIT_PUSH_OPTION_COUNT" |
|||
do |
|||
eval "value=\$GIT_PUSH_OPTION_$i" |
|||
case "$value" in |
|||
echoback=*) |
|||
echo "echo from the pre-receive-hook: ${value#*=}" >&2 |
|||
;; |
|||
reject) |
|||
exit 1 |
|||
esac |
|||
i=$((i + 1)) |
|||
done |
|||
fi |
|
|||
#!/bin/sh |
|||
# |
|||
# An example hook script to block unannotated tags from entering. |
|||
# Called by "git receive-pack" with arguments: refname sha1-old sha1-new |
|||
# |
|||
# To enable this hook, rename this file to "update". |
|||
# |
|||
# Config |
|||
# ------ |
|||
# hooks.allowunannotated |
|||
# This boolean sets whether unannotated tags will be allowed into the |
|||
# repository. By default they won't be. |
|||
# hooks.allowdeletetag |
|||
# This boolean sets whether deleting tags will be allowed in the |
|||
# repository. By default they won't be. |
|||
# hooks.allowmodifytag |
|||
# This boolean sets whether a tag may be modified after creation. By default |
|||
# it won't be. |
|||
# hooks.allowdeletebranch |
|||
# This boolean sets whether deleting branches will be allowed in the |
|||
# repository. By default they won't be. |
|||
# hooks.denycreatebranch |
|||
# This boolean sets whether remotely creating branches will be denied |
|||
# in the repository. By default this is allowed. |
|||
# |
|||
|
|||
# --- Command line |
|||
refname="$1" |
|||
oldrev="$2" |
|||
newrev="$3" |
|||
|
|||
# --- Safety check |
|||
if [ -z "$GIT_DIR" ]; then |
|||
echo "Don't run this script from the command line." >&2 |
|||
echo " (if you want, you could supply GIT_DIR then run" >&2 |
|||
echo " $0 <ref> <oldrev> <newrev>)" >&2 |
|||
exit 1 |
|||
fi |
|||
|
|||
if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then |
|||
echo "usage: $0 <ref> <oldrev> <newrev>" >&2 |
|||
exit 1 |
|||
fi |
|||
|
|||
# --- Config |
|||
allowunannotated=$(git config --bool hooks.allowunannotated) |
|||
allowdeletebranch=$(git config --bool hooks.allowdeletebranch) |
|||
denycreatebranch=$(git config --bool hooks.denycreatebranch) |
|||
allowdeletetag=$(git config --bool hooks.allowdeletetag) |
|||
allowmodifytag=$(git config --bool hooks.allowmodifytag) |
|||
|
|||
# check for no description |
|||
projectdesc=$(sed -e '1q' "$GIT_DIR/description") |
|||
case "$projectdesc" in |
|||
"Unnamed repository"* | "") |
|||
echo "*** Project description file hasn't been set" >&2 |
|||
exit 1 |
|||
;; |
|||
esac |
|||
|
|||
# --- Check types |
|||
# if $newrev is 0000...0000, it's a commit to delete a ref. |
|||
zero="0000000000000000000000000000000000000000" |
|||
if [ "$newrev" = "$zero" ]; then |
|||
newrev_type=delete |
|||
else |
|||
newrev_type=$(git cat-file -t $newrev) |
|||
fi |
|||
|
|||
case "$refname","$newrev_type" in |
|||
refs/tags/*,commit) |
|||
# un-annotated tag |
|||
short_refname=${refname##refs/tags/} |
|||
if [ "$allowunannotated" != "true" ]; then |
|||
echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2 |
|||
echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2 |
|||
exit 1 |
|||
fi |
|||
;; |
|||
refs/tags/*,delete) |
|||
# delete tag |
|||
if [ "$allowdeletetag" != "true" ]; then |
|||
echo "*** Deleting a tag is not allowed in this repository" >&2 |
|||
exit 1 |
|||
fi |
|||
;; |
|||
refs/tags/*,tag) |
|||
# annotated tag |
|||
if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1 |
|||
then |
|||
echo "*** Tag '$refname' already exists." >&2 |
|||
echo "*** Modifying a tag is not allowed in this repository." >&2 |
|||
exit 1 |
|||
fi |
|||
;; |
|||
refs/heads/*,commit) |
|||
# branch |
|||
if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then |
|||
echo "*** Creating a branch is not allowed in this repository" >&2 |
|||
exit 1 |
|||
fi |
|||
;; |
|||
refs/heads/*,delete) |
|||
# delete branch |
|||
if [ "$allowdeletebranch" != "true" ]; then |
|||
echo "*** Deleting a branch is not allowed in this repository" >&2 |
|||
exit 1 |
|||
fi |
|||
;; |
|||
refs/remotes/*,commit) |
|||
# tracking branch |
|||
;; |
|||
refs/remotes/*,delete) |
|||
# delete tracking branch |
|||
if [ "$allowdeletebranch" != "true" ]; then |
|||
echo "*** Deleting a tracking branch is not allowed in this repository" >&2 |
|||
exit 1 |
|||
fi |
|||
;; |
|||
*) |
|||
# Anything else (is there anything else?) |
|||
echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2 |
|||
exit 1 |
|||
;; |
|||
esac |
|||
|
|||
# --- Finished |
|||
exit 0 |
280
.git/index
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
|
|||
# git ls-files --others --exclude-from=.git/info/exclude |
|||
# Lines that start with '#' are comments. |
|||
# For a project mostly in C, the following would be a good set of |
|||
# exclude patterns (uncomment them if you want to use them): |
|||
# *.[oa] |
|||
# *~ |
1001
.git/lfs/objects/02/9b/029b4d728e5b3391ea19d9e6d1f2ed46306bd4bc7743a833598eea532abfd9a7
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
1001
.git/lfs/objects/02/fe/02febbbb9316bcfd92b49f299373f778ac9645b2d4c536688b69fdd2ceee8acc
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
1001
.git/lfs/objects/03/43/0343b4f0d1c9df24d7bce27790523340eb3e3d20e3fe2f6156b5311a86116d17
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
1001
.git/lfs/objects/04/25/042573a00eb32b83e9cffc8068ede270ffbc66d77e46f78926ae26da94a48433
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
1001
.git/lfs/objects/06/52/065232cbc1ed2779a4e103138c80e743ab349fd2e4bbe448e02d6f5a2d3620e8
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
1001
.git/lfs/objects/07/7a/077ac143fda414557a6a0d37e0cf66f169dcdd2a0c6f11f241bfd979c9414297
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
1001
.git/lfs/objects/09/4f/094f591a5c2f622a068645076197fc4c05dcd67185891af1211b9d4f42246aa2
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
1001
.git/lfs/objects/0c/be/0cbe4f867ed6bceeac3158247aad143ca608b778c078296221c1b6f28f439568
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
1001
.git/lfs/objects/0c/fd/0cfd59cae2f6a7ee5bad24f450b6b3c28bf96c0e74bbda90b0fcf9013ab388f6
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
1001
.git/lfs/objects/0d/60/0d6060d66154d601ba4d2d2be87f82a9ff78990dfd94d306e721643b39c70a2f
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
1001
.git/lfs/objects/0d/d0/0dd0126e4a3a9a12c5f6c628382bd55096bf728ec52d5850ca576f735579af9e
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
1001
.git/lfs/objects/0e/17/0e171c77fe8b17a9412135b95f1c7ef70a66912273c6a1a59492fba98a5101a1
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
1001
.git/lfs/objects/10/47/1047face5a9dd55e6464e54ca1bbadae8b55c8cb9c8bcce2ce6b934b7049b080
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
1001
.git/lfs/objects/11/38/11384195b06e6cbb2f6d10025a57e96944d08455702487babc4497d4d9d9c3d1
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
|
|||
Kaydara FBX Binary L |
|||
|