Jam
/
GGJ_2019
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Tile updates

master
MB 5 years ago
parent
2d98565d46
commit
879e48cdef
5 changed files with 158 additions and 12 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +74
    -1
      Assets/FBX/terrain_Prefabs/terr1.prefab
  2. +74
    -1
      Assets/FBX/terrain_Prefabs/terr2.prefab
  3. +1
    -1
      Assets/Materials/TestPlaneColor 3.mat
  4. +1
    -1
      Assets/Materials/TestPlaneColor 4.mat
  5. +8
    -8
      Assets/Scenes/ClientScene.unity

+ 74
- 1
Assets/FBX/terrain_Prefabs/terr1.prefab View File

@ -1842,6 +1842,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 4176941658931862}
- component: {fileID: 114327900797600422}
m_Layer: 0
m_Name: terr1
m_TagString: Untagged
@ -2413,6 +2414,21 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1730089915666010
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4513211702449196}
m_Layer: 0
m_Name: Hotspot2
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1742755859391894
GameObject:
m_ObjectHideFlags: 1
@ -2818,6 +2834,21 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1845437344497874
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4559154686008944}
m_Layer: 0
m_Name: Hotspot1
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1846381612995168
GameObject:
m_ObjectHideFlags: 1
@ -3962,11 +3993,13 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1564554960623202}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 100, y: 0, z: 0}
m_LocalPosition: {x: 570.8, y: 592.641, z: -744.858}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4154508751402390}
- {fileID: 4975842787030052}
- {fileID: 4559154686008944}
- {fileID: 4513211702449196}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -4828,6 +4861,19 @@ Transform:
m_Father: {fileID: 4154508751402390}
m_RootOrder: 130
m_LocalEulerAnglesHint: {x: -90.00001, y: 0, z: 53.564003}
--- !u!4 &4513211702449196
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1730089915666010}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -28, y: 0, z: -23.64}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4176941658931862}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4513328027690468
Transform:
m_ObjectHideFlags: 1
@ -4997,6 +5043,19 @@ Transform:
m_Father: {fileID: 4154508751402390}
m_RootOrder: 43
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4559154686008944
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1845437344497874}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 12.8, y: 0, z: 10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4176941658931862}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4561037491203054
Transform:
m_ObjectHideFlags: 1
@ -15643,3 +15702,17 @@ MeshCollider:
m_CookingOptions: 14
m_SkinWidth: 0.01
m_Mesh: {fileID: 4300000, guid: 99d0111f01c394540a69064c1a297091, type: 3}
--- !u!114 &114327900797600422
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1564554960623202}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2301390022f0d72478aae034e36cd8ff, type: 3}
m_Name:
m_EditorClassIdentifier:
LandmarkPoints:
- {fileID: 1845437344497874}
- {fileID: 1730089915666010}

+ 74
- 1
Assets/FBX/terrain_Prefabs/terr2.prefab View File

@ -309,6 +309,21 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1083290416272790
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4168516854011340}
m_Layer: 0
m_Name: Hotspot1
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1094161670375784
GameObject:
m_ObjectHideFlags: 1
@ -572,6 +587,21 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1174604388648104
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4870272704213824}
m_Layer: 0
m_Name: Hotspot2
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1176104587806036
GameObject:
m_ObjectHideFlags: 1
@ -1911,6 +1941,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 4794400441473222}
- component: {fileID: 114493825277252546}
m_Layer: 0
m_Name: terr2
m_TagString: Untagged
@ -3896,6 +3927,19 @@ Transform:
m_Father: {fileID: 4951516335567288}
m_RootOrder: 123
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4168516854011340
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1083290416272790}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -5.01, y: 0, z: 28.08}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4794400441473222}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4168695833297474
Transform:
m_ObjectHideFlags: 1
@ -5464,11 +5508,13 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1607766741274254}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 200, y: 0, z: 0}
m_LocalPosition: {x: 200, y: 0, z: 79.3}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4168695833297474}
- {fileID: 4951516335567288}
- {fileID: 4168516854011340}
- {fileID: 4870272704213824}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -5654,6 +5700,19 @@ Transform:
m_Father: {fileID: 4951516335567288}
m_RootOrder: 51
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 62.077003}
--- !u!4 &4870272704213824
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1174604388648104}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -6.9, y: 0, z: -23.4}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4794400441473222}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4870799813897402
Transform:
m_ObjectHideFlags: 1
@ -15850,3 +15909,17 @@ MeshCollider:
m_CookingOptions: 14
m_SkinWidth: 0.01
m_Mesh: {fileID: 4300000, guid: 99d0111f01c394540a69064c1a297091, type: 3}
--- !u!114 &114493825277252546
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1607766741274254}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2301390022f0d72478aae034e36cd8ff, type: 3}
m_Name:
m_EditorClassIdentifier:
LandmarkPoints:
- {fileID: 1083290416272790}
- {fileID: 1174604388648104}

+ 1
- 1
Assets/Materials/TestPlaneColor 3.mat View File

@ -6,7 +6,7 @@ Material:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: TestPlaneColor 2
m_Name: TestPlaneColor 3
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4

+ 1
- 1
Assets/Materials/TestPlaneColor 4.mat View File

@ -6,7 +6,7 @@ Material:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: TestPlaneColor
m_Name: TestPlaneColor 4
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4

+ 8
- 8
Assets/Scenes/ClientScene.unity View File

@ -926,7 +926,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_text:
m_text: Name
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
@ -994,13 +994,13 @@ MonoBehaviour:
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_textInfo:
textComponent: {fileID: 322476067}
characterCount: 0
characterCount: 4
spriteCount: 0
spaceCount: 0
wordCount: 0
wordCount: 1
linkCount: 0
lineCount: 0
pageCount: 0
lineCount: 1
pageCount: 1
materialCount: 1
m_havePropertiesChanged: 0
m_isUsingLegacyAnimationComponent: 0
@ -3176,9 +3176,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: dfb1677e1946204499147b2ff56be203, type: 3}
m_Name:
m_EditorClassIdentifier:
IP: {fileID: 574996016}
Port: {fileID: 651669416}
Name: {fileID: 883227279}
IP: {fileID: 8710121}
Port: {fileID: 1256610966}
Name: {fileID: 1250475356}
Server: {fileID: 555203924}
DefaultNames:
- Trolly Mc Trollton

Write Preview
Loading…
Cancel
Save