diff --git a/Build/ucProjectionMappingUI/data/settings/homo_setting.xml b/Build/ucProjectionMappingUI/data/settings/homo_setting.xml
index b6d1b86..e8dcddc 100644
--- a/Build/ucProjectionMappingUI/data/settings/homo_setting.xml
+++ b/Build/ucProjectionMappingUI/data/settings/homo_setting.xml
@@ -17,7 +17,7 @@
0.285714298
0.337500006
- 0.000000000
+ 0.004081632
0.248979598
0.000000000
0.000000000
@@ -36,38 +36,50 @@
0.000000000
0.000000000
- 0.017187508
- 0.013657406
+ 0.014513564
+ 0.012968030
- 0.800653636
+ 0.003257328
+ 0.000000000
+ 0.015885424
+ 0.012962961
+
+
+ 0.801302910
0.000000000
0.360416681
0.011689817
- 1.000000000
+ 0.999999940
0.000000000
- 0.448804706
- 0.011183125
+ 0.448889464
+ 0.011362882
0.000000000
1.000000000
- 0.015364582
- 0.219444439
+ 0.012930837
+ 0.219197303
- 0.800653636
+ 0.003257328
+ 1.000000000
+ 0.014322917
+ 0.219212964
+
+
+ 0.801302910
1.000000000
0.364062428
0.223148122
- 1.000000000
+ 0.999999940
1.000000000
- 0.453906953
- 0.224102393
+ 0.453914553
+ 0.224159122
@@ -97,38 +109,38 @@
0.000000000
0.000000000
- 0.549836099
- 0.017984403
+ 0.550971270
+ 0.019488407
0.201954395
0.000000000
- 0.637499869
- 0.018634258
+ 0.638801932
+ 0.020023147
1.000000000
0.000000000
0.980989814
- 0.021180557
+ 0.022106485
0.000000000
1.000000000
- 0.547627807
- 0.223778635
+ 0.548043430
+ 0.226216778
0.201954395
1.000000000
- 0.634895861
- 0.224074036
+ 0.635677099
+ 0.226157367
1.000000000
1.000000000
- 0.976848483
- 0.225231484
+ 0.977108777
+ 0.225925922
@@ -158,26 +170,26 @@
0.000000000
0.000000000
- 0.498958170
+ 0.499478996
0.266550928
1.000000000
0.000000000
- 0.499479353
+ 0.500260592
0.497337967
0.000000000
1.000000000
0.015885413
- 0.266898096
+ 0.265277684
1.000000000
1.000000000
0.015885543
- 0.497800976
+ 0.497106552
@@ -208,13 +220,13 @@
0.000000000
0.000000000
0.501041532
- 0.498495370
+ 0.497800857
1.000000000
0.000000000
0.501994193
- 0.266979694
+ 0.266748220
0.000000000
@@ -268,14 +280,14 @@
1.000000000
0.000000000
- 0.473332673
- 0.506911278
+ 0.473605901
+ 0.506910443
0.000000000
0.833333313
0.060416691
- 0.687962949
+ 0.687500000
0.800653636
@@ -286,26 +298,26 @@
1.000000000
0.833333313
- 0.468289316
- 0.690285146
+ 0.468556970
+ 0.690404654
0.000000000
1.000000000
- 0.060262330
- 0.723477244
+ 0.060262322
+ 0.722924173
0.800653636
1.000000000
0.384854257
- 0.725893676
+ 0.725893915
1.000000000
1.000000000
- 0.467293054
- 0.726507425
+ 0.467559636
+ 0.726650655
diff --git a/Unity_2018_Frozen/Assets/Frozen/Frozen.unity b/Unity_2018_Frozen/Assets/Frozen/Frozen.unity
index 2dacb15..b31be3c 100644
--- a/Unity_2018_Frozen/Assets/Frozen/Frozen.unity
+++ b/Unity_2018_Frozen/Assets/Frozen/Frozen.unity
@@ -1231,136 +1231,6 @@ MonoBehaviour:
PlayOnStart: 1
Looping: 1
AudioVolume: 1
---- !u!43 &269047436
-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 &276089015
GameObject:
m_ObjectHideFlags: 0
@@ -2106,7 +1976,7 @@ Transform:
m_GameObject: {fileID: 436028452}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 1, z: 0}
- m_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
+ m_LocalScale: {x: 0.4, y: 0.4, z: 0.4}
m_Children: []
m_Father: {fileID: 1984882816}
m_RootOrder: 1
@@ -2668,7 +2538,7 @@ Transform:
m_GameObject: {fileID: 575691238}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 1, z: 0}
- m_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
+ m_LocalScale: {x: 0.4, y: 0.4, z: 0.4}
m_Children: []
m_Father: {fileID: 1008043395}
m_RootOrder: 1
@@ -5557,7 +5427,7 @@ MeshFilter:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1379541361}
- m_Mesh: {fileID: 269047436}
+ m_Mesh: {fileID: 1422809093}
--- !u!1 &1390635887
GameObject:
m_ObjectHideFlags: 0
@@ -5712,6 +5582,136 @@ CanvasRenderer:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1395728836}
+--- !u!43 &1422809093
+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 &1443956512
GameObject:
m_ObjectHideFlags: 0
@@ -6227,7 +6227,7 @@ Transform:
m_GameObject: {fileID: 1674052466}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 1, z: 0}
- m_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
+ m_LocalScale: {x: 0.4, y: 0.4, z: 0.4}
m_Children: []
m_Father: {fileID: 1225287932}
m_RootOrder: 1
@@ -6358,7 +6358,7 @@ Transform:
m_GameObject: {fileID: 1686473286}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 1, z: 0}
- m_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
+ m_LocalScale: {x: 0.4, y: 0.4, z: 0.4}
m_Children: []
m_Father: {fileID: 33825546}
m_RootOrder: 1
diff --git a/Unity_2018_Frozen/Assets/Frozen/Script/CharacterBehaviour.cs b/Unity_2018_Frozen/Assets/Frozen/Script/CharacterBehaviour.cs
index 1347918..9257694 100644
--- a/Unity_2018_Frozen/Assets/Frozen/Script/CharacterBehaviour.cs
+++ b/Unity_2018_Frozen/Assets/Frozen/Script/CharacterBehaviour.cs
@@ -111,7 +111,7 @@ namespace UltraCombos.Frozen
fakeButton.pivot = new Vector2(0.5f, 0.5f);
var standby_scale = renderers[(int)Status.STANDBY].transform.localScale;
fakeButton.sizeDelta = new Vector2(standby_scale.x, standby_scale.y) * FrozenScreenToWorldSpace.Instance.finalPixelsByMeter;
- fakeButton.sizeDelta = Vector2.Min(fakeButton.sizeDelta, Vector2.one * 150.0f);
+ fakeButton.sizeDelta = Vector2.Min(fakeButton.sizeDelta, Vector2.one * 100.0f);
fakeButton.anchoredPosition3D = new Vector3(0, 0, 0);
fakeButton.localScale = Vector3.one;
fakeButton.gameObject.AddComponent();
@@ -216,7 +216,7 @@ namespace UltraCombos.Frozen
RandomAppearWall();
}
- roaming_seed = Random.Range(0.0f, 1.0f);
+ roaming_seed = Random.value * 10.0f;
trigger_clip_index = ++trigger_clip_index % triggerClips.Count;
players[(int)Status.TRIGGER].VideoAsset = triggerClips[trigger_clip_index];
@@ -373,7 +373,7 @@ namespace UltraCombos.Frozen
void UpdateRoamingPosition()
{
- float noise = Mathf.PerlinNoise(Time.time * 0.4f, roaming_seed) > 0.5f ? 1.0f : -1.0f;
+ float noise = Mathf.PerlinNoise(Time.time * 0.4f + roaming_seed, roaming_seed) > 0.5f ? 1.0f : -1.0f;
noise *= roaming * Time.deltaTime;
//float padding = transform.localScale.x * 0.5f;
float padding = renderers[(int)Status.TRIGGER].transform.localScale.x * 0.5f;