Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unity/2003:終わりの文字,はいれつ完成 #8

Open
wants to merge 34 commits into
base: dev/unity
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
6e83a81
ignoreを作り直します
bearl27 May 11, 2024
21ab396
Update .gitignore
bearl27 May 11, 2024
97a4463
All - in one
bearl27 May 11, 2024
50c7668
all - in one 2
bearl27 May 11, 2024
40de199
カメラが動くようになった
bearl27 May 11, 2024
a3e95a5
廊下の完成
bearl27 May 11, 2024
29997cc
壁付きの廊下完成
bearl27 May 11, 2024
01a7f4e
廊下と壁のせってい完成
bearl27 May 11, 2024
6622d5d
なぜgitignoreが動かない?
bearl27 May 11, 2024
195652b
ignore再始動
bearl27 May 11, 2024
10ee524
写真のでも
bearl27 May 14, 2024
a59daac
廊下への写真の配置のみ完了,廊下の時と部屋の時で変える
bearl27 May 14, 2024
c40ccdd
roomの壁
bearl27 May 14, 2024
8746126
key操作
bearl27 May 15, 2024
e68278d
写真と部屋の連携中
bearl27 May 15, 2024
b6475f5
写真がでかい...
bearl27 May 15, 2024
9a392c8
わたしの仕事は終わりだ!!
bearl27 May 15, 2024
9f78a22
歩くのも,写真の配置も完成
bearl27 May 16, 2024
b141946
手の位置変更
bearl27 May 17, 2024
5fb75f6
なぜか追加されたものの削除
bearl27 May 17, 2024
0b60185
藤吉との連携初めて,VRでも動く
bearl27 May 17, 2024
1c3b9de
写真の配置(ソートできてない)
stk1201 May 17, 2024
d6da8c6
画像配置を一部修正
stk1201 May 17, 2024
947a8ba
いらないものを消す
stk1201 May 17, 2024
069fa08
サイズ調整
stk1201 May 17, 2024
697d0fe
ライトつけた
stk1201 May 17, 2024
a6bfc51
写真の配置完了
stk1201 May 17, 2024
0a16e7c
tagの対応成功!
stk1201 May 17, 2024
aaae9b9
tagがs1とかになったので修正
stk1201 May 17, 2024
fc8192d
日本語フォント追加(圧縮)
stk1201 May 18, 2024
37ea62b
DBに送信する準備(テストしてない)
stk1201 May 18, 2024
767327a
日本語フォント(ひらがな)
stk1201 May 18, 2024
85e34a0
最後のところにおわり表示
stk1201 May 18, 2024
2efb610
おわりの文字完成
bearl27 May 18, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
3 changes: 3 additions & 0 deletions .gitattributes 2
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
*.aar filter=lfs diff=lfs merge=lfs -text
*.so filter=lfs diff=lfs merge=lfs -text
*.assets filter=lfs diff=lfs merge=lfs -text
19 changes: 8 additions & 11 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
# This .gitignore file should be placed at the root of your Unity project directory
#
# Get latest from https://github.com/github/gitignore/blob/main/Unity.gitignore
#
/[Ll]ibrary/
/[Tt]emp/
/[Oo]bj/
/[Bb]uild/
/[Bb]uilds/
/[Ll]ogs/
/[Uu]ser[Ss]ettings/
# Unity generated files
[Ll]ibrary/
[Tt]emp/
[Oo]bj/
[Bb]uild/
[Bb]uilds/
[Ll]ogs/
[Uu]ser[Ss]ettings/

# MemoryCaptures can get excessive in size.
# They also could contain extremely sensitive data
Expand Down
13 changes: 13 additions & 0 deletions museum/.idea/.idea.museum.dir/.idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions museum/.idea/.idea.museum.dir/.idea/.gitignore 2

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions museum/.idea/.idea.museum.dir/.idea/indexLayout 2.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions museum/.idea/.idea.museum.dir/.idea/indexLayout.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions museum/.idea/.idea.museum.dir/.idea/vcs 2.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions museum/.idea/.idea.museum.dir/.idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions museum/.vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"recommendations": [
"visualstudiotoolsforunity.vstuc"
]
}
10 changes: 10 additions & 0 deletions museum/.vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"version": "0.2.0",
"configurations": [
{
"name": "Attach to Unity",
"type": "vstuc",
"request": "attach"
}
]
}
55 changes: 55 additions & 0 deletions museum/.vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
{
"files.exclude": {
"**/.DS_Store": true,
"**/.git": true,
"**/.gitmodules": true,
"**/*.booproj": true,
"**/*.pidb": true,
"**/*.suo": true,
"**/*.user": true,
"**/*.userprefs": true,
"**/*.unityproj": true,
"**/*.dll": true,
"**/*.exe": true,
"**/*.pdf": true,
"**/*.mid": true,
"**/*.midi": true,
"**/*.wav": true,
"**/*.gif": true,
"**/*.ico": true,
"**/*.jpg": true,
"**/*.jpeg": true,
"**/*.png": true,
"**/*.psd": true,
"**/*.tga": true,
"**/*.tif": true,
"**/*.tiff": true,
"**/*.3ds": true,
"**/*.3DS": true,
"**/*.fbx": true,
"**/*.FBX": true,
"**/*.lxo": true,
"**/*.LXO": true,
"**/*.ma": true,
"**/*.MA": true,
"**/*.obj": true,
"**/*.OBJ": true,
"**/*.asset": true,
"**/*.cubemap": true,
"**/*.flare": true,
"**/*.mat": true,
"**/*.meta": true,
"**/*.prefab": true,
"**/*.unity": true,
"build/": true,
"Build/": true,
"Library/": true,
"library/": true,
"obj/": true,
"Obj/": true,
"ProjectSettings/": true,
"temp/": true,
"Temp/": true
},
"dotnet.defaultSolution": "museum.sln"
}
124 changes: 124 additions & 0 deletions museum/Assets/Board.prefab
Original file line number Diff line number Diff line change
@@ -0,0 +1,124 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &114291425049027667
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 542935365920783767}
- component: {fileID: 344593302161639486}
- component: {fileID: 1710303900544968691}
- component: {fileID: 4941007860764237804}
- component: {fileID: 8343826072106878255}
m_Layer: 0
m_Name: Board
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &542935365920783767
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 114291425049027667}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 0.05}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &344593302161639486
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 114291425049027667}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &1710303900544968691
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 114291425049027667}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!65 &4941007860764237804
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 114291425049027667}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &8343826072106878255
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 114291425049027667}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 93988441a44d045ecbfccf23d0a795e8, type: 3}
m_Name:
m_EditorClassIdentifier:
sORr: []
board: {fileID: 114291425049027667}
frame: {fileID: 0}
padding: 5
7 changes: 7 additions & 0 deletions museum/Assets/Board.prefab.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions museum/Assets/Exihibit.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading