MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

I don't even remember what I did, but it must have been important. 

Signed-off-by: Japa <japa.mala.illo@gmail.com>
develop
Japa 2013-11-19 04:19:48 +05:30
parent 8917892473
commit e7010172e9
7 changed files with 78 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

149
clients/unity/simple_sample/Assets/Start.unity
Unescape Escape View File

@ -239,42 +239,15 @@ Transform:
m_Children:
- {fileID: 2141415061}
m_Father: {fileID: 861361728}
--- !u!1 &861361727
--- !u!1 &692705302
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 4
m_Component:
- 4: {fileID: 861361728}
m_Layer: 0
m_Name: GameObject
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &861361728
Transform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 861361727}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 16, y: -.5, z: 17.5}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 420635570}
m_Father: {fileID: 0}
--- !u!1 &990642317
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 4
m_Component:
- 4: {fileID: 990642319}
- 108: {fileID: 990642318}
- 4: {fileID: 692705304}
- 108: {fileID: 692705303}
m_Layer: 0
m_Name: Directional light
m_TagString: Untagged
@ -282,12 +255,12 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!108 &990642318
--- !u!108 &692705303
Light:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 990642317}
m_GameObject: {fileID: 692705302}
m_Enabled: 1
serializedVersion: 3
m_Type: 1
@ -300,7 +273,7 @@ Light:
m_Type: 1
m_Resolution: -1
m_Strength: 1
m_Bias: .00999999978
m_Bias: .0500000007
m_Softness: 4
m_SoftnessFade: 1
m_Cookie: {fileID: 0}
@ -317,17 +290,44 @@ Light:
m_ShadowAngle: 0
m_IndirectIntensity: 1
m_AreaSize: {x: 1, y: 1}
--- !u!4 &990642319
--- !u!4 &692705304
Transform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 990642317}
m_GameObject: {fileID: 692705302}
m_LocalRotation: {x: .408217937, y: -.234569728, z: .109381661, w: .875426114}
m_LocalPosition: {x: 0, y: 10, z: 0}
m_LocalPosition: {x: -2.00056601, y: 1.30904579, z: 6.58499813}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
--- !u!1 &861361727
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 4
m_Component:
- 4: {fileID: 861361728}
m_Layer: 0
m_Name: GameObject
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &861361728
Transform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 861361727}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 16, y: -.5, z: 17.5}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 420635570}
m_Father: {fileID: 0}
--- !u!1 &1293186818
GameObject:
m_ObjectHideFlags: 0
@ -413,8 +413,8 @@ Camera:
y: 0
width: 1
height: 1
near clip plane: .300000012
far clip plane: 1000
near clip plane: 20
far clip plane: 30
field of view: 50
orthographic: 0
orthographic size: 100
@ -432,7 +432,7 @@ Transform:
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1336453706}
m_LocalRotation: {x: .707106829, y: 0, z: 0, w: .707106829}
m_LocalPosition: {x: 0, y: 23.8978653, z: 0}
m_LocalPosition: {x: 0, y: 20, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1293186819}
@ -472,73 +472,6 @@ MonoBehaviour:
viewPortHeight: 25
verticalShift: 0
viewDistance: 10
--- !u!1 &1709742914
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 4
m_Component:
- 4: {fileID: 1709742918}
- 33: {fileID: 1709742917}
- 64: {fileID: 1709742916}
- 23: {fileID: 1709742915}
m_Layer: 0
m_Name: Quad
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!23 &1709742915
Renderer:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1709742914}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_LightmapIndex: 255
m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0}
m_Materials:
- {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0}
m_SubsetIndices:
m_StaticBatchRoot: {fileID: 0}
m_UseLightProbes: 0
m_LightProbeAnchor: {fileID: 0}
m_ScaleInLightmap: 1
--- !u!64 &1709742916
MeshCollider:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1709742914}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_SmoothSphereCollisions: 0
m_Convex: 0
m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
--- !u!33 &1709742917
MeshFilter:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1709742914}
m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
--- !u!4 &1709742918
Transform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1709742914}
m_LocalRotation: {x: .707106829, y: 0, z: 0, w: .707106829}
m_LocalPosition: {x: 0, y: -5, z: 0}
m_LocalScale: {x: 256, y: 256, z: 1}
m_Children: []
m_Father: {fileID: 0}
--- !u!1 &2141415060
GameObject:
m_ObjectHideFlags: 0
@ -564,8 +497,8 @@ Transform:
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 2141415060}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -32, y: -2, z: 32}
m_LocalScale: {x: 4, y: 4, z: 4}
m_LocalPosition: {x: -8, y: 0, z: 8}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 420635570}
--- !u!33 &2141415062

14
clients/unity/simple_sample/Assets/UV Test.mat
Unescape Escape View File

@ -28,24 +28,24 @@ Material:
m_Offset: {x: 0, y: 0}
data:
first:
name: _DecalTex
name: _Detail
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Texture: {fileID: 2800000, guid: d420514133a0fbd4990025b3e1dac764, type: 3}
m_Scale: {x: 16, y: 16}
m_Offset: {x: 0, y: 0}
data:
first:
name: _LightMap
name: _DecalTex
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
data:
first:
name: _Detail
name: _LightMap
second:
m_Texture: {fileID: 2800000, guid: d420514133a0fbd4990025b3e1dac764, type: 3}
m_Scale: {x: 16, y: 16}
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
data:
first:

62
clients/unity/simple_sample/Assets/VertexColor.shader
Unescape Escape View File

@ -1,33 +1,31 @@
// Upgrade NOTE: replaced 'SeperateSpecular' with 'SeparateSpecular'
Shader " Vertex Colored" {
Properties {
_Color ("Main Color", Color) = (1,1,1,1)
_SpecColor ("Spec Color", Color) = (1,1,1,1)
_Emission ("Emmisive Color", Color) = (0,0,0,0)
_Shininess ("Shininess", Range (0.01, 1)) = 0.7
_MainTex ("Base (RGB)", 2D) = "white" {}
}
SubShader {
Pass {
Material {
Shininess [_Shininess]
Specular [_SpecColor]
Emission [_Emission]
}
ColorMaterial AmbientAndDiffuse
Lighting On
SeparateSpecular On
SetTexture [_MainTex] {
Combine texture * primary, texture * primary
}
SetTexture [_MainTex] {
constantColor [_Color]
Combine previous * constant DOUBLE, previous * constant
}
}
}
Fallback " VertexLit", 1
Shader " Vertex Colored"
{
Properties
{
_Color ("Diffuse Color", Color) = (1,1,1,1)
_MainTex ("Texture", 2D) = "white" {}
}
SubShader
{
Tags { "RenderType" = "Opaque" }
CGPROGRAM
#pragma surface surf Lambert
struct Input
{
float2 uv_MainTex;
float4 color: Color; // Vertex color
};
sampler2D _MainTex;
fixed4 _Color;
void surf (Input IN, inout SurfaceOutput o)
{
o.Albedo = tex2D (_MainTex, IN.uv_MainTex).rgb;
o.Albedo *= _Color;
o.Albedo *= IN.color.rgb;
}
ENDCG
}
Fallback "Diffuse", 1
}

BIN
clients/unity/simple_sample/Library/InspectorExpandedItems.asset
View File

Binary file not shown.

BIN
clients/unity/simple_sample/Library/assetDatabase3
View File

Binary file not shown.

BIN
clients/unity/simple_sample/Library/metadata/fc/fcc33854b846d0e4aa14f8afb74e173b
View File

Binary file not shown.

BIN
clients/unity/simple_sample/Library/metadata/ff/ff990239cc3bc4a45a362f932463d378
View File

Binary file not shown.