master
uc-hoba 8 years ago
parent c929bd8620
commit 9ce57d32a5
  1. 298
      Unity_2018_Frozen/Assets/Frozen/Frozen.unity
  2. 2
      Unity_2018_Frozen/Assets/Frozen/FrozenParticleUniforms.asset
  3. 2
      Unity_2018_Frozen/Assets/Frozen/Material/Space.mat
  4. 2
      Unity_2018_Frozen/Assets/ParticleWorks/Shader/ParticleViewerUnlitPoint.shader
  5. 1
      Unity_2018_Frozen/Assets/UnityUtilityNativePlugin/Script/DisplayConfig.cs
  6. 5
      Unity_2018_Frozen/ProjectSettings/EditorBuildSettings.asset
  7. 7
      Unity_2018_Frozen/ProjectSettings/ProjectSettings.asset

@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1 m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0} m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 1071731254} m_Sun: {fileID: 1071731254}
m_IndirectSpecularColor: {r: 0.021216419, g: 0.053037528, b: 0.08577964, a: 1} m_IndirectSpecularColor: {r: 0.021216419, g: 0.053037524, b: 0.08577964, a: 1}
--- !u!157 &3 --- !u!157 &3
LightmapSettings: LightmapSettings:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -113,6 +113,72 @@ NavMeshSettings:
debug: debug:
m_Flags: 0 m_Flags: 0
m_NavMeshData: {fileID: 0} m_NavMeshData: {fileID: 0}
--- !u!1 &67279955
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 5
m_Component:
- component: {fileID: 67279956}
- component: {fileID: 67279957}
m_Layer: 5
m_Name: Kinect Camera V2
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &67279956
Transform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 67279955}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -2.28, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 2122473687}
m_Father: {fileID: 401185751}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!20 &67279957
Camera:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 67279955}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 1
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_NormalizedViewPortRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
near clip plane: 0.3
far clip plane: 1000
field of view: 60
orthographic: 0
orthographic size: 5
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingPath: 1
m_TargetTexture: {fileID: 8400000, guid: f9c2cef894c9cc54f807a92207bf6eda, type: 2}
m_TargetDisplay: 1
m_TargetEye: 3
m_HDR: 1
m_AllowMSAA: 0
m_AllowDynamicResolution: 0
m_ForceIntoRT: 0
m_OcclusionCulling: 1
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!1 &102745337 --- !u!1 &102745337
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -578,6 +644,7 @@ Transform:
m_LocalPosition: {x: 0, y: -10, z: 0} m_LocalPosition: {x: 0, y: -10, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 67279956}
- {fileID: 694714222} - {fileID: 694714222}
- {fileID: 1553193321} - {fileID: 1553193321}
m_Father: {fileID: 0} m_Father: {fileID: 0}
@ -1182,7 +1249,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!4 &694714222 --- !u!4 &694714222
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1195,7 +1262,7 @@ Transform:
m_Children: m_Children:
- {fileID: 806122350} - {fileID: 806122350}
m_Father: {fileID: 401185751} m_Father: {fileID: 401185751}
m_RootOrder: 0 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!20 &694714223 --- !u!20 &694714223
Camera: Camera:
@ -1964,6 +2031,86 @@ MonoBehaviour:
width: 8 width: 8
depth: 5 depth: 5
height: 3 height: 3
--- !u!1 &927263596
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 5
m_Component:
- component: {fileID: 927263597}
- component: {fileID: 927263600}
- component: {fileID: 927263599}
- component: {fileID: 927263598}
m_Layer: 5
m_Name: Velocity
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &927263597
RectTransform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 927263596}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2122473687}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 512, y: 0}
m_SizeDelta: {x: 512, y: 424}
m_Pivot: {x: 0, y: 1}
--- !u!114 &927263598
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 927263596}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 846b026f9a6af4049ae8cbc3b560f976, type: 3}
m_Name:
m_EditorClassIdentifier:
_sharingName: KinectV2-Velocity
--- !u!114 &927263599
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 927263596}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Texture: {fileID: 0}
m_UVRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
--- !u!222 &927263600
CanvasRenderer:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 927263596}
--- !u!1 &1000268178 --- !u!1 &1000268178
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -2488,7 +2635,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!4 &1553193321 --- !u!4 &1553193321
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -2501,7 +2648,7 @@ Transform:
m_Children: m_Children:
- {fileID: 671544961} - {fileID: 671544961}
m_Father: {fileID: 401185751} m_Father: {fileID: 401185751}
m_RootOrder: 1 m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!20 &1553193322 --- !u!20 &1553193322
Camera: Camera:
@ -2539,6 +2686,86 @@ Camera:
m_OcclusionCulling: 1 m_OcclusionCulling: 1
m_StereoConvergence: 10 m_StereoConvergence: 10
m_StereoSeparation: 0.022 m_StereoSeparation: 0.022
--- !u!1 &1621860758
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 5
m_Component:
- component: {fileID: 1621860759}
- component: {fileID: 1621860762}
- component: {fileID: 1621860761}
- component: {fileID: 1621860760}
m_Layer: 5
m_Name: Position
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1621860759
RectTransform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1621860758}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2122473687}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 512, y: 424}
m_Pivot: {x: 0, y: 1}
--- !u!114 &1621860760
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1621860758}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 846b026f9a6af4049ae8cbc3b560f976, type: 3}
m_Name:
m_EditorClassIdentifier:
_sharingName: KinectV2-Position
--- !u!114 &1621860761
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1621860758}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Texture: {fileID: 0}
m_UVRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
--- !u!222 &1621860762
CanvasRenderer:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1621860758}
--- !u!1 &1765914293 --- !u!1 &1765914293
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -2743,11 +2970,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fda5366b87aa3934a8e5823faa38f54c, type: 3} m_Script: {fileID: 11500000, guid: fda5366b87aa3934a8e5823faa38f54c, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
sharingName: FrozenSpout
textureFormat: 28
yFlip: 1
output: {fileID: 0}
m_Shader: {fileID: 0}
--- !u!20 &1817143148 --- !u!20 &1817143148
Camera: Camera:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -3217,6 +3439,62 @@ CanvasRenderer:
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 2084135709} m_GameObject: {fileID: 2084135709}
--- !u!1 &2122473686
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 5
m_Component:
- component: {fileID: 2122473687}
- component: {fileID: 2122473688}
m_Layer: 5
m_Name: Canvas
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2122473687
RectTransform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 2122473686}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children:
- {fileID: 1621860759}
- {fileID: 927263597}
m_Father: {fileID: 67279956}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!223 &2122473688
Canvas:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 2122473686}
m_Enabled: 1
serializedVersion: 3
m_RenderMode: 1
m_Camera: {fileID: 67279957}
m_PlaneDistance: 1
m_PixelPerfect: 0
m_ReceivesEvents: 1
m_OverrideSorting: 0
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_AdditionalShaderChannelsFlag: 0
m_SortingLayerID: 0
m_SortingOrder: 0
m_TargetDisplay: 0
--- !u!1 &2129467936 --- !u!1 &2129467936
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

@ -13,7 +13,7 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
numRate: 1 numRate: 1
movement: 1 movement: 1
geomSize: 0.074 geomSize: 1
velocityDamping: 0.95 velocityDamping: 0.95
lifeDuration: 10 lifeDuration: 10
lifeVariation: 0 lifeVariation: 0

@ -39,7 +39,7 @@ Material:
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _MainTex: - _MainTex:
m_Texture: {fileID: 2800000, guid: 7ec1ec22e0e868244b68c7c04331baea, type: 3} m_Texture: {fileID: 2800000, guid: b248fc4a19e53484f99da9aaa77dbdf8, type: 3}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _MetallicGlossMap: - _MetallicGlossMap:

@ -60,7 +60,7 @@
{ {
float3 position = input[0].vertex.xyz; float3 position = input[0].vertex.xyz;
position = UnityObjectToViewPos(position); position = UnityObjectToViewPos(position);
float size = _Size * input[0].vertex.w; float size = _Size;// *input[0].vertex.w;
const int side = 4; const int side = 4;
float3 vertices[side]; float3 vertices[side];
float2 uvs[side]; float2 uvs[side];

@ -14,6 +14,7 @@ namespace UltraCombos.Utility
private void Awake() private void Awake()
{ {
Screen.SetResolution(width, height, fullscreen, fps); Screen.SetResolution(width, height, fullscreen, fps);
Application.targetFrameRate = fps;
} }
} }

@ -5,6 +5,9 @@ EditorBuildSettings:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 2 serializedVersion: 2
m_Scenes: m_Scenes:
- enabled: 1 - enabled: 0
path: Assets/Frozen/Frozen.unity path: Assets/Frozen/Frozen.unity
guid: 34b4afb9026442541b75a5cc9009882b guid: 34b4afb9026442541b75a5cc9009882b
- enabled: 1
path: Assets/GrpcTest.unity
guid: b05db3575852373499f14f08281d1741

@ -570,8 +570,9 @@ PlayerSettings:
scriptingBackend: {} scriptingBackend: {}
incrementalIl2cppBuild: {} incrementalIl2cppBuild: {}
additionalIl2CppArgs: additionalIl2CppArgs:
scriptingRuntimeVersion: 0 scriptingRuntimeVersion: 1
apiCompatibilityLevelPerPlatform: {} apiCompatibilityLevelPerPlatform:
Standalone: 3
m_RenderingPath: 1 m_RenderingPath: 1
m_MobileRenderingPath: 1 m_MobileRenderingPath: 1
metroPackageName: Unity_2018_Frozen metroPackageName: Unity_2018_Frozen
@ -649,7 +650,7 @@ PlayerSettings:
daydreamIconBackground: {fileID: 0} daydreamIconBackground: {fileID: 0}
cloudServicesEnabled: {} cloudServicesEnabled: {}
facebookSdkVersion: 7.9.4 facebookSdkVersion: 7.9.4
apiCompatibilityLevel: 2 apiCompatibilityLevel: 3
cloudProjectId: cloudProjectId:
projectName: projectName:
organizationId: organizationId:

Loading…
Cancel
Save