減衰率
更新
更新
HPバー実装
Merge branch 'master' into Kenji

Conflicts:
	proj.ios/.DS_Store

proj.ios/ScrollAndPickUp.xcodeproj/project.xcworkspace/xcuserdata/gpn.xc
userdatad/UserInterfaceState.xcuserstate