Skip to content

Commit 71e8664

Browse files
committed
Merge branch 'develop' into feat/distributed-athority-sample/protagonist-animations
2 parents a0c9305 + dbfa317 commit 71e8664

File tree

870 files changed

+550211
-1487
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

870 files changed

+550211
-1487
lines changed

Experimental/DistributedAuthoritySample/Assets/Art.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Experimental/DistributedAuthoritySample/Assets/Art/Effects.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Experimental/DistributedAuthoritySample/Assets/Art/Effects/CookingSteam.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 157 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,157 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!21 &2100000
4+
Material:
5+
serializedVersion: 8
6+
m_ObjectHideFlags: 0
7+
m_CorrespondingSourceObject: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
10+
m_Name: CookingSteam
11+
m_Shader: {fileID: 4800000, guid: 0406db5a14f94604a8c57ccfbc9f3b46, type: 3}
12+
m_Parent: {fileID: 0}
13+
m_ModifiedSerializedProperties: 0
14+
m_ValidKeywords:
15+
- _FADING_ON
16+
- _SOFTPARTICLES_ON
17+
- _SURFACE_TYPE_TRANSPARENT
18+
m_InvalidKeywords:
19+
- _FLIPBOOKBLENDING_OFF
20+
m_LightmapFlags: 4
21+
m_EnableInstancingVariants: 0
22+
m_DoubleSidedGI: 0
23+
m_CustomRenderQueue: 3000
24+
stringTagMap:
25+
RenderType: Transparent
26+
disabledShaderPasses:
27+
- SHADOWCASTER
28+
- DepthOnly
29+
m_LockedProperties:
30+
m_SavedProperties:
31+
serializedVersion: 3
32+
m_TexEnvs:
33+
- _BaseMap:
34+
m_Texture: {fileID: 0}
35+
m_Scale: {x: 1, y: 1}
36+
m_Offset: {x: 0, y: 0}
37+
- _BumpMap:
38+
m_Texture: {fileID: 0}
39+
m_Scale: {x: 1, y: 1}
40+
m_Offset: {x: 0, y: 0}
41+
- _DetailAlbedoMap:
42+
m_Texture: {fileID: 0}
43+
m_Scale: {x: 1, y: 1}
44+
m_Offset: {x: 0, y: 0}
45+
- _DetailMask:
46+
m_Texture: {fileID: 0}
47+
m_Scale: {x: 1, y: 1}
48+
m_Offset: {x: 0, y: 0}
49+
- _DetailNormalMap:
50+
m_Texture: {fileID: 0}
51+
m_Scale: {x: 1, y: 1}
52+
m_Offset: {x: 0, y: 0}
53+
- _EmissionMap:
54+
m_Texture: {fileID: 0}
55+
m_Scale: {x: 1, y: 1}
56+
m_Offset: {x: 0, y: 0}
57+
- _MainTex:
58+
m_Texture: {fileID: 0}
59+
m_Scale: {x: 1, y: 1}
60+
m_Offset: {x: 0, y: 0}
61+
- _MetallicGlossMap:
62+
m_Texture: {fileID: 0}
63+
m_Scale: {x: 1, y: 1}
64+
m_Offset: {x: 0, y: 0}
65+
- _OcclusionMap:
66+
m_Texture: {fileID: 0}
67+
m_Scale: {x: 1, y: 1}
68+
m_Offset: {x: 0, y: 0}
69+
- _ParallaxMap:
70+
m_Texture: {fileID: 0}
71+
m_Scale: {x: 1, y: 1}
72+
m_Offset: {x: 0, y: 0}
73+
- _SpecGlossMap:
74+
m_Texture: {fileID: 0}
75+
m_Scale: {x: 1, y: 1}
76+
m_Offset: {x: 0, y: 0}
77+
- unity_Lightmaps:
78+
m_Texture: {fileID: 0}
79+
m_Scale: {x: 1, y: 1}
80+
m_Offset: {x: 0, y: 0}
81+
- unity_LightmapsInd:
82+
m_Texture: {fileID: 0}
83+
m_Scale: {x: 1, y: 1}
84+
m_Offset: {x: 0, y: 0}
85+
- unity_ShadowMasks:
86+
m_Texture: {fileID: 0}
87+
m_Scale: {x: 1, y: 1}
88+
m_Offset: {x: 0, y: 0}
89+
m_Ints: []
90+
m_Floats:
91+
- _AlphaClip: 0
92+
- _AlphaToMask: 0
93+
- _Blend: 2
94+
- _BlendOp: 0
95+
- _BumpScale: 1
96+
- _CameraFadingEnabled: 1
97+
- _CameraFarFadeDistance: 4
98+
- _CameraNearFadeDistance: 1
99+
- _ClearCoatMask: 0
100+
- _ClearCoatSmoothness: 0
101+
- _ColorMode: 0
102+
- _Cull: 2
103+
- _Cutoff: 0.5
104+
- _DetailAlbedoMapScale: 1
105+
- _DetailNormalMapScale: 1
106+
- _DistortionBlend: 0
107+
- _DistortionEnabled: 0
108+
- _DistortionStrength: 2.2
109+
- _DistortionStrengthScaled: 0.22000001
110+
- _DstBlend: 1
111+
- _DstBlendAlpha: 1
112+
- _EnvironmentReflections: 1
113+
- _FlipbookBlending: 0
114+
- _FlipbookMode: 0
115+
- _GlossMapScale: 0
116+
- _Glossiness: 0
117+
- _GlossyReflections: 0
118+
- _Metallic: 0
119+
- _Mode: 0
120+
- _OcclusionStrength: 1
121+
- _Parallax: 0.005
122+
- _QueueOffset: 0
123+
- _ReceiveShadows: 1
124+
- _Smoothness: 0.5
125+
- _SmoothnessTextureChannel: 0
126+
- _SoftParticlesEnabled: 1
127+
- _SoftParticlesFarFadeDistance: 3
128+
- _SoftParticlesNearFadeDistance: 0
129+
- _SpecularHighlights: 1
130+
- _SrcBlend: 5
131+
- _SrcBlendAlpha: 1
132+
- _Surface: 1
133+
- _WorkflowMode: 1
134+
- _ZWrite: 0
135+
m_Colors:
136+
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
137+
- _BaseColorAddSubDiff: {r: 1, g: 0, b: 0, a: 0}
138+
- _CameraFadeParams: {r: 1, g: 0.33333334, b: 0, a: 0}
139+
- _Color: {r: 1, g: 1, b: 1, a: 1}
140+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
141+
- _SoftParticleFadeParams: {r: 0, g: 0.33333334, b: 0, a: 0}
142+
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
143+
m_BuildTextureStacks: []
144+
m_AllowLocking: 1
145+
--- !u!114 &4418744183211160777
146+
MonoBehaviour:
147+
m_ObjectHideFlags: 11
148+
m_CorrespondingSourceObject: {fileID: 0}
149+
m_PrefabInstance: {fileID: 0}
150+
m_PrefabAsset: {fileID: 0}
151+
m_GameObject: {fileID: 0}
152+
m_Enabled: 1
153+
m_EditorHideFlags: 0
154+
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
155+
m_Name:
156+
m_EditorClassIdentifier:
157+
version: 9

Experimental/DistributedAuthoritySample/Assets/Art/Effects/CookingSteam/CookingSteam.mat.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Experimental/DistributedAuthoritySample/Assets/Art/Effects/Destruction.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Binary file not shown.

Experimental/DistributedAuthoritySample/Assets/Art/Effects/Destruction/Break_shockwave.fbx.meta

Lines changed: 107 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)