diff --git a/README.md b/README.md index 34f94ff..b23ad3c 100644 --- a/README.md +++ b/README.md @@ -29,3 +29,11 @@ | Left align | Right align | Center align | |:-----------|------------:|:------------:| |左|右|中央| + +.gitの削除 + find . -type d -name .git で.gitがあるか確認 +→$ ls -a で見れるドン + + find . -type d -name .git -print0 | xargs -0 rm -rf +で削除でき +→$ rm -rf directory_name で消せるドン \ No newline at end of file diff --git a/RinkoResume/README.md b/RinkoResume/README.md new file mode 100644 index 0000000..9eaab7e --- /dev/null +++ b/RinkoResume/README.md @@ -0,0 +1,10 @@ +2018ǯ�ƹ���ѥ쥸��� +================================================================= +* �ع֤Υ쥸���򤳤����֤� +* PDF�򤳤Υǥ��쥯�ȥ��add����commit����push +* ����Τ褦�˥�󥯤�ĥ�� + +��󥯽� +------------------------------------------------------------ +\[�����ȥ�]\(../../../raw/master/RinkoResume/�ե�����̾.pdf) +* [Welcome](../../../raw/master/RinkoResume/welcome.pdf) diff --git a/RinkoResume/welcome.pdf b/RinkoResume/welcome.pdf new file mode 100644 index 0000000..f27692e --- /dev/null +++ b/RinkoResume/welcome.pdf Binary files differ diff --git a/calendar b/calendar deleted file mode 100644 index ed19d8f..0000000 --- a/calendar +++ /dev/null @@ -1,8 +0,0 @@ - 2018年 皐月 5月 - 日 月 火 水 木 金 土 - 1 2 ( 3)( 4)( 5) -( 6) 7 8 9 10 11 12 -(13) 14 15 16 17 18 19 -(20) 21 22 =23= 24 25 26 -(27) 28 29 30 31 - diff --git a/calendar@6 b/calendar@6 deleted file mode 100644 index c75a275..0000000 --- a/calendar@6 +++ /dev/null @@ -1,11 +0,0 @@ - 6月 2018 -日 月 火 水 木 金 土 - 1 2 - 3 4 5 6 7 8 9 -10 11 12 13 14 15 16 -17 18 19 20 21 22 23 -24 25 26 27 28 29 30 - -この時期 -* 三瀬の川は蛍が見れるよ！ -* 暑いですね \ No newline at end of file diff --git a/meibo/meibo.txt b/meibo/meibo.txt index 4ff12ea..2c25470 100644 --- a/meibo/meibo.txt +++ b/meibo/meibo.txt @@ -1,2 +1,3 @@ C1160818 佐々木大器　好きな人は水瀬いのり カソノです。古戦場から逃げるな +謎の存在。 diff --git a/naoto_unko/pokemon.js b/naoto_unko/pokemon.js new file mode 100644 index 0000000..e8f0dc1 --- /dev/null +++ b/naoto_unko/pokemon.js @@ -0,0 +1 @@ +var pokemon="Hello!World!"; diff --git a/sasaki.txt b/sasaki.txt index c969a48..9cb257b 100644 --- a/sasaki.txt +++ b/sasaki.txt @@ -1 +1,2 @@ 佐々木だよ +佐々木だよ！ diff --git a/seiyu/HEAD b/seiyu/HEAD new file mode 100644 index 0000000..cb089cd --- /dev/null +++ b/seiyu/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/seiyu/README.md b/seiyu/README.md new file mode 100644 index 0000000..34f94ff --- /dev/null +++ b/seiyu/README.md @@ -0,0 +1,31 @@ +Practice +==== + +~/.emacs に足せ! +```` +(setq make-backup-files nil) +```` + +Are you enjoy git life ? +This repository is for git practice. + +hogehoge + +### process push +* git clone URL + +Edit the umko file! +* git add hoge/hoge.file +* git commit -m "hogehoge" +* git push + + +|git push|アップロード| +|----|----| +|git fetch|ダウンロード| +|git merge|2つのブランチを合流| + + +| Left align | Right align | Center align | +|:-----------|------------:|:------------:| +|左|右|中央| diff --git a/seiyu/calendar b/seiyu/calendar new file mode 100644 index 0000000..ed19d8f --- /dev/null +++ b/seiyu/calendar @@ -0,0 +1,8 @@ + 2018年 皐月 5月 + 日 月 火 水 木 金 土 + 1 2 ( 3)( 4)( 5) +( 6) 7 8 9 10 11 12 +(13) 14 15 16 17 18 19 +(20) 21 22 =23= 24 25 26 +(27) 28 29 30 31 + diff --git a/seiyu/calendar@6 b/seiyu/calendar@6 new file mode 100644 index 0000000..c75a275 --- /dev/null +++ b/seiyu/calendar@6 @@ -0,0 +1,11 @@ + 6月 2018 +日 月 火 水 木 金 土 + 1 2 + 3 4 5 6 7 8 9 +10 11 12 13 14 15 16 +17 18 19 20 21 22 23 +24 25 26 27 28 29 30 + +この時期 +* 三瀬の川は蛍が見れるよ！ +* 暑いですね \ No newline at end of file diff --git a/seiyu/config b/seiyu/config new file mode 100644 index 0000000..15a53bf --- /dev/null +++ b/seiyu/config @@ -0,0 +1,7 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = true + sharedrepository = 1 +[receive] + denyNonFastforwards = true diff --git a/seiyu/description b/seiyu/description new file mode 100644 index 0000000..498b267 --- /dev/null +++ b/seiyu/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/seiyu/hooks/applypatch-msg.sample b/seiyu/hooks/applypatch-msg.sample new file mode 100755 index 0000000..a5d7b84 --- /dev/null +++ b/seiyu/hooks/applypatch-msg.sample @@ -0,0 +1,15 @@ +#!/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+"$@"} +: diff --git a/seiyu/hooks/commit-msg.sample b/seiyu/hooks/commit-msg.sample new file mode 100755 index 0000000..b58d118 --- /dev/null +++ b/seiyu/hooks/commit-msg.sample @@ -0,0 +1,24 @@ +#!/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 +} diff --git a/seiyu/hooks/post-update.sample b/seiyu/hooks/post-update.sample new file mode 100755 index 0000000..ec17ec1 --- /dev/null +++ b/seiyu/hooks/post-update.sample @@ -0,0 +1,8 @@ +#!/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 diff --git a/seiyu/hooks/pre-applypatch.sample b/seiyu/hooks/pre-applypatch.sample new file mode 100755 index 0000000..4142082 --- /dev/null +++ b/seiyu/hooks/pre-applypatch.sample @@ -0,0 +1,14 @@ +#!/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+"$@"} +: diff --git a/seiyu/hooks/pre-commit.sample b/seiyu/hooks/pre-commit.sample new file mode 100755 index 0000000..68d62d5 --- /dev/null +++ b/seiyu/hooks/pre-commit.sample @@ -0,0 +1,49 @@ +#!/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=4b825dc642cb6eb9a060e54bf8d69288fbee4904 +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 -- diff --git a/seiyu/hooks/pre-push.sample b/seiyu/hooks/pre-push.sample new file mode 100755 index 0000000..6187dbf --- /dev/null +++ b/seiyu/hooks/pre-push.sample @@ -0,0 +1,53 @@ +#!/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: +# +# +# +# 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 diff --git a/seiyu/hooks/pre-rebase.sample b/seiyu/hooks/pre-rebase.sample new file mode 100755 index 0000000..33730ca --- /dev/null +++ b/seiyu/hooks/pre-rebase.sample @@ -0,0 +1,169 @@ +#!/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 diff --git a/seiyu/hooks/prepare-commit-msg.sample b/seiyu/hooks/prepare-commit-msg.sample new file mode 100755 index 0000000..f093a02 --- /dev/null +++ b/seiyu/hooks/prepare-commit-msg.sample @@ -0,0 +1,36 @@ +#!/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 comments out the +# "Conflicts:" part of a merge commit. +# +# 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. + +case "$2,$3" in + merge,) + /usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;; + +# ,|template,) +# /usr/bin/perl -i.bak -pe ' +# print "\n" . `git diff --cached --name-status -r` +# if /^#/ && $first++ == 0' "$1" ;; + + *) ;; +esac + +# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" diff --git a/seiyu/hooks/update.sample b/seiyu/hooks/update.sample new file mode 100755 index 0000000..80ba941 --- /dev/null +++ b/seiyu/hooks/update.sample @@ -0,0 +1,128 @@ +#!/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 )" >&2 + exit 1 +fi + +if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then + echo "usage: $0 " >&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 diff --git a/seiyu/houtin_unko/IMGP8715.jpg b/seiyu/houtin_unko/IMGP8715.jpg new file mode 100644 index 0000000..d66db1f --- /dev/null +++ b/seiyu/houtin_unko/IMGP8715.jpg Binary files differ diff --git a/seiyu/houtin_unko/houtin.txt b/seiyu/houtin_unko/houtin.txt new file mode 100644 index 0000000..691ba4a --- /dev/null +++ b/seiyu/houtin_unko/houtin.txt @@ -0,0 +1 @@ +うんこです。 diff --git a/seiyu/index.html b/seiyu/index.html new file mode 100644 index 0000000..1ec31a5 --- /dev/null +++ b/seiyu/index.html @@ -0,0 +1,23 @@ + + + +hello Git + + + Hello +

hello world in git

+

+ ピーナッツ + アーモンド + ダイズ + ピスタチオ + ひまわりの種 + カボチャの種 + カシューナッツ + 胡桃 + 柿の種 + 柿の種　チョコレート味 + 胡麻 +

+ + diff --git a/seiyu/info/exclude b/seiyu/info/exclude new file mode 100644 index 0000000..a5196d1 --- /dev/null +++ b/seiyu/info/exclude @@ -0,0 +1,6 @@ +# 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] +# *~ diff --git a/seiyu/kosenjo.text b/seiyu/kosenjo.text new file mode 100644 index 0000000..003029b --- /dev/null +++ b/seiyu/kosenjo.text @@ -0,0 +1 @@ +古戦場から逃げるな diff --git a/seiyu/meibo/meibo.txt b/seiyu/meibo/meibo.txt new file mode 100644 index 0000000..4ff12ea --- /dev/null +++ b/seiyu/meibo/meibo.txt @@ -0,0 +1,2 @@ +C1160818 佐々木大器　好きな人は水瀬いのり +カソノです。古戦場から逃げるな diff --git a/seiyu/mituyuki.py b/seiyu/mituyuki.py new file mode 100644 index 0000000..5a46c7b --- /dev/null +++ b/seiyu/mituyuki.py @@ -0,0 +1,5 @@ +print("please tell me your name.") + +name = input() + +print(name) diff --git a/seiyu/otani/jaist_sl.odp b/seiyu/otani/jaist_sl.odp new file mode 100644 index 0000000..cd1e87d --- /dev/null +++ b/seiyu/otani/jaist_sl.odp Binary files differ diff --git a/seiyu/otani/jaist_sl.pdf b/seiyu/otani/jaist_sl.pdf new file mode 100644 index 0000000..626863c --- /dev/null +++ b/seiyu/otani/jaist_sl.pdf Binary files differ diff --git a/seiyu/otani/otani.txt b/seiyu/otani/otani.txt new file mode 100644 index 0000000..32bdbe9 --- /dev/null +++ b/seiyu/otani/otani.txt @@ -0,0 +1 @@ +大谷です diff --git a/seiyu/otani/tyukan.pdf b/seiyu/otani/tyukan.pdf new file mode 100644 index 0000000..77006c1 --- /dev/null +++ b/seiyu/otani/tyukan.pdf Binary files differ diff --git a/seiyu/otani/yotei.txt b/seiyu/otani/yotei.txt new file mode 100644 index 0000000..07525f2 --- /dev/null +++ b/seiyu/otani/yotei.txt @@ -0,0 +1 @@ +合宿の日程と注意点と持ち物について diff --git a/seiyu/rensyu/meibo.txt b/seiyu/rensyu/meibo.txt new file mode 100644 index 0000000..4cb1dba --- /dev/null +++ b/seiyu/rensyu/meibo.txt @@ -0,0 +1,2 @@ +C1160818　佐々木大器 +C1151392　廣田駿世 diff --git a/seiyu/sasaki.txt b/seiyu/sasaki.txt new file mode 100644 index 0000000..c969a48 --- /dev/null +++ b/seiyu/sasaki.txt @@ -0,0 +1 @@ +佐々木だよ diff --git a/seiyu/shh/shh.txt b/seiyu/shh/shh.txt new file mode 100644 index 0000000..9d40c62 --- /dev/null +++ b/seiyu/shh/shh.txt @@ -0,0 +1,3 @@ +佐々木です。 +かなんです。 +小松です。 diff --git a/seiyu/shh/shh.txt~ b/seiyu/shh/shh.txt~ new file mode 100644 index 0000000..3d40cfa --- /dev/null +++ b/seiyu/shh/shh.txt~ @@ -0,0 +1 @@ +佐々木です。 diff --git a/seiyu/unko.rb b/seiyu/unko.rb new file mode 100755 index 0000000..7fd6a1b --- /dev/null +++ b/seiyu/unko.rb @@ -0,0 +1,83 @@ +#!/usr/koeki/bin/ruby +# -*- coding: utf-8 -*- +print "aaaaaaaaaaaaaaaaaaaaaaaa" +kobushi = 0 + +print"じゃんけんしようぜ\n" + +print"最初はグーじゃんけん(1:グー2:チョキ3:バー)\n" +kobusi = gets.chomp!.to_i + +srand +cpu = rand(3) + 1 + +if kobusi == 1 + if cpu == 1 + print"ぽん\n" + print"グー\n" + sleep(2) + print"グー\n" + sleep(1) + print"あいこー\n" + elsif cpu == 2 + print"ぽん\n" + print"グー\n" + sleep(2) + print"チョキ\n" + sleep(1) + print"キミのかちー\n" + elsif cpu == 3 + print"ぽん\n" + print"グー\n" + sleep(2) + print"パー\n" + sleep(1) + print"キミのまけー\n" + end +elsif kobusi == 2 + if cpu == 1 + print"ぽん\n" + print"チョキ\n" + sleep(2) + print"グー\n" + sleep(1) + print"キミのまけー\n" + elsif cpu == 2 + print"ぽん\n" + print"チョキ\n" + sleep(2) + print"チョキ\n" + sleep(1) + print"あいこー\n" + elsif cpu == 3 + print"ぽん\n" + print"チョキ\n" + sleep(2) + print"パー\n" + sleep(1) + print"キミのかちー\n" + end +elsif kobusi == 3 + if cpu == 1 + print"ぽん\n" + print"パー\n" + sleep(2) + print"グー\n" + sleep(1) + print"キミのかちー\n" + elsif cpu == 2 + print"ぽん\n" + print"パー\n" + sleep(2) + print"チョキ\n" + sleep(1) + print"キミのまけー\n" + elsif pcu == 3 + print"ぽん\n" + print"パー\n" + sleep(2) + print"パー\n" + sleep(1) + print"あいこー\n" + end +end diff --git a/seiyu/yone/README.md b/seiyu/yone/README.md new file mode 100644 index 0000000..7da6ce4 --- /dev/null +++ b/seiyu/yone/README.md @@ -0,0 +1,4 @@ +flyToのデモ +=========== + +[ふらいとぅ](../../raw/master/yone/parking.html) diff --git a/seiyu/yone/parking.html b/seiyu/yone/parking.html new file mode 100644 index 0000000..5322c63 --- /dev/null +++ b/seiyu/yone/parking.html @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + Photo Map + + + +

駐車場

+
+ + + diff --git a/seiyu/yone/parking.js b/seiyu/yone/parking.js new file mode 100644 index 0000000..1c07b60 --- /dev/null +++ b/seiyu/yone/parking.js @@ -0,0 +1,32 @@ +// 例: GeoJSONファイルを leaflet-ajax でロードする +var jsonmap = L.map("map").setView([38.891, 139.824], 16); +var layer = L.tileLayer( + 'https://cyberjapandata.gsi.go.jp/xyz/std/{z}/{x}/{y}.png', + {attribution: + '© 国土地理院' + }).addTo(jsonmap); + +function setProperty(f, layer) { // カスタムレイヤ作成用の関数 + let p = f.properties; // 受け取ったfeatureから + if (p) { // ポップアップを生成する + let name = p.name, desc = p.description; + let popup = "

" + name + "

" + "

" + (desc||"") + "

"; + layer.bindPopup(popup); + } +} + +// geojson外部ファイルの読み込みは次の行 +var gjl = omnivore.geojson("parking.geojson", + null, + //↓がポップアップつきのカスタムレイヤ + L.geoJson(null, {onEachFeature: setProperty})); +// ↑引数は順に: ファイル, 解析オプション, カスタムレイヤ +gjl.addTo(jsonmap); // マップに足す + +gjl.on("ready", function() { // 'ready' イベントに読み終わったときの処理 + jsonmap.fitBounds(gjl.getBounds()); // 読み取り失敗時は 'error' イベント +}); + +L.control.layers(null, { + "Triangle": gjl, +}).addTo(jsonmap); diff --git a/seiyu/yone/umapfly.js b/seiyu/yone/umapfly.js new file mode 100644 index 0000000..3dddd8f --- /dev/null +++ b/seiyu/yone/umapfly.js @@ -0,0 +1,218 @@ +/* + * Emulate uMap notation in your map + */ +var umappop = + umappop|| + function(a) +{ + +var globalMarker; +var colors = ["red", "green", "blue", "purple", "yellow", "cyan", "magenta"] +function wikiRepl(s) { + return s.replace(/{{(.*)\|([0-9][0-9]*)}}/g, + ''). + replace(/{{(.*)}}/g, ''). + replace(/\[\[(.*)\|(.*)\]\]/g, '$2'). + replace(/\[\[(.*)\]\]/g, '$1'). + replace(/^### (.*)/, '

$1

'). + replace(/^## (.*)/, '

$1

'). + replace(/^# (.*)/, '

$1

'); +} +// https://codepen.io/KryptoniteDove/post/load-json-file-locally-using-pure-javascript +function loadgeofile(arg, callback) { + var xobj = new XMLHttpRequest(); + xobj.overrideMimeType("application/json"); + xobj.open('GET', arg['file'], true); + xobj.onreadystatechange = function () { + if (xobj.readyState == 4 && xobj.status == "200") { + callback(arg, xobj.responseText); + } + }; + xobj.send(null); +} +function escapeHtml(str) { + return str.replace(/&/g, '&'). + replace(//g, '>'). + replace(/\"/g, '"'). + replace(/'/g, '''); +} +function bindPop(feature, layer) { + var altattrs = ["住所", "電話番号", "筆者", "撮影者"] + var d = feature.properties.description||feature.properties.desc||''; + var n = feature.properties.name||''; + var r = "", term; + for (var i=0; i\n" + + "
"+feature.properties[term]+"
\n"; + } + layer.bindPopup( + "

"+feature.properties.name + "

\n" + + "

"+wikiRepl(d)+"

\n" + ); +} + +function init(logfiles) { + if (!logfiles[0]) { + logfiles = [logfiles]; + } + var baseLayer = {}; + var map_osm = new L.tileLayer( // OpenStretMap + 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', { + attribution : '© OpenStreetMap contributors | Generated with geomapper' + }); + baseLayer["OpenStreetMap"] = map_osm; + + var map_gsi = new L.tileLayer( // 国土地理院 + 'https://cyberjapandata.gsi.go.jp/xyz/std/{z}/{x}/{y}.png', { + attribution: "国土地理院" + }); + baseLayer["地理院地図"] = map_gsi; + + var map_ort = new // 地理院オルソ + L.tileLayer('https://cyberjapandata.gsi.go.jp/xyz/ort/{z}/{x}/{y}.jpg', { + attribution: "国土地理院" + }); + baseLayer["地理院地図オルソ画像"] = map_ort; + var map_gazo = new L.tileLayer( // 地理院画像1974-1978 + 'https://cyberjapandata.gsi.go.jp/xyz/gazo1/{z}/{x}/{y}.jpg', { + attribution: "国土地理院" + }); + baseLayer["地理院画像(1974-1978)"] = map_gazo; + + if (L.BingLayer) { + var bing_key = + "AjyiuTOpH-_ZQdW4bvsPnNsjKBQQ6n59nrXj92ccHqwvKgiDHJxmo1tEJHs3w70K"; + map_bing = new L.BingLayer( // BingMap + bing_key, {type: "Road", culture: "ja"}); + baseLayer["Bing Map"] = new L.BingLayer( + bing_key, {type: "Road", culture: "ja"}); + baseLayer["Bing Map 衛星写真"] = new L.BingLayer( + bing_key, {type: "Aerial", culture: "ja"}); + var bing_dbl = baseLayer["Bing Map 衛星写真+ラベル"] = new L.BingLayer( + bing_key, {type: "AerialWithLabels", culture: "ja"}); + } + if (L.Google) { + baseLayer["Google Map"] = new L.Google("ROADMAP"); + baseLayer["Google Map 衛星写真"] = new L.Google('SATELLITE'); + baseLayer["Google Map 衛星写真+ラベル"] = new L.Google('HYBRID'); + } + + // 愛子 + var map = L.map('map', {layers: [bing_dbl]}).setView([38.273295,140.761600], 14); + var mapControl = L.control.layers(baseLayer, null).addTo(map); + var markerLayers = L.featureGroup(); + var centermarker; + var fileptn = /\.o?(gpx|csv|kml|geojson|topojson|polyline|umap)/i; + for (var i=0; i 1) + setTimeout(function() { + map.flyTo(markerLayers.getBounds().getCenter(), 15); + // alert("FOO"+globalMarker); + setTimeout(function() { + globalMarker && globalMarker.openPopup(); + }, 4000); + }, 2000); + //else + // map.setView(markerLayers.getLatLngs()[0], 13); + mapControl.addOverlay(jsonLayer, title); + } + }); + } + } // End of logfiles loop + L.control.scale().addTo(map); + + function round(n, d) { + return Math.round(n * Math.pow(10, d))/Math.pow(10, d); + } + var latlngform = document.getElementById("latlng"); + function displayLatLng(lat, lon) { + lat = round(lat, 5); lon = round(lon, 5); + latlngform.textContent = lat+", "+lon; + } + + map.on('contextmenu', function(e) { + if (e.originalEvent.shiftKey) { + } else { + centermarker && map.removeLayer(centermarker); + displayLatLng(e.latlng.lat, e.latlng.lng); + centermarker = L.marker(e.latlng, {title: 'foo', draggable:true}).addTo(map) + centermarker.on('dragend', function(e) { + var la = e.target._latlng.lat, lo = e.target._latlng.lng; + displayLatLng(la, lo); + }); + map.panTo(e.latlng) + return false; + } + }); + // Marker in the CENTER position +} /* End of init() */ + +init(a); /* Call from toplevel */ +} +document.addEventListener("DOMContentLoaded", function() { + umappop([{'color': 'red', 'file': "yonezawa.geojson"}]); +}, false); diff --git a/seiyu/yone/yonezawa.geojson b/seiyu/yone/yonezawa.geojson new file mode 100644 index 0000000..f2bfbda --- /dev/null +++ b/seiyu/yone/yonezawa.geojson @@ -0,0 +1,67 @@ +{ + "type": "FeatureCollection", + "features": [ + { + "type": "Feature", + "properties": { + "name": "水泳県大会用駐車場", + "description": "砂利部分" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 140.10664701461795, + 37.927739271136716 + ] + } + }, + { + "type": "Feature", + "properties": { + "description": "砂利の部分が水泳用だそうです。", + "name": "砂利駐車場" + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + 140.10624468326571, + 37.92802277311798 + ], + [ + 140.10611057281497, + 37.92754039596018 + ], + [ + 140.1080632209778, + 37.927223040841014 + ], + [ + 140.1082026958466, + 37.92781120457875 + ], + [ + 140.10624468326571, + 37.92802277311798 + ] + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "name": "あたご食堂", + "description": "ここで集合してお昼どうですかね!?\n[[http://www.0141men.com/member/atago/index.html]]" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 140.0937080383301, + 37.91271633417471 + ] + } + } + ] +} \ No newline at end of file diff --git a/seiyu/zemi_member/README.md b/seiyu/zemi_member/README.md new file mode 100644 index 0000000..c1a683a --- /dev/null +++ b/seiyu/zemi_member/README.md @@ -0,0 +1 @@ +### ゼミメンバー \ No newline at end of file diff --git a/seiyu/zemi_member/meibo.txt b/seiyu/zemi_member/meibo.txt new file mode 100644 index 0000000..f4a5194 --- /dev/null +++ b/seiyu/zemi_member/meibo.txt @@ -0,0 +1 @@ +C1160818 佐々木大器 diff --git a/seiyu/zemigashuku2018/README.md b/seiyu/zemigashuku2018/README.md new file mode 100644 index 0000000..c5881b3 --- /dev/null +++ b/seiyu/zemigashuku2018/README.md @@ -0,0 +1,99 @@ +更新(7/17) + +### 持ち物 + +### 経路 +８時B研集合（８時３０分出発）と同時にお金徴収と２０歳か確認 +米山SAで一度到のメイル（大谷へ) +北陸道に行く（関越じゃない) +長野道に入る + + +### 日程 +8月10日　輪講 +到着次第お買い物 +18時 夕食 +19時 輪講 +21時 宴会 +8月11日　輪講,遊び,イントロ +8月12日　発表,遊び,輪講 +8月13日　ソバうち + +### 配車 +#### 行き + +運転手|乗る人| +----|---- +いつしん|大谷、しょた| +志帆|築達| +直人|かなん、小松 | +薮田|momona、まさし| +ふみや|カソノ、安達| +佐々木|小野寺、ゆうすけ| +吉田|まどか| + +#### 帰り + +運転手|乗る人| +----|---- +いつしん|小松、大谷、しょた| +志帆|築達、村上さん| +直人|かなん ひろた| +薮田|momona、まさし| +ふみや|カソノ、安達| +佐々木|小野寺、ゆうすけ| +吉田|まどか| + + + +#### 持ち物 +PC（wifiが使えるもの） +ACアダプター +服（長袖長ズボン帽子トレッキングのため） +タオル +歯ブラシ歯磨き粉 +輪講のレジュメ（４０枚） +ぷち論卒論スライドandレジュメ +洗濯剤 +#### 必要な人 +お菓子 +虫除けスプレー + +#### ゼミの持ち物 +緑袋 +延長コード +wifi機 +プロジェクター +HDMI変換機等 +プリンター + + +### OBOGの状況 +名前|期生|10(金)|11(土)|12(日)|13(月)|備考| +----|----|---- |----|----|----| +桂島|3|x|○|○|○|| +斉藤吉宗|6||||| +川井俊輝|8|○|○|○|○|| +井上和也|8|○|○|○|○|| +高橋貴広|8|||||土日参加| +高橋さん（嫁）||||||土日参加| +高梨|9| | | | | +鎌田|10|x|○|○午前まで| | | +xsota|10|○|○|○|○| | +斉藤拓也|ランボー？ | | | | | | +阿部|11 |○|○||| | +松本|11||||| | +村上|12|x|○昼から|○|○|11時25分駅着 | +荒木|13|||||| +前田哲|14|x|○|？|x|参加できるかわからなくなった| +合計15名 + + +##### 備考 +本間（予備車） +志帆車（荷物車）、吉田（荷物車の予備） + +### 注意点 +ガソリン満タンで出発（料金計算のため） +高速道路の写真or領収書(料金の確認) +直人さんは車を片付けること diff --git a/seiyu/zemigashuku2018/sanka_member.txt b/seiyu/zemigashuku2018/sanka_member.txt new file mode 100644 index 0000000..c690bc6 --- /dev/null +++ b/seiyu/zemigashuku2018/sanka_member.txt @@ -0,0 +1,33 @@ + +#### ゼミ4年and小松さん +小松 +志帆 +築達 +大谷 +いつしん +直人 +かなん +廣田 +合計８名 + + +#### ゼミ３年 +momona +まさし +薮田 +小野寺 +高橋ゆうすけ +佐々木 +ふみちゃん +カソノ +合計８名 + +#### さかたまっぷ +吉田 +山口まどか +しょた +安達 +合計４名 + +全体20名 + diff --git a/seiyu/zemigashuku2018/shopping_list.txt b/seiyu/zemigashuku2018/shopping_list.txt new file mode 100644 index 0000000..ec0992d --- /dev/null +++ b/seiyu/zemigashuku2018/shopping_list.txt @@ -0,0 +1,55 @@ +#### 酒 +ほろよい（箱買い） +ヨーグルト酒（ヨー子） +ウォッカ + +##### ウィスキー +ブラックニッカ（サントリーならなんでもおｋ） + +#### 日本酒 +白露水珠　純米大吟醸（大谷が飲みたい） +青瓶澪（あまーい） +黒瓶澪（ほろあま） + +#### リキュール +カルーア + +#### 焼酎 +爽（２本）orペットボトル2.7L + +#### ワイン +募集中 + +#### ビール +恵比寿ビール +アサヒビール + +#### ジュース +おいしいぶどうのジュース（色が濃い目のジュース　高いやつ　三浦先生より） +お茶 +コーラ +カルピス +三ツ矢サイダー +牛乳 +甘酒 +ジンジャーエール +強炭酸水（業務用スーパー） +ライムジュース + +#### つまみ +柿ピー +アーモンド +クラッツ +するめ +チーズ系 +ホタテのやつ +しめさば +チーズかまぼこ +チーズたら +さきいか +カシューナッツ +ピスタチオ + +####　備考 +こっちで買い物は３万〜４万 +ゼミ費から５０００円出す diff --git a/seiyu2 b/seiyu2 deleted file mode 160000 index 8738c27..0000000 --- a/seiyu2 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8738c27c08d6e2d0411c4c3f5c4d1aa52cc1afd6 diff --git a/tamesi.md~ b/tamesi.md~ deleted file mode 100644 index f6e64e7..0000000 --- a/tamesi.md~ +++ /dev/null @@ -1,3 +0,0 @@ -### If you can't wake up early in the morning. -解決方法 - diff --git a/zemi_member/meibo.txt b/zemi_member/meibo.txt index 74373c1..3f034ed 100644 --- a/zemi_member/meibo.txt +++ b/zemi_member/meibo.txt @@ -1,3 +1,11 @@ C1160818 佐々木大器 +<<<<<<< HEAD c1151446 本間可楠 +======= +C1150872 佐藤直人 +C1160310 大石桃菜 +みつゆき +c1150369 大谷宏行 +じゃあ こまつさん こまつさん こまつさん +>>>>>>> origin/sasaki2 diff --git a/zemi_member/rmdir.txt b/zemi_member/rmdir.txt new file mode 100644 index 0000000..03541d1 --- /dev/null +++ b/zemi_member/rmdir.txt @@ -0,0 +1,5 @@ +.gitの削除 + find . -type d -name .git で.gitがあるか確認 + + find . -type d -name .git -print0 | xargs -0 rm -rf +で削除できる diff --git "a/zemi_member/\357\275\203onfurikuto.txt" "b/zemi_member/\357\275\203onfurikuto.txt" new file mode 100644 index 0000000..ba02315 --- /dev/null +++ "b/zemi_member/\357\275\203onfurikuto.txt" @@ -0,0 +1,7 @@ +ささき +<<<<<<< HEAD +ささき3世 +======= +ささき2世 +>>>>>>> sasaki +おーーーコンフリクト!!!!!!!!! diff --git a/zemigashuku2018/README.md b/zemigashuku2018/README.md index c5881b3..2766532 100644 --- a/zemigashuku2018/README.md +++ b/zemigashuku2018/README.md @@ -1,13 +1,16 @@ -更新(7/17) - -### 持ち物 +更新(7/31) ### 経路 -８時B研集合（８時３０分出発）と同時にお金徴収と２０歳か確認 -米山SAで一度到のメイル（大谷へ) -北陸道に行く（関越じゃない) +８時B研集合（８時３０分出発）と同時にお金徴収と２０歳か確認 +お昼は車ごとに食べてね（自費） +黒崎ICで一度到着のメイル（大谷へ)（ちょうどお昼くらい） +北陸道に行く（関越は東京にいっちゃう) 長野道に入る +### 泊まるとこ +[シルバー音羽ホームページ](http://www.mmjp.or.jp/silver-otowa/) +[シルバー音羽googlemap](https://www.google.co.jp/maps/place/%E3%82%B7%E3%83%AB%E3%83%90%E3%83%BC%E9%9F%B3%E7%BE%BD/@36.870404,138.1814803,17z/data=!3m1!4b1!4m7!3m6!1s0x5ff63cf8ab7f5e93:0x2726b43454455029!5m1!1s2018-08-14!8m2!3d36.870404!4d138.183669) + ### 日程 8月10日　輪講 @@ -17,7 +20,7 @@ 21時 宴会 8月11日　輪講,遊び,イントロ 8月12日　発表,遊び,輪講 -8月13日　ソバうち +8月13日　ソバ食べて現地解散 ### 配車 #### 行き @@ -26,74 +29,85 @@ ----|---- いつしん|大谷、しょた| 志帆|築達| -直人|かなん、小松 | +直人|ゆうすけ | 薮田|momona、まさし| -ふみや|カソノ、安達| -佐々木|小野寺、ゆうすけ| +ふみや|カソノ| +佐々木|小野寺、小松| +かなん|安達| 吉田|まどか| #### 帰り 運転手|乗る人| ----|---- -いつしん|小松、大谷、しょた| -志帆|築達、村上さん| -直人|かなん ひろた| +いつしん|大谷、しょた| +志帆|築達、荒木さん| +直人|ゆうすけ| 薮田|momona、まさし| -ふみや|カソノ、安達| -佐々木|小野寺、ゆうすけ| +ふみや|カソノ| +佐々木|小野寺、小松| +かなん|安達| 吉田|まどか| - - #### 持ち物 PC（wifiが使えるもの） ACアダプター -服（長袖長ズボン帽子トレッキングのため） +服（長袖長ズボン.帽子.靴トレッキングのため）山だからめっちゃ寒い タオル 歯ブラシ歯磨き粉 輪講のレジュメ（４０枚） ぷち論卒論スライドandレジュメ 洗濯剤 + #### 必要な人 お菓子 -虫除けスプレー +虫除けスプレー +水着(泳ぎたい人) #### ゼミの持ち物 -緑袋 -延長コード -wifi機 -プロジェクター -HDMI変換機等 -プリンター - - +道具|責任者| +----|----| +緑袋|直人| +延長コード|直人| +wifi中継機 |佐々木| +プロジェクター（壊れないように）|薮田| +予備プロジェクター（ミニのやつ）|薮田| +HDMI変換機等 |直人| +プリンターと印刷用紙 |志帆| +ドローン |いつしん| +イントロ用wifi|かなん| +イントロ用スピーカー|かなん| ### OBOGの状況 名前|期生|10(金)|11(土)|12(日)|13(月)|備考| ----|----|---- |----|----|----| -桂島|3|x|○|○|○|| -斉藤吉宗|6||||| -川井俊輝|8|○|○|○|○|| -井上和也|8|○|○|○|○|| +桂島倫子|3|x|○|○|○|駅16:00着 13日駅10時44分| +斉藤好宗|6|×|○|○|○|夕方駅| +三浦彰人|7||○(夜から)|○|○|車| +川井俊輝|8|×|○|○|○|| +井上和也|8|×|○|○|○|夕方17時| 高橋貴広|8|||||土日参加| 高橋さん（嫁）||||||土日参加| -高梨|9| | | | | -鎌田|10|x|○|○午前まで| | | -xsota|10|○|○|○|○| | -斉藤拓也|ランボー？ | | | | | | -阿部|11 |○|○||| | -松本|11||||| | -村上|12|x|○昼から|○|○|11時25分駅着 | -荒木|13|||||| -前田哲|14|x|○|？|x|参加できるかわからなくなった| -合計15名 +xsota|10|○|○|○|○|車| +斉藤拓也|ランボー？ |○|○|○|○| | +阿部誠吾|11 |○|○|||車 11時泊まらない| +松本直|11||○(夜)|○|○|車 | +村上正樹|12|x|○昼から|○朝食まで|×|11時25分駅着 9時44分の電車に乗る| +荒木勇人|13|×|○|○|○|16:00駅着| +渡辺雄生|13|||○|○|12日着で一泊　13:30駅着| +今野稔|13|||○|○|12日着で一泊　13:30駅着| +だいもんさん|||○(昼)|○(昼)||車| + +合計16名 ##### 備考 本間（予備車） -志帆車（荷物車）、吉田（荷物車の予備） +志帆車（荷物車）、吉田（荷物車の予備) +吉田山口蕎麦なし ### 注意点 -ガソリン満タンで出発（料金計算のため） -高速道路の写真or領収書(料金の確認) -直人さんは車を片付けること +ガソリン満タンで出発（ガソリン料金計算のため） +高速道路の料金は一律で後日渡す +直人さんは車を片付けること +カソノさんのガチャ課金についての発表スライド + diff --git a/zemigashuku2018/sanka_member.txt b/zemigashuku2018/sanka_member.txt index c690bc6..27e06fc 100644 --- a/zemigashuku2018/sanka_member.txt +++ b/zemigashuku2018/sanka_member.txt @@ -1,4 +1,3 @@ - #### ゼミ4年and小松さん 小松 志帆 @@ -7,10 +6,9 @@ いつしん 直人 かなん -廣田 -合計８名 - - +合計7名 + + #### ゼミ３年 momona まさし @@ -21,13 +19,13 @@ ふみちゃん カソノ 合計８名 - + #### さかたまっぷ 吉田 山口まどか しょた 安達 合計４名 - -全体20名 - + +全体19名 + diff --git a/zemigashuku2018/shopping_list.txt b/zemigashuku2018/shopping_list.txt index ec0992d..574fe64 100644 --- a/zemigashuku2018/shopping_list.txt +++ b/zemigashuku2018/shopping_list.txt @@ -1,3 +1,6 @@ +#### ノンアル +いろいろ + #### 酒 ほろよい（箱買い） ヨーグルト酒（ヨー子）