From 641870c6c099e02c2548953e910324f36ae7de0d Mon Sep 17 00:00:00 2001 From: uc-hoba Date: Fri, 25 May 2018 19:47:26 +0800 Subject: [PATCH] update material --- Unity_2018_Frozen/Assets/Frozen/Frozen.unity | 270 +++++++++--------- .../Assets/Frozen/Material/Point.mat | 2 +- .../Assets/Frozen/Script/SceneController.cs | 10 +- .../Frozen/Texture/space-dark-mountain-v1.png | 3 - .../Frozen/Texture/space-dark-mountain.png | 3 + ....png.meta => space-dark-mountain.png.meta} | 0 .../Frozen/Texture/space-ice-forest-v1.png | 3 - .../Frozen/Texture/space-ice-forest.png | 3 + ...-v1.png.meta => space-ice-forest.png.meta} | 0 9 files changed, 149 insertions(+), 145 deletions(-) delete mode 100644 Unity_2018_Frozen/Assets/Frozen/Texture/space-dark-mountain-v1.png create mode 100644 Unity_2018_Frozen/Assets/Frozen/Texture/space-dark-mountain.png rename Unity_2018_Frozen/Assets/Frozen/Texture/{space-dark-mountain-v1.png.meta => space-dark-mountain.png.meta} (100%) delete mode 100644 Unity_2018_Frozen/Assets/Frozen/Texture/space-ice-forest-v1.png create mode 100644 Unity_2018_Frozen/Assets/Frozen/Texture/space-ice-forest.png rename Unity_2018_Frozen/Assets/Frozen/Texture/{space-ice-forest-v1.png.meta => space-ice-forest.png.meta} (100%) diff --git a/Unity_2018_Frozen/Assets/Frozen/Frozen.unity b/Unity_2018_Frozen/Assets/Frozen/Frozen.unity index 1a10b2d..00fd660 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Frozen.unity +++ b/Unity_2018_Frozen/Assets/Frozen/Frozen.unity @@ -454,136 +454,6 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 66098174} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} ---- !u!43 &93797640 -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 &96822205 GameObject: m_ObjectHideFlags: 0 @@ -1245,6 +1115,136 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!43 &350531548 +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 &350883107 GameObject: m_ObjectHideFlags: 0 @@ -4033,7 +4033,7 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1191975162} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -3.57, y: 0, z: 2.49} + m_LocalPosition: {x: -1.65, y: 0, z: 2.49} m_LocalScale: {x: 0.891734, y: 0.891734, z: 0.891734} m_Children: [] m_Father: {fileID: 1247992794} @@ -4220,7 +4220,7 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1216863871} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.318, y: 0, z: 2.49} + m_LocalPosition: {x: 1.03, y: 0, z: 2.49} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1329758487} @@ -4902,7 +4902,7 @@ MeshFilter: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1379541361} - m_Mesh: {fileID: 93797640} + m_Mesh: {fileID: 350531548} --- !u!1 &1390635887 GameObject: m_ObjectHideFlags: 0 @@ -5481,7 +5481,7 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1690794384} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 2.862, y: 0, z: 2.49} + m_LocalPosition: {x: 2.75, y: 0, z: 2.49} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1061158672} @@ -6695,7 +6695,7 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1933714480} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -2.562, y: 0, z: 2.49} + m_LocalPosition: {x: -2.9, y: 0, z: 2.49} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 423869584} diff --git a/Unity_2018_Frozen/Assets/Frozen/Material/Point.mat b/Unity_2018_Frozen/Assets/Frozen/Material/Point.mat index 9f8f3b3..cd2ffee 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Material/Point.mat +++ b/Unity_2018_Frozen/Assets/Frozen/Material/Point.mat @@ -81,7 +81,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _Size: 0.010056514 + - _Size: 0.01 - _SmoothnessTextureChannel: 0 - _SoftParticlesEnabled: 0 - _SoftParticlesFarFadeDistance: 1 diff --git a/Unity_2018_Frozen/Assets/Frozen/Script/SceneController.cs b/Unity_2018_Frozen/Assets/Frozen/Script/SceneController.cs index e1e4553..f15db9e 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Script/SceneController.cs +++ b/Unity_2018_Frozen/Assets/Frozen/Script/SceneController.cs @@ -69,10 +69,13 @@ namespace UltraCombos.Frozen { if (mode) { - if (Time.time - stamp > 10.0f) + if (state == State.Standby) { - stamp = Time.time; - target_rate = 1.0f - target_rate; + if (Time.time - stamp > 15.0f) + { + stamp = Time.time; + GoDay(); + } } } @@ -131,6 +134,7 @@ namespace UltraCombos.Frozen { state = State.Standby; onSceneStandby.Invoke(); + stamp = Time.time; } public void GoDay() diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/space-dark-mountain-v1.png b/Unity_2018_Frozen/Assets/Frozen/Texture/space-dark-mountain-v1.png deleted file mode 100644 index fc2051f..0000000 --- a/Unity_2018_Frozen/Assets/Frozen/Texture/space-dark-mountain-v1.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:63ad8f5e1cb1cc00f42a3e4436df7b4537d57426866125b0ae0064abe39a0019 -size 19376075 diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/space-dark-mountain.png b/Unity_2018_Frozen/Assets/Frozen/Texture/space-dark-mountain.png new file mode 100644 index 0000000..5a39d26 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/space-dark-mountain.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8ebe48cf54f8308b945d5064d58cbbf7d14490900fe2056869cfb5b69775da6a +size 18429853 diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/space-dark-mountain-v1.png.meta b/Unity_2018_Frozen/Assets/Frozen/Texture/space-dark-mountain.png.meta similarity index 100% rename from Unity_2018_Frozen/Assets/Frozen/Texture/space-dark-mountain-v1.png.meta rename to Unity_2018_Frozen/Assets/Frozen/Texture/space-dark-mountain.png.meta diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/space-ice-forest-v1.png b/Unity_2018_Frozen/Assets/Frozen/Texture/space-ice-forest-v1.png deleted file mode 100644 index 0b2a150..0000000 --- a/Unity_2018_Frozen/Assets/Frozen/Texture/space-ice-forest-v1.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:564bf9df2e7911fe910ff0d9364faa471f194eb33bbbf0ad51547039a3e1ee38 -size 16846022 diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/space-ice-forest.png b/Unity_2018_Frozen/Assets/Frozen/Texture/space-ice-forest.png new file mode 100644 index 0000000..170d340 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/space-ice-forest.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9db8df137b06cd20efb35a6df582c33de549cee9eb7b582aac0839956382328f +size 18117168 diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/space-ice-forest-v1.png.meta b/Unity_2018_Frozen/Assets/Frozen/Texture/space-ice-forest.png.meta similarity index 100% rename from Unity_2018_Frozen/Assets/Frozen/Texture/space-ice-forest-v1.png.meta rename to Unity_2018_Frozen/Assets/Frozen/Texture/space-ice-forest.png.meta