Mercurial > hgrepos > hgweb.cgi > skipweb
changeset 2453:1ec5287ed88f
merged
| author | ISHIKAWA MAI <c113017@e.koeki-u.ac.jp> |
|---|---|
| date | Tue, 07 Jul 2015 19:42:11 +0900 |
| parents | 23bbcae3d552 (diff) bb0bb56efa7b (current diff) |
| children | deec58998e17 7a25f6aa689a |
| files | |
| diffstat | 41 files changed, 497 insertions(+), 102 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/2014OC/2015test/index.html Tue Jul 07 19:42:11 2015 +0900 @@ -0,0 +1,42 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" + "http://www.w3.org/TR/html4/strict.dtd"> +<html> +<head> +<title>2015オアシス酒田祭</title> +<link rel="stylesheet" type="text/css" href="account.css"> +</head> + +<body> +<h1>2015オアシス酒田祭</h1> +<p>入力してね</p> +<form method="POST" action="./test.rb"> +<p>名前:<input name="name" type="text">(ニックネーム)</p> +<p>生別:<select name="sex"> + <option value="B">男 + <option value="G">女 + </select></p> +<p>年代:<select name="age"> + <option>10代以下 + <option>20代 + <option>30代 + <option>40代 + <option>50代 + <option>60代以上 + </select></p> +<p>出身地:<select name="aria"> + <option>酒田市内 + <option>山形県内 + <option>県外 + </select></p> +<p>キャラ:<select name="cal"> + <option value="sisip">シシップ + <option value="kamon">カモン + <option value="boy">男の子 + <option value="girl">女の子 + </select></p> +<p>(好きなキャラを選んでください)</p> +<input type="submit" value="OK"><br> +<img src="account.png" width="幅" height="画像の高さ" alt="代替テキスト"> +</form> +</body> +</html>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/2014OC/2015test/test.rb Tue Jul 07 19:42:11 2015 +0900 @@ -0,0 +1,71 @@ +#!/usr/bin/env ruby +# -*- coding: utf-8 -*- + +require 'cgi' +require 'sqlite3' +require './magic.rb' + +c = CGI.new(:accept_charset => "UTF-8") +db = SQLite3::Database.new("./sql/stamp.sq3") + +begin + result = db.execute("select * from main;") + max = "select max(id) from main;" +rescue + db.execute("create table main(id INTEGER PRIMARY KEY AUTOINCREMENT,name,sex,age,aria,cal,stamp_status,stamp_img,exp INTEGER,rank INTEGER,magic)"); + db.execute("insert into main(name,sex,age,aria,cal,stamp_status,stamp_img,exp,rank,magic) values('名前','性別','年代','住所','職業','スタンプ状況','スタンプ画像','レベル','当選順位','本人確認用')"); + result = db.execute("select * from main;") + max = "select max(id) from main;" +end + +id = c.cookies["id"][0] +c_magic = c.cookies["magic"][0] +name = c["name"] +cal = c["cal"] +age = c["age"] +sex = c["sex"] +aria = c["aria"] + +begin +sel = 'select * from main where id=? AND magic=?' +h = db.execute(sel, id.to_i, c_magic.to_i) +rescue +h == [] +end + +if id != nil && h != [] +update = 'update main set name=?, cal=?, age=?, sex=?, aria=? where id=? and magic=?' +mg = c_magic +db.execute(update, name, cal, age, sex, aria, id.to_i, mg.to_i) +else +code = magic() +id = db.execute(max).flatten(2)[0].to_i + 1 +mg = code[id] +sql = "insert into main(name,sex,age,aria,cal,stamp_status,stamp_img,exp,rank,magic) values (?,?,?,?,?,?,?,?,?,?);" +db.execute(sql,name,sex,age,aria,cal,'000010000','n,n,n,n,kamo1,n,n,n,n',0,0,mg); #初期値 +end + +expires = "SAT, 26 Oct 2015 00:00:00 GMT" + + +printf(<<_EOS_,id, expries, mg.to_s, exprires) +Content-type: text/html; charset=UTF-8 +Set-Cookie:id=%s ;expires=%s +Set-Cookie:magic=%s;expires=%s + +<html> +<head> +<title>#{id}</title> +<link rel="stylesheet" type="text/css" href="../cssrubyII.css"> +</head> +<body> +<p> +・#{name}<br>・#{cal}<br>・#{age}<br>・#{sex}<br>・#{aria}<br>・#{id} +</p> + +<p> +tukaretanaaaa、#{names} +</p> +</body> +</html> +_EOS_
--- a/oasis2015/accountcheck.rb Tue Jul 07 19:38:24 2015 +0900 +++ b/oasis2015/accountcheck.rb Tue Jul 07 19:42:11 2015 +0900 @@ -39,17 +39,19 @@ Set-Cookie:id=%s ;expires=%s Set-Cookie:pass=%s ;expires=%s\n\n", id, expires, id2, expires) -printf(<<_EOS_, name, id.to_i-1) +printf(<<_EOS_, name, id.to_i) <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> <html> <head> <title>Registering Account</title> -<link rel="stylesheet" type="text/css" href="design.css"> +<link rel="stylesheet" type="text/css" href="profeel.css"> </head> -<p>ようこそ%sさん。</p> -<p>あなたのIDは%04dです。抽選はこのIDを元に行われます</p> -<p>下記リンクからスタンプラリーを開始して下さい!</p> -<p><a href="prof.rb"> >> Let\'s go oasis-fes! << </a></p> +<body> +<h1>さかたっち</h1> +<h2>登録が完了しました!</h2> +<p>ようこそ_ %s _さん!</p> +<p>あなたのIDは%04dです。抽選はこのIDを元に行われます。</p> +<a href="prof.rb"><div class="lets"><span>始めよう!</span></div></a> <form method="POST" type="text"> </form> </body></html>
--- a/oasis2015/gets.rb Tue Jul 07 19:38:24 2015 +0900 +++ b/oasis2015/gets.rb Tue Jul 07 19:42:11 2015 +0900 @@ -113,14 +113,16 @@ <!-- --> </style> -<link rel="stylesheet" type="text/css" href="main.css"> +<link rel="stylesheet" type="text/css" href="profeel.css"> </head> <body> -<h1>%s</h1> +<header></header> +<h1>さかたっち</h1> +<h2>%s</h2> <p> %sさん<br> -pt:%d<br> +さかたポイント:%dp<br> %s </p> <table> @@ -140,6 +142,8 @@ <input type="text" name="trade" value="ここは スタッフ の 人 が つかうよ!"> <input type="submit" value="スタッフ ぼたん"><br>スタッフじゃない人はおさないでね! </form> + +<footer></footer> </body> </html>
--- a/oasis2015/gohan.rb Tue Jul 07 19:38:24 2015 +0900 +++ b/oasis2015/gohan.rb Tue Jul 07 19:42:11 2015 +0900 @@ -29,10 +29,25 @@ pt = cook[0][7] lv = cook[0][8] pre = "%" +if cal == "inu" +m3 = "あゆ" +elsif cal == "sisip" +m3 = "こども" +elsif cal == "kamon" +m3 = "とびうお" +elsif cal == "boy" +m3 = "たいりょう" +elsif cal == "girl" +m3 = "おひがし" +else +m3 = "skipskip" +end + + gohan = c["gohan"] -himitu = "" +#himitu = "" if gohan == "g1" && pt >= 1 exp += 1 pt -= 1 @@ -43,7 +58,7 @@ pt -= 3 db.execute(upd, exp, pt, person) kekka = "#{cal}がすごく成長した!" -elsif gohan == "skipskip" +elsif gohan == m3 if q10[0][0] == 0 exp += 10 db.execute(upd, exp, pt, person) @@ -53,7 +68,7 @@ kekka ="しつもん に こたえられるのは いっかい だけだよ!" end else - kekka = "ぽいんと足りてないでしょ!!!!" + kekka = "ポイント が たりない!" end if exp >= lv*10 && lv < 5 @@ -61,21 +76,47 @@ db.execute(lvupd, lv, person) kekka += "<br>レベルが上がった!<br>レベルが#{lv}になった!" end -modoru = '<br><a href="prof.rb">もどる!</a\>' + + +if cal == "inu" + image = "./img/inu#{lv}.png" + alt = "inu#{lv}" +elsif cal == "sisip" + image = "./img/sisip#{lv}.png" + alt = "sisip#{lv}" +elsif cal == "kamon" + image = "./img/kamon#{lv}.png" + alt = "kamon#{lv}" +elsif cal == "boy" + image = "./img/boy#{lv}.png" + alt = "boy#{lv}" +elsif cal == "girl" + image = "./img/girl#{lv}.png" + alt = "girl#{lv}" +else + image = "./img/snail.png" +end + + + + + +modoru = '<br><a href="prof.rb"><div class="lets"><span>ホーム' back = modoru if lv < 5 && gohan == "g1" || lv < 5 && gohan == "g2" mo = '<input type="button" value="おかわり!" onclick="location.reload();" />' back = mo + modoru elsif lv >= 5 - back += "レベルマックスだよ!" + back += "<br>(レベルマックスだよ!)" end +back += '</span></div></a>' cook = db.execute(data, person) exp = cook[0][6] pt = cook[0][7] lv = cook[0][8] -printf(<<_EOS_, name, exp, pt, kekka, back) +printf(<<_EOS_, image, alt, name, exp, pt, kekka, back) <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> @@ -86,19 +127,23 @@ <!-- --> </style> -<link rel="stylesheet" type="text/css" href="main.css"> +<link rel="stylesheet" type="text/css" href="profeel.css"> </head> <body> -<h1>gohanwoageruyooooooo!!!</h1> +<header></header> +<h1>さかたっち</h1> +<img src=%s alt=%s width="133" height="133"> + <p> %sさん<br> exp:%d<br> pt:%d<br> %s +</p> -</p> -<p>%s</p> +%s +<footer></footer> </body> </html>
--- a/oasis2015/index.html Tue Jul 07 19:38:24 2015 +0900 +++ b/oasis2015/index.html Tue Jul 07 19:42:11 2015 +0900 @@ -2,42 +2,43 @@ "http://www.w3.org/TR/html4/strict.dtd"> <html> <head> -<title>2015オアシス酒田祭</title> -<link rel="stylesheet" type="text/css" href="main.css"> +<title>さかたっち</title> +<link rel="stylesheet" type="text/css" href="profeel.css"> </head> <body> -<h1>2015オアシス酒田祭</h1> -<p>入力してね</p> +<h1>さかたっち</h1><h2>~酒田の自然に囲まれて~</h2> +<p>キャラクターを登録しよう!</p> <form method="POST" action="./accountcheck.rb"> -<p>名前:<input name="name" type="text">(ニックネーム)</p> -<p>性別:<select name="sex"> +<table> +<tr><td>名前</td><td><input name="name" type="text" size="15"></td></tr> +<tr><td>性別</td><td><select name="sex"> <option value="B">男 <option value="G">女 - </select></p> -<p>年代:<select name="age"> + </select></td></tr> +<tr><td>年代</td><td><select name="age"> <option>10代以下 <option>20代 <option>30代 <option>40代 <option>50代 <option>60代以上 - </select></p> -<p>出身地:<select name="aria"> + </select></td></tr> +<tr><td>出身地</td><td><select name="aria"> <option>酒田市内 <option>山形県内 <option>県外 - </select></p> -<p>キャラ:<select name="cal"> - <option value="snail">なめくじ + </select></td></tr> +<tr><td>キャラ</td><td><select name="cal"> + <option value="inu">いぬ <option value="sisip">シシップ <option value="kamon">カモン <option value="boy">男の子 <option value="girl">女の子 - </select></p> -<p>(好きなキャラを選んでください)</p> -<input type="submit" value="OK"><br> + </select></td></tr> +<tr><td></td><td><input type="submit" value="送信"></td></tr> +</table> <img src="account.png" width="幅" height="画像の高さ" alt=""> </form> </body>
--- a/oasis2015/prof.rb Tue Jul 07 19:38:24 2015 +0900 +++ b/oasis2015/prof.rb Tue Jul 07 19:42:11 2015 +0900 @@ -13,24 +13,71 @@ jikan1 = "select * from time where cd = ?" timeupd = "update time set now = ?, id = ? where cd = ?" -# id = cook[0][0] - name = cook[0][1] - cal = cook[0][2] - age = cook[0][3] - sex = cook[0][4] - aria = cook[0][5] - exp = cook[0][6] - pt = cook[0][7] - lv = cook[0][8] +que = "select * from toi where id = ?" +queupd = "update toi set q1 = ?, q2 = ?, q3 = ?, q4 = ?, q5 = ? where id = ?" +toi = db.execute(que, person) + +bomd = "update test set pt = ? where id = ?" +name = cook[0][1] +cal = cook[0][2] +age = cook[0][3] +sex = cook[0][4] +aria = cook[0][5] +exp = cook[0][6] +pt = cook[0][7] +lv = cook[0][8] + + +q1 = toi[0][1] +q2 = toi[0][2] +q3 = toi[0][3] +q4 = toi[0][4] +q5 = toi[0][5] per ="%" +##################--ptを獲得するための乱数生成--############# +##################----############################# + +def qrc() + srand(11223344) + x = rand(10000000) + srand(x) + qrnumber = Hash.new("n") + qrarr = ["a", "b", "c", "d", "e"] + qrarr.length.times do |n| + qrnumber[rand(100000000)] = qrarr[n] + end + return qrnumber +end + ##################ptを獲得した際の反応。#################### #########前の人が書き込んだ時間と比べて60秒以内なら追加ポイント#### +kpt = 0 +bom = c["bom"] ####<form ~~ name="bom">より +if bom == "skip" +jikan2 = db.execute(jikan1, "j") +now1 = jikan2[0][1] +nowper = jikan2[0][2] +now2 = Time.now.to_i +db.execute(timeupd, now2, person, "j") + if person == nowper + elsif now1 == nil + elsif now2-now1 < 2 ####2秒以内なら~ + pt += 50 + kpt += 50 + end + pt += 1 + kpt += 1 +# db.execute(bomd, pt, person) +end -bom = c["bom"] -if bom == "skip" +qrAC = qrc ###生成したハッシュには、"乱数"=>"記号"が入っている +getAC = ARGV[0].to_i ###URL?以降の文字(特定の乱数)を取得 +qr = qrAC[getAC] ###特定の"乱数"が一致すると、"乱数"=>"記号"がqrに正しく入力される。 +if qr =="a" && q1 == 0 +q1 += 1 jikan2 = db.execute(jikan1, "a") now1 = jikan2[0][1] nowper = jikan2[0][2] @@ -40,51 +87,165 @@ elsif now1 == nil elsif now2-now1 < 60 pt += 2 + kpt += 2 + end +pt += 10 +kpt += 10 +elsif qr == "b" && q2 == 0 +q2 += 1 +jikan2 = db.execute(jikan1, "b") +now1 = jikan2[0][1] +nowper = jikan2[0][2] +now2 = Time.now.to_i +db.execute(timeupd, now2, person, "b") + if person == nowper + elsif now1 == nil + elsif now2-now1 < 60 + pt += 2 + kpt += 2 + end +pt += 10 +kpt += 10 +elsif qr == "c" && q3 == 0 +q3 += 1 +jikan2 = db.execute(jikan1, "c") +now1 = jikan2[0][1] +nowper = jikan2[0][2] +now2 = Time.now.to_i +db.execute(timeupd, now2, person, "c") + if person == nowper + elsif now1 == nil + elsif now2-now1 < 60 + pt += 2 + kpt += 2 end pt += 10 - bomd = "update test set pt = ? where id = ?" - db.execute(bomd, pt, person) + kpt += 10 +elsif qr == "d" && q4 == 0 +q4 += 1 +jikan2 = db.execute(jikan1, "d") +now1 = jikan2[0][1] +nowper = jikan2[0][2] +now2 = Time.now.to_i +db.execute(timeupd, now2, person, "d") + if person == nowper + elsif now1 == nil + elsif now2-now1 < 60 + pt += 2 + kpt += 2 + end + pt += 10 + kpt += 10 +elsif qr == "e" && q5 == 0 +q5 += 1 +jikan2 = db.execute(jikan1, "e") +now1 = jikan2[0][1] +nowper = jikan2[0][2] +now2 = Time.now.to_i +db.execute(timeupd, now2, person, "e") + if person == nowper + elsif now1 == nil + elsif now2-now1 < 60 + pt += 2 + kpt += 2 + end + pt += 10 + kpt += 10 end -if cal == "snail" -image = "./img/snail.png" -elsif cal == "sisip" -image = "./img/sisip.png" -elsif cal == "kamon" -image = "./img/kamon.png" -elsif cal == "boy" -image = "./img/boy.png" -elsif cal == "girl" -image = "./img/girl.png" -else -image = "./image/none.png" +db.execute(bomd, pt, person) +db.execute(queupd, q1, q2, q3, q4, q5, person) + +kkget = "" +if kpt > 0 + kkget = "#{kpt}ポイントゲット!!" end +########################~ここまでpt処理~################### +####################################################### + +if cal == "inu" + image = "./img/inu#{lv}.png" + alt = "inu#{lv}" + m1 = "ドッグフード" + mimg1 = "./img/food.png" + m2 = "にく" + mimg2 = "./img/niku.png" +elsif cal == "sisip" + image = "./img/sisip#{lv}.png" + alt = "sisip#{lv}" + m1 = "ぱん" + mimg1 = "./img/pan.png" + m2 = "きゃべつ" + mimg2 = "./img/kyabetsu.png" +elsif cal == "kamon" + image = "./img/kamon#{lv}.png" + alt = "kamon#{lv}" + m1 = "かい" + mimg1 = "./img/kai.png" + m2 = "とびうお" + mimg2 = "./img/fish.png" +elsif cal == "boy" + image = "./img/boy#{lv}.png" + alt = "boy#{lv}" + m1 = "つやひめ" + mimg1 = "./img/tsuya.png" + m2 = "ふね" + mimg2 = "./img/ship.png" +elsif cal == "girl" + image = "./img/girl#{lv}.png" + alt = "girl#{lv}" + m1 = "へや" + mimg1 = "./img/room.png" + m2 = "れんしゅう" + mimg2 = "./img/exp.png" +else + image = "./img/snail.png" + m1 = "たまごのから" + mimg1 = "./img/tamago.png" + m2 = "きゃべつ" + mimg2 = "./img/cabage.png" +end -#さかたぽいんと -gage = 50 #styleのmargin部分。50でちょうど中央。「経験値/必要経験値=いま何パー」のかたちで出力。 -#24/24 = 1 =20 -#22 = 0.916=25 -#20 = 0.833=30 -#18/24 = 0.75 =35 -#16 = 0.666=40 -#14 = 0.583=45 -#12/24 = 0.5 =50 -#10 = 0.416=55 -# 8 = 0.333=60 -# 6/24 = 0.25 =65 -# 4 = 0.166=70 -# 2 = 0.083=75 -# 0/24 = 0 =80 -#marginのleftが20パーであることに留意。(gageがレフトに揃うと(この場合20)で見た感じゲージMAXになる)20~80(79)の値を変動 +if lv == 1 +color = "black" +elsif lv ==2 +color = "navy" +elsif lv ==3 +color = "green" +elsif lv ==4 +color = "red" +elsif lv ==5 +color = "yellow" +else +color = "pink" +end +#expが10あがる毎にlvが1あがる。 +#expの1の位*10で、次のレベルアップに必要な経験値の割合が出る。 +#(exp=12の場合、2*10=『20%』、次のレベルアップまであと80%が必要、と分かる。) +#(exp=35の場合、5*10=『50%』、次のレベルアップまであと50%が必要、と分かる。) +gage = 0 +exp2 = exp +if lv < 5 +while exp2 >= 10 +exp2 -= 10 +end +gage = 100-exp2*10 +end + + + +###################################--HTML--################## +###################################--------################## #以下のprintfについて #pre*4はstyleの部分、<h2>{margin(本来OS_,per,gage,per,per,per,name...) -printf(<<_EOS_, name, lv, exp, pt, image, cal) +printf(<<_EOS_, per, gage, per, per, per, color, kkget, image, alt, name, person, cal, lv, pt, m1, mimg1, m2, mimg2) + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> @@ -92,29 +253,62 @@ <head> <title>さかたっち</title> <style type="text/css"> +<!-- +p.gage{ +background:#adf; +margin-left:0%s; +margin-right:%d%s; +text-align:left; +} +div.gage{ +background:#ddf; +margin-left:20%s; +margin-right:20%s; +} +div.cal div{float:left; border:solid %s;} + +--> </style> <link rel="stylesheet" type="text/css" href="profeel.css"> </head> + <body> +<header><p></p></header> +<h1>さかたっち</h1> +<h2>%s</h2> -<h1>さかたっち~酒田の自然に囲まれて~</h1> +<div class="cal"> +<div> +<img src=%s alt=%s width="172" height="172"> +</div> +<table class="state"><tr><td>name</td><td>:%s</td></tr> +<tr><td>id</td><td>:%04d</td></tr> +<tr><td>cal</td><td>:%s</td></tr> +<tr><td>lv.</td><td>%d</td></tr> +</table> +</div> -<p>NAME:%s</p> +<div class="gage"> +<p class="gage">exp</p> +</div> + <form method="POST" action="prof.rb"> -<input type="text" name="bom"> +<input type="text" name="bom" size="8"> <input type="submit"> </form> +<p>さかたポイント:%dp</p> +<table><tr><td> <form method="POST" action="gohan.rb"> <input type="checkbox" name="hdn">ごはん!<span><br> -<input type="radio" name="gohan" value="g1">たまごのから:1pt<img src="./img/tamago.png" - width="32" height="32"><br> -<input type="radio" name="gohan" value="g2">きゃべつ:3pt<img src="./img/cabage.png" width="32"height="32"><br> +<input type="radio" name="gohan" value="g1">%s:1pt<img src=%s width="16" height="16"><br> +<input type="radio" name="gohan" value="g2">%s:3pt<img src=%s width="16" height="16"><br><br> <input type="text" name="gohan" value="ひみつ の こたえ を いれてね!"><br> <input type="reset" value="とりけし"> <input type="submit" value="こうかんする!"></span> </form> +</td><td> <form method="POST" action="gets.rb"> <input type="checkbox" name="hdn">しょうひん!<span><br> <input type="radio" name="sho" value="s1">おちゃ:3pt<br> @@ -122,21 +316,14 @@ <input type="radio" name="sho" value="s3">せんたくせんざい:20pt<br> <input type="reset" value="とりけし"> <input type="submit" value="こうかんする!"></span><br> - -</span><br> +</span> </form> +</td></tr></table> -<table style="border: 0px solid; border-collapse: collapse; margin-left: - auto; margin-right: auto;"> -<tr><td>lv</td><td>:%d</td></tr> -<tr><td>exp</td><td>:%d</td></tr> -<tr><td>pt</td><td>:%d</td></tr> -</table> -<h2>lv1</h2> -<p><img src=%s alt=%s width="200" height="200"></p> <address>skip@xxxx.co.jp</address> +<footer></footer> </body> </html>
--- a/oasis2015/profeel.css Tue Jul 07 19:38:24 2015 +0900 +++ b/oasis2015/profeel.css Tue Jul 07 19:42:11 2015 +0900 @@ -1,2 +1,52 @@ +body{text-align:center; +background:#ffb; +} +header{ +#padding:100px; + position: relative; + top: 0px; + left: 0px; + width: 80%; + height: 200px; +background-image:url(./img/head.png); +text-align:center; +margin-left:auto;margin-right:auto; +} +footer{ +#padding:100px; + position: relative; + top: 0px; + left: 0px; + width: 80%; + height: 200px; +background-image:url(./img/foot.png); +text-align:center; +margin-left:auto;margin-right:auto; +} + + + +header p {color:red;} + input[type="checkbox"][name="hdn"] + span {display: none;} input[type="checkbox"][name="hdn"]:checked + span {display: inline;} + +table{margin-left:auto; margin-right: auto;} +table.state{text-align:left;} +table.state tr+tr+tr+tr{font-size:xx-large;} + +div.lets{ +border:solid 2px #fa0; +background:#faf; +padding:1% 0%; +margin:1em 17em; +} +div.lets span{color:navy; text-decoration: underline #faf;} + +div.cal {margin-left:auto; margin-right:auto; +width: 320px; height: 180px; +background: white} +#div.cal div{float:left; border:solid black;} + + +#form{margin-left:auto; margin-right:auto;}
--- a/syuzai/kagetsu/kagetsu.html Tue Jul 07 19:38:24 2015 +0900 +++ b/syuzai/kagetsu/kagetsu.html Tue Jul 07 19:42:11 2015 +0900 @@ -3,13 +3,6 @@ <html> <head> <title>γˣַ</title> -<style type="text/css"> - -<!-- - ---> - -</style> <link rel="stylesheet" type="text/css" href="kagetsu.css"> </head> @@ -32,7 +25,7 @@ ʤ麮ȡʤꤷƥѥɤʤߤޤ Υܥ塼!</p> -<h1><img src="kagetsu_1.jpg" width="640" height="360"></h1> +<h1><img src="kagetsu_one_png"></h1> <p>ٽä鲡褦˸Ƥܥȡơ ȥǥȤäƤޤΥǥȤϥ祳ࡼ @@ -41,7 +34,7 @@ ٥åȤƼǤΥե롼ĤȤä㡼٥åȤϡ䤿 ƴŤƤäǤ</p> -<h1><img src="kagetsu_2.jpg" width="640" height="360"></h1> +<h1><img src="kagetsu_two.png"></h1> <p>ӥ塼˱Ƥ줿Τϥʡդΰפд餬 Ƥǡǫ˱Ƥޤ</p>
