diff --git a/Build/ucProjectionMappingUI/data/settings/homo_setting.xml b/Build/ucProjectionMappingUI/data/settings/homo_setting.xml
index 4ef7b2a..9b3b58d 100644
--- a/Build/ucProjectionMappingUI/data/settings/homo_setting.xml
+++ b/Build/ucProjectionMappingUI/data/settings/homo_setting.xml
@@ -36,50 +36,50 @@
0.000000000
0.000000000
- 0.015302574
- 0.013663390
+ 0.013464387
+ 0.013662502
0.003257328
0.000000000
- 0.016666675
+ 0.014843760
0.013657405
0.801302910
0.000000000
- 0.359635413
- 0.012152780
+ 0.359375000
+ 0.012384261
0.999999940
0.000000000
- 0.447831303
- 0.011765860
+ 0.447245419
+ 0.012059554
0.000000000
1.000000000
- 0.013197044
- 0.219428793
+ 0.011622036
+ 0.220359251
0.003257328
1.000000000
- 0.014583333
- 0.219444439
+ 0.013020832
+ 0.220370367
0.801302910
1.000000000
- 0.363281101
- 0.223379627
+ 0.362499833
+ 0.223148152
0.999999940
1.000000000
- 0.452998608
- 0.224392131
+ 0.451662928
+ 0.223856851
@@ -91,7 +91,7 @@
0.337500006
0.253061235
- 0.000000000
+ 0.004081632
0.000000000
0.000000000
@@ -109,38 +109,50 @@
0.000000000
0.000000000
- 0.550768614
- 0.019198352
+ 0.551670134
+ 0.019781318
- 0.201954395
+ 0.201298699
0.000000000
- 0.638541520
- 0.019791665
+ 0.639062345
+ 0.020254629
- 1.000000000
+ 0.996753275
0.000000000
- 0.980989814
+ 0.980989695
0.022106485
+
+ 1.000000000
+ 0.000000000
+ 0.982374251
+ 0.022113984
+
0.000000000
1.000000000
- 0.547840238
- 0.225635052
+ 0.548018038
+ 0.225635201
- 0.201954395
+ 0.201298699
1.000000000
0.635416687
0.225694388
+
+ 0.996753275
+ 1.000000000
+ 0.977369130
+ 0.225925937
+
1.000000000
1.000000000
- 0.977108777
- 0.225925922
+ 0.978753746
+ 0.225926861
@@ -170,7 +182,7 @@
0.000000000
0.000000000
- 0.499478996
+ 0.499739468
0.266550928
@@ -182,8 +194,8 @@
0.000000000
1.000000000
- 0.015885413
- 0.265277684
+ 0.015624997
+ 0.265740663
1.000000000
@@ -219,13 +231,13 @@
0.000000000
0.000000000
- 0.502343655
- 0.497800857
+ 0.500781178
+ 0.498032361
1.000000000
0.000000000
- 0.503556669
+ 0.501733720
0.266748220
@@ -237,7 +249,7 @@
1.000000000
1.000000000
- 0.987060905
+ 0.987321258
0.268796116
@@ -250,8 +262,8 @@
0.281250000
0.000000000
- 0.248979598
- 0.200000003
+ 0.167346939
+ 0.151020408
0.000000000
1 0.959184 0.779592 0.473469 0
@@ -268,56 +280,56 @@
0.000000000
0.000000000
- 0.061197959
- 0.508217573
+ 0.060677134
+ 0.507060111
- 0.800653636
+ 0.856643319
0.000000000
- 0.389843732
- 0.507407427
+ 0.390624970
+ 0.506944418
- 1.000000000
+ 0.999999940
0.000000000
- 0.473067582
- 0.507202268
+ 0.446639031
+ 0.506924748
0.000000000
- 0.833333313
- 0.060937524
- 0.687962949
+ 0.868794322
+ 0.060677115
+ 0.687268496
- 0.800653636
- 0.833333313
- 0.385677308
- 0.689583361
+ 0.856643319
+ 0.868794322
+ 0.386198133
+ 0.689351857
- 1.000000000
- 0.833333313
- 0.467895627
- 0.689993680
+ 0.999999940
+ 0.868794322
+ 0.441450089
+ 0.689705491
0.000000000
1.000000000
- 0.060886163
- 0.723407745
+ 0.060677115
+ 0.714069247
- 0.800653636
+ 0.856643319
1.000000000
- 0.384855866
- 0.725500584
+ 0.385539889
+ 0.716474593
- 1.000000000
+ 0.999999940
1.000000000
- 0.466875941
- 0.726030409
+ 0.440678567
+ 0.716882825
@@ -328,9 +340,9 @@
0.285714298
0.281250000
- 0.253061235
+ 0.151020408
0.000000000
- 0.200000003
+ 0.151020408
0.000000000
1 0.959184 0.779592 0.473469 0
@@ -347,56 +359,56 @@
0.000000000
0.000000000
- 0.528113663
- 0.506929398
+ 0.563205481
+ 0.504824758
- 0.201954395
+ 0.131205678
0.000000000
0.614843726
- 0.506134331
+ 0.504282475
1.000000000
0.000000000
- 0.955729187
- 0.503009319
+ 0.956510544
+ 0.500694513
0.000000000
- 0.833333313
- 0.539631963
- 0.697383821
+ 0.868794322
+ 0.574092627
+ 0.696260095
- 0.201954395
- 0.833333313
- 0.623697996
- 0.696412206
+ 0.131205678
+ 0.868794322
+ 0.623958409
+ 0.695717752
1.000000000
- 0.833333313
- 0.954167008
- 0.692592680
+ 0.868794322
+ 0.953906417
+ 0.692129731
0.000000000
1.000000000
- 0.541851580
- 0.734084129
+ 0.575672150
+ 0.724034846
- 0.201954395
+ 0.131205678
1.000000000
- 0.625404239
- 0.733079970
+ 0.625280797
+ 0.723492742
1.000000000
1.000000000
- 0.953865945
- 0.729132295
+ 0.953528523
+ 0.719905436
@@ -408,9 +420,9 @@
0.281250000
0.000000000
- 0.248979598
+ 0.155102044
0.000000000
- 0.191836730
+ 0.155102044
1 0.959184 0.779592 0.473469 0
1 0.959184 0.779592 0.473469 0
@@ -426,56 +438,56 @@
0.000000000
0.000000000
- 0.049426761
- 0.758962214
+ 0.049712840
+ 0.764915228
- 0.800653636
+ 0.865724385
0.000000000
- 0.373488545
- 0.764974952
+ 0.373918116
+ 0.771347702
1.000000000
0.000000000
- 0.451260865
- 0.766418099
+ 0.422218323
+ 0.772306025
0.000000000
- 0.160958901
- 0.050000001
- 0.793402970
+ 0.134275615
+ 0.050260417
+ 0.792939961
- 0.800653636
- 0.160958901
- 0.371875018
+ 0.865724385
+ 0.134275615
+ 0.372656286
0.798379600
1.000000000
- 0.160958901
- 0.449141681
- 0.799574256
+ 0.134275615
+ 0.420697808
+ 0.799190223
0.000000000
1.000000000
- 0.052864585
- 0.965509355
+ 0.053645834
+ 0.966203809
- 0.800653636
+ 0.865724385
1.000000000
- 0.363802075
- 0.965509355
+ 0.364843756
+ 0.965740979
1.000000000
1.000000000
- 0.438536167
- 0.965509355
+ 0.411281437
+ 0.965671897
@@ -486,10 +498,10 @@
0.285714298
0.281250000
- 0.244897962
+ 0.163265303
0.000000000
0.000000000
- 0.200000003
+ 0.146938771
1 0.959184 0.779592 0.473469 0
1 0.959184 0.779592 0.473469 0
@@ -505,56 +517,56 @@
0.000000000
0.000000000
- 0.542566240
- 0.764292836
+ 0.569560468
+ 0.773987412
- 0.196721315
+ 0.140350878
0.000000000
- 0.620469034
- 0.765210211
+ 0.620947599
+ 0.774590909
1.000000000
0.000000000
- 0.942709208
- 0.769005120
+ 0.941330373
+ 0.778353035
0.000000000
- 0.166666672
- 0.542434573
- 0.799918592
+ 0.128113866
+ 0.569416225
+ 0.800026178
- 0.196721315
- 0.166666672
- 0.620312512
- 0.800925910
+ 0.140350878
+ 0.128113866
+ 0.620833337
+ 0.800694466
1.000000000
- 0.166666672
- 0.942448258
- 0.805092514
+ 0.128113866
+ 0.941406548
+ 0.804861069
0.000000000
- 1.000000000
- 0.541777492
- 0.977711678
+ 0.999999940
+ 0.568429768
+ 0.978052974
- 0.196721315
- 1.000000000
- 0.619531095
+ 0.140350878
+ 0.999999940
+ 0.620051980
0.979166687
1.000000000
- 1.000000000
- 0.941146076
- 0.985185087
+ 0.999999940
+ 0.941927314
+ 0.986110985
diff --git a/Unity_2018_Frozen/Assets/Frozen/Frozen.unity b/Unity_2018_Frozen/Assets/Frozen/Frozen.unity
index 243fdd2..5e5f407 100644
--- a/Unity_2018_Frozen/Assets/Frozen/Frozen.unity
+++ b/Unity_2018_Frozen/Assets/Frozen/Frozen.unity
@@ -973,6 +973,7 @@ GameObject:
- component: {fileID: 179856632}
- component: {fileID: 179856634}
- component: {fileID: 179856633}
+ - component: {fileID: 179856635}
m_Layer: 8
m_Name: Wall
m_TagString: Untagged
@@ -1034,6 +1035,19 @@ MeshFilter:
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 179856631}
m_Mesh: {fileID: 0}
+--- !u!114 &179856635
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 179856631}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 10faf8bca5ee3e343b88e67ee7f1241d, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ dayColor: {r: 0.9019608, g: 0.9019608, b: 0.9019608, a: 1}
+ nightColor: {r: 1, g: 1, b: 1, a: 1}
--- !u!1 &182553293
GameObject:
m_ObjectHideFlags: 0
@@ -3023,6 +3037,136 @@ MeshFilter:
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 575691238}
m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!43 &593968383
+Mesh:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_Name: 'Space Ground Mesh: (8x5x3)'
+ serializedVersion: 8
+ m_SubMeshes:
+ - serializedVersion: 2
+ firstByte: 0
+ indexCount: 24
+ topology: 0
+ baseVertex: 0
+ firstVertex: 0
+ vertexCount: 16
+ localAABB:
+ m_Center: {x: 0, y: 1.5, z: 0}
+ m_Extent: {x: 4, y: 1.5, z: 2.5}
+ m_Shapes:
+ vertices: []
+ shapes: []
+ channels: []
+ fullWeights: []
+ m_BindPose: []
+ m_BoneNameHashes:
+ m_RootBoneNameHash: 0
+ m_MeshCompression: 0
+ m_IsReadable: 0
+ m_KeepVertices: 1
+ m_KeepIndices: 1
+ m_IndexFormat: 0
+ m_IndexBuffer: 000001000200010003000200040005000600050007000600080009000a0009000b000a000c000d000e000d000f000e00
+ m_Skin: []
+ m_VertexData:
+ m_CurrentChannels: 11
+ m_VertexCount: 16
+ m_Channels:
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 3
+ - stream: 0
+ offset: 12
+ format: 0
+ dimension: 3
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ - stream: 0
+ offset: 24
+ format: 0
+ dimension: 2
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ m_DataSize: 512
+ _typelessdata: 000080c000000000000020c0000000000000803f00000000e4388e3e00000000000080c00000000000002040000000000000803f00000000e4388e3e0000203f0000804000000000000020c0000000000000803f000000008ee3383f00000000000080400000000000002040000000000000803f000000008ee3383f0000203f000080c000000000000020400000000000000000000080bfe4388e3e0000203f000080c000004040000020400000000000000000000080bfe4388e3e0000803f0000804000000000000020400000000000000000000080bf8ee3383f0000203f0000804000004040000020400000000000000000000080bf8ee3383f0000803f000080c000000000000020c00000803f0000000000000000000000000000203f000080c000004040000020c00000803f0000000000000000000000000000803f000080c000000000000020400000803f0000000000000000e4388e3e0000203f000080c000004040000020400000803f0000000000000000e4388e3e0000803f000080400000000000002040000080bf00000000000000008ee3383f0000203f000080400000404000002040000080bf00000000000000008ee3383f0000803f0000804000000000000020c0000080bf00000000000000000000803f0000203f0000804000004040000020c0000080bf00000000000000000000803f0000803f
+ m_CompressedMesh:
+ m_Vertices:
+ m_NumItems: 0
+ m_Range: 0
+ m_Start: 0
+ m_Data:
+ m_BitSize: 0
+ m_UV:
+ m_NumItems: 0
+ m_Range: 0
+ m_Start: 0
+ m_Data:
+ m_BitSize: 0
+ m_Normals:
+ m_NumItems: 0
+ m_Range: 0
+ m_Start: 0
+ m_Data:
+ m_BitSize: 0
+ m_Tangents:
+ m_NumItems: 0
+ m_Range: 0
+ m_Start: 0
+ m_Data:
+ m_BitSize: 0
+ m_Weights:
+ m_NumItems: 0
+ m_Data:
+ m_BitSize: 0
+ m_NormalSigns:
+ m_NumItems: 0
+ m_Data:
+ m_BitSize: 0
+ m_TangentSigns:
+ m_NumItems: 0
+ m_Data:
+ m_BitSize: 0
+ m_FloatColors:
+ m_NumItems: 0
+ m_Range: 0
+ m_Start: 0
+ m_Data:
+ m_BitSize: 0
+ m_BoneIndices:
+ m_NumItems: 0
+ m_Data:
+ m_BitSize: 0
+ m_Triangles:
+ m_NumItems: 0
+ m_Data:
+ m_BitSize: 0
+ m_UVInfo: 0
+ m_LocalAABB:
+ m_Center: {x: 0, y: 1.5, z: 0}
+ m_Extent: {x: 4, y: 1.5, z: 2.5}
+ m_MeshUsageFlags: 0
+ m_BakedConvexCollisionMesh:
+ m_BakedTriangleCollisionMesh:
+ m_MeshOptimized: 0
--- !u!1 &603456584
GameObject:
m_ObjectHideFlags: 0
@@ -5962,7 +6106,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
folder: FrozenMaterial\sound\sfx
filenames: []
- volumeScale: 1
+ volumeScale: 0.9
onPlayFinished:
m_PersistentCalls:
m_Calls: []
@@ -6160,7 +6304,7 @@ MeshFilter:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1379541361}
- m_Mesh: {fileID: 1906984695}
+ m_Mesh: {fileID: 593968383}
--- !u!114 &1379541365
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -8291,136 +8435,6 @@ MonoBehaviour:
Culture=neutral, PublicKeyToken=null
mode: 0
info:
---- !u!43 &1906984695
-Mesh:
- m_ObjectHideFlags: 0
- m_PrefabParentObject: {fileID: 0}
- m_PrefabInternal: {fileID: 0}
- m_Name: 'Space Ground Mesh: (8x5x3)'
- serializedVersion: 8
- m_SubMeshes:
- - serializedVersion: 2
- firstByte: 0
- indexCount: 24
- topology: 0
- baseVertex: 0
- firstVertex: 0
- vertexCount: 16
- localAABB:
- m_Center: {x: 0, y: 1.5, z: 0}
- m_Extent: {x: 4, y: 1.5, z: 2.5}
- m_Shapes:
- vertices: []
- shapes: []
- channels: []
- fullWeights: []
- m_BindPose: []
- m_BoneNameHashes:
- m_RootBoneNameHash: 0
- m_MeshCompression: 0
- m_IsReadable: 0
- m_KeepVertices: 1
- m_KeepIndices: 1
- m_IndexFormat: 0
- m_IndexBuffer: 000001000200010003000200040005000600050007000600080009000a0009000b000a000c000d000e000d000f000e00
- m_Skin: []
- m_VertexData:
- m_CurrentChannels: 11
- m_VertexCount: 16
- m_Channels:
- - stream: 0
- offset: 0
- format: 0
- dimension: 3
- - stream: 0
- offset: 12
- format: 0
- dimension: 3
- - stream: 0
- offset: 0
- format: 0
- dimension: 0
- - stream: 0
- offset: 24
- format: 0
- dimension: 2
- - stream: 0
- offset: 0
- format: 0
- dimension: 0
- - stream: 0
- offset: 0
- format: 0
- dimension: 0
- - stream: 0
- offset: 0
- format: 0
- dimension: 0
- - stream: 0
- offset: 0
- format: 0
- dimension: 0
- m_DataSize: 512
- _typelessdata: 000080c000000000000020c0000000000000803f00000000e4388e3e00000000000080c00000000000002040000000000000803f00000000e4388e3e0000203f0000804000000000000020c0000000000000803f000000008ee3383f00000000000080400000000000002040000000000000803f000000008ee3383f0000203f000080c000000000000020400000000000000000000080bfe4388e3e0000203f000080c000004040000020400000000000000000000080bfe4388e3e0000803f0000804000000000000020400000000000000000000080bf8ee3383f0000203f0000804000004040000020400000000000000000000080bf8ee3383f0000803f000080c000000000000020c00000803f0000000000000000000000000000203f000080c000004040000020c00000803f0000000000000000000000000000803f000080c000000000000020400000803f0000000000000000e4388e3e0000203f000080c000004040000020400000803f0000000000000000e4388e3e0000803f000080400000000000002040000080bf00000000000000008ee3383f0000203f000080400000404000002040000080bf00000000000000008ee3383f0000803f0000804000000000000020c0000080bf00000000000000000000803f0000203f0000804000004040000020c0000080bf00000000000000000000803f0000803f
- m_CompressedMesh:
- m_Vertices:
- m_NumItems: 0
- m_Range: 0
- m_Start: 0
- m_Data:
- m_BitSize: 0
- m_UV:
- m_NumItems: 0
- m_Range: 0
- m_Start: 0
- m_Data:
- m_BitSize: 0
- m_Normals:
- m_NumItems: 0
- m_Range: 0
- m_Start: 0
- m_Data:
- m_BitSize: 0
- m_Tangents:
- m_NumItems: 0
- m_Range: 0
- m_Start: 0
- m_Data:
- m_BitSize: 0
- m_Weights:
- m_NumItems: 0
- m_Data:
- m_BitSize: 0
- m_NormalSigns:
- m_NumItems: 0
- m_Data:
- m_BitSize: 0
- m_TangentSigns:
- m_NumItems: 0
- m_Data:
- m_BitSize: 0
- m_FloatColors:
- m_NumItems: 0
- m_Range: 0
- m_Start: 0
- m_Data:
- m_BitSize: 0
- m_BoneIndices:
- m_NumItems: 0
- m_Data:
- m_BitSize: 0
- m_Triangles:
- m_NumItems: 0
- m_Data:
- m_BitSize: 0
- m_UVInfo: 0
- m_LocalAABB:
- m_Center: {x: 0, y: 1.5, z: 0}
- m_Extent: {x: 4, y: 1.5, z: 2.5}
- m_MeshUsageFlags: 0
- m_BakedConvexCollisionMesh:
- m_BakedTriangleCollisionMesh:
- m_MeshOptimized: 0
--- !u!1 &1908931425
GameObject:
m_ObjectHideFlags: 0
@@ -9028,6 +9042,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
inputModule: {fileID: 197334246}
state: 0
+ standbyTime: 10
rate: 0
uniform: {fileID: 441718965}
spaceMaterials: []
diff --git a/Unity_2018_Frozen/Assets/Frozen/Script/SceneController.cs b/Unity_2018_Frozen/Assets/Frozen/Script/SceneController.cs
index e69803a..2289e89 100644
--- a/Unity_2018_Frozen/Assets/Frozen/Script/SceneController.cs
+++ b/Unity_2018_Frozen/Assets/Frozen/Script/SceneController.cs
@@ -17,6 +17,7 @@ namespace UltraCombos.Frozen
[SerializeField]
GlobalMKHookInput inputModule;
public State state = State.Standby;
+ public float standbyTime = 10.0f;
[Range(0, 1)]
public float rate = 0.0f;
@@ -69,11 +70,11 @@ namespace UltraCombos.Frozen
private void Update()
{
- if (mode)
+ if (standbyTime > 0.0f)
{
if (state == State.Standby)
{
- if (Time.time - stamp > 15.0f)
+ if (Time.time - stamp > standbyTime)
{
stamp = Time.time;
GoDay();