Skip to content

Commit 81bac33

Browse files
Pauliusd01Pauliusd01
committed
Revert "Update TouchSamples Rolling scene"
This reverts commit e2ef184.
1 parent 6168d14 commit 81bac33

File tree

7 files changed

+20
-1669
lines changed

7 files changed

+20
-1669
lines changed

‎ExternalSampleProjects/TouchSamples/Assets/Demo/Materials/Rolling/BasicTerrain.mat‎

Lines changed: 4 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,20 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
3-
--- !u!114 &-2532171893380354214
4-
MonoBehaviour:
5-
m_ObjectHideFlags: 11
6-
m_CorrespondingSourceObject: {fileID: 0}
7-
m_PrefabInstance: {fileID: 0}
8-
m_PrefabAsset: {fileID: 0}
9-
m_GameObject: {fileID: 0}
10-
m_Enabled: 1
11-
m_EditorHideFlags: 0
12-
m_Script: {fileID: 11500000, guid: 639247ca83abc874e893eb93af2b5e44, type: 3}
13-
m_Name:
14-
m_EditorClassIdentifier:
15-
version: 0
163
--- !u!21 &2100000
174
Material:
18-
serializedVersion: 8
5+
serializedVersion: 6
196
m_ObjectHideFlags: 0
207
m_CorrespondingSourceObject: {fileID: 0}
21-
m_PrefabInstance: {fileID: 0}
22-
m_PrefabAsset: {fileID: 0}
8+
m_PrefabInternal: {fileID: 0}
239
m_Name: BasicTerrain
24-
m_Shader: {fileID: -6465566751694194690, guid: 766304492cb2849dda164d1325eab3a7, type: 3}
25-
m_Parent: {fileID: 0}
26-
m_ModifiedSerializedProperties: 0
27-
m_ValidKeywords: []
28-
m_InvalidKeywords: []
10+
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
11+
m_ShaderKeywords:
2912
m_LightmapFlags: 4
3013
m_EnableInstancingVariants: 0
3114
m_DoubleSidedGI: 0
3215
m_CustomRenderQueue: -1
3316
stringTagMap: {}
3417
disabledShaderPasses: []
35-
m_LockedProperties:
3618
m_SavedProperties:
3719
serializedVersion: 3
3820
m_TexEnvs:
@@ -72,14 +54,7 @@ Material:
7254
m_Texture: {fileID: 0}
7355
m_Scale: {x: 1, y: 1}
7456
m_Offset: {x: 0, y: 0}
75-
- _Texture:
76-
m_Texture: {fileID: 0}
77-
m_Scale: {x: 1, y: 1}
78-
m_Offset: {x: 0, y: 0}
79-
m_Ints: []
8057
m_Floats:
81-
- _BUILTIN_QueueControl: 0
82-
- _BUILTIN_QueueOffset: 0
8358
- _BumpScale: 1
8459
- _Cutoff: 0.5
8560
- _DetailNormalMapScale: 1
@@ -98,6 +73,4 @@ Material:
9873
- _ZWrite: 1
9974
m_Colors:
10075
- _Color: {r: 1, g: 1, b: 1, a: 1}
101-
- _Diffuse: {r: 1, g: 1, b: 1, a: 1}
10276
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
103-
m_BuildTextureStacks: []

‎ExternalSampleProjects/TouchSamples/Assets/Demo/Materials/Rolling/BouncyTerrain.mat‎

Lines changed: 4 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,19 @@
22
%TAG !u! tag:unity3d.com,2011:
33
--- !u!21 &2100000
44
Material:
5-
serializedVersion: 8
5+
serializedVersion: 6
66
m_ObjectHideFlags: 0
77
m_CorrespondingSourceObject: {fileID: 0}
8-
m_PrefabInstance: {fileID: 0}
9-
m_PrefabAsset: {fileID: 0}
8+
m_PrefabInternal: {fileID: 0}
109
m_Name: BouncyTerrain
11-
m_Shader: {fileID: -6465566751694194690, guid: 766304492cb2849dda164d1325eab3a7, type: 3}
12-
m_Parent: {fileID: 0}
13-
m_ModifiedSerializedProperties: 0
14-
m_ValidKeywords: []
15-
m_InvalidKeywords: []
10+
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
11+
m_ShaderKeywords:
1612
m_LightmapFlags: 4
1713
m_EnableInstancingVariants: 0
1814
m_DoubleSidedGI: 0
1915
m_CustomRenderQueue: -1
2016
stringTagMap: {}
2117
disabledShaderPasses: []
22-
m_LockedProperties:
2318
m_SavedProperties:
2419
serializedVersion: 3
2520
m_TexEnvs:
@@ -59,14 +54,7 @@ Material:
5954
m_Texture: {fileID: 0}
6055
m_Scale: {x: 1, y: 1}
6156
m_Offset: {x: 0, y: 0}
62-
- _Texture:
63-
m_Texture: {fileID: 0}
64-
m_Scale: {x: 1, y: 1}
65-
m_Offset: {x: 0, y: 0}
66-
m_Ints: []
6757
m_Floats:
68-
- _BUILTIN_QueueControl: 0
69-
- _BUILTIN_QueueOffset: 0
7058
- _BumpScale: 1
7159
- _Cutoff: 0.5
7260
- _DetailNormalMapScale: 1
@@ -85,19 +73,4 @@ Material:
8573
- _ZWrite: 1
8674
m_Colors:
8775
- _Color: {r: 0.1064436, g: 0.9811321, b: 0.14142902, a: 1}
88-
- _Diffuse: {r: 0.105882354, g: 0.98039216, b: 0.14117648, a: 1}
8976
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
90-
m_BuildTextureStacks: []
91-
--- !u!114 &4373057470595499838
92-
MonoBehaviour:
93-
m_ObjectHideFlags: 11
94-
m_CorrespondingSourceObject: {fileID: 0}
95-
m_PrefabInstance: {fileID: 0}
96-
m_PrefabAsset: {fileID: 0}
97-
m_GameObject: {fileID: 0}
98-
m_Enabled: 1
99-
m_EditorHideFlags: 0
100-
m_Script: {fileID: 11500000, guid: 639247ca83abc874e893eb93af2b5e44, type: 3}
101-
m_Name:
102-
m_EditorClassIdentifier:
103-
version: 0

‎ExternalSampleProjects/TouchSamples/Assets/Demo/Materials/Rolling/PlayerBall.mat‎

Lines changed: 4 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,20 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
3-
--- !u!114 &-3404001540472017179
4-
MonoBehaviour:
5-
m_ObjectHideFlags: 11
6-
m_CorrespondingSourceObject: {fileID: 0}
7-
m_PrefabInstance: {fileID: 0}
8-
m_PrefabAsset: {fileID: 0}
9-
m_GameObject: {fileID: 0}
10-
m_Enabled: 1
11-
m_EditorHideFlags: 0
12-
m_Script: {fileID: 11500000, guid: 639247ca83abc874e893eb93af2b5e44, type: 3}
13-
m_Name:
14-
m_EditorClassIdentifier:
15-
version: 0
163
--- !u!21 &2100000
174
Material:
18-
serializedVersion: 8
5+
serializedVersion: 6
196
m_ObjectHideFlags: 0
207
m_CorrespondingSourceObject: {fileID: 0}
21-
m_PrefabInstance: {fileID: 0}
22-
m_PrefabAsset: {fileID: 0}
8+
m_PrefabInternal: {fileID: 0}
239
m_Name: PlayerBall
24-
m_Shader: {fileID: -6465566751694194690, guid: 766304492cb2849dda164d1325eab3a7, type: 3}
25-
m_Parent: {fileID: 0}
26-
m_ModifiedSerializedProperties: 0
27-
m_ValidKeywords: []
28-
m_InvalidKeywords: []
10+
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
11+
m_ShaderKeywords:
2912
m_LightmapFlags: 4
3013
m_EnableInstancingVariants: 0
3114
m_DoubleSidedGI: 0
3215
m_CustomRenderQueue: -1
3316
stringTagMap: {}
3417
disabledShaderPasses: []
35-
m_LockedProperties:
3618
m_SavedProperties:
3719
serializedVersion: 3
3820
m_TexEnvs:
@@ -72,14 +54,7 @@ Material:
7254
m_Texture: {fileID: 0}
7355
m_Scale: {x: 1, y: 1}
7456
m_Offset: {x: 0, y: 0}
75-
- _Texture:
76-
m_Texture: {fileID: 2800000, guid: 02fa56ecf43008c4f97ac0b5ca389953, type: 3}
77-
m_Scale: {x: 1, y: 1}
78-
m_Offset: {x: 0, y: 0}
79-
m_Ints: []
8057
m_Floats:
81-
- _BUILTIN_QueueControl: 0
82-
- _BUILTIN_QueueOffset: 0
8358
- _BumpScale: 1
8459
- _Cutoff: 0.5
8560
- _DetailNormalMapScale: 1
@@ -98,6 +73,4 @@ Material:
9873
- _ZWrite: 1
9974
m_Colors:
10075
- _Color: {r: 1, g: 1, b: 1, a: 1}
101-
- _Diffuse: {r: 1, g: 1, b: 1, a: 1}
10276
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
103-
m_BuildTextureStacks: []

‎ExternalSampleProjects/TouchSamples/Assets/Demo/Materials/Rolling/RoughTerrain.mat‎

Lines changed: 4 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,20 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
3-
--- !u!114 &-1274899080132372721
4-
MonoBehaviour:
5-
m_ObjectHideFlags: 11
6-
m_CorrespondingSourceObject: {fileID: 0}
7-
m_PrefabInstance: {fileID: 0}
8-
m_PrefabAsset: {fileID: 0}
9-
m_GameObject: {fileID: 0}
10-
m_Enabled: 1
11-
m_EditorHideFlags: 0
12-
m_Script: {fileID: 11500000, guid: 639247ca83abc874e893eb93af2b5e44, type: 3}
13-
m_Name:
14-
m_EditorClassIdentifier:
15-
version: 0
163
--- !u!21 &2100000
174
Material:
18-
serializedVersion: 8
5+
serializedVersion: 6
196
m_ObjectHideFlags: 0
207
m_CorrespondingSourceObject: {fileID: 0}
21-
m_PrefabInstance: {fileID: 0}
22-
m_PrefabAsset: {fileID: 0}
8+
m_PrefabInternal: {fileID: 0}
239
m_Name: RoughTerrain
24-
m_Shader: {fileID: -6465566751694194690, guid: 766304492cb2849dda164d1325eab3a7, type: 3}
25-
m_Parent: {fileID: 0}
26-
m_ModifiedSerializedProperties: 0
27-
m_ValidKeywords: []
28-
m_InvalidKeywords: []
10+
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
11+
m_ShaderKeywords:
2912
m_LightmapFlags: 4
3013
m_EnableInstancingVariants: 0
3114
m_DoubleSidedGI: 0
3215
m_CustomRenderQueue: -1
3316
stringTagMap: {}
3417
disabledShaderPasses: []
35-
m_LockedProperties:
3618
m_SavedProperties:
3719
serializedVersion: 3
3820
m_TexEnvs:
@@ -72,14 +54,7 @@ Material:
7254
m_Texture: {fileID: 0}
7355
m_Scale: {x: 1, y: 1}
7456
m_Offset: {x: 0, y: 0}
75-
- _Texture:
76-
m_Texture: {fileID: 0}
77-
m_Scale: {x: 1, y: 1}
78-
m_Offset: {x: 0, y: 0}
79-
m_Ints: []
8057
m_Floats:
81-
- _BUILTIN_QueueControl: 0
82-
- _BUILTIN_QueueOffset: 0
8358
- _BumpScale: 1
8459
- _Cutoff: 0.5
8560
- _DetailNormalMapScale: 1
@@ -98,6 +73,4 @@ Material:
9873
- _ZWrite: 1
9974
m_Colors:
10075
- _Color: {r: 0.4433962, g: 0.4433962, b: 0.4433962, a: 1}
101-
- _Diffuse: {r: 0.44313726, g: 0.44313726, b: 0.44313726, a: 1}
10276
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
103-
m_BuildTextureStacks: []

‎ExternalSampleProjects/TouchSamples/Assets/Demo/Materials/Rolling/SlipperyTerrain.mat‎

Lines changed: 4 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,19 @@
22
%TAG !u! tag:unity3d.com,2011:
33
--- !u!21 &2100000
44
Material:
5-
serializedVersion: 8
5+
serializedVersion: 6
66
m_ObjectHideFlags: 0
77
m_CorrespondingSourceObject: {fileID: 0}
8-
m_PrefabInstance: {fileID: 0}
9-
m_PrefabAsset: {fileID: 0}
8+
m_PrefabInternal: {fileID: 0}
109
m_Name: SlipperyTerrain
11-
m_Shader: {fileID: -6465566751694194690, guid: 766304492cb2849dda164d1325eab3a7, type: 3}
12-
m_Parent: {fileID: 0}
13-
m_ModifiedSerializedProperties: 0
14-
m_ValidKeywords: []
15-
m_InvalidKeywords: []
10+
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
11+
m_ShaderKeywords:
1612
m_LightmapFlags: 4
1713
m_EnableInstancingVariants: 0
1814
m_DoubleSidedGI: 0
1915
m_CustomRenderQueue: -1
2016
stringTagMap: {}
2117
disabledShaderPasses: []
22-
m_LockedProperties:
2318
m_SavedProperties:
2419
serializedVersion: 3
2520
m_TexEnvs:
@@ -59,14 +54,7 @@ Material:
5954
m_Texture: {fileID: 0}
6055
m_Scale: {x: 1, y: 1}
6156
m_Offset: {x: 0, y: 0}
62-
- _Texture:
63-
m_Texture: {fileID: 0}
64-
m_Scale: {x: 1, y: 1}
65-
m_Offset: {x: 0, y: 0}
66-
m_Ints: []
6757
m_Floats:
68-
- _BUILTIN_QueueControl: 0
69-
- _BUILTIN_QueueOffset: 0
7058
- _BumpScale: 1
7159
- _Cutoff: 0.5
7260
- _DetailNormalMapScale: 1
@@ -85,19 +73,4 @@ Material:
8573
- _ZWrite: 1
8674
m_Colors:
8775
- _Color: {r: 0.10588233, g: 0.8612952, b: 0.98039216, a: 1}
88-
- _Diffuse: {r: 0.105882354, g: 0.8627451, b: 0.98039216, a: 1}
8976
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
90-
m_BuildTextureStacks: []
91-
--- !u!114 &6490535763158821207
92-
MonoBehaviour:
93-
m_ObjectHideFlags: 11
94-
m_CorrespondingSourceObject: {fileID: 0}
95-
m_PrefabInstance: {fileID: 0}
96-
m_PrefabAsset: {fileID: 0}
97-
m_GameObject: {fileID: 0}
98-
m_Enabled: 1
99-
m_EditorHideFlags: 0
100-
m_Script: {fileID: 11500000, guid: 639247ca83abc874e893eb93af2b5e44, type: 3}
101-
m_Name:
102-
m_EditorClassIdentifier:
103-
version: 0

0 commit comments

Comments
 (0)