warlock/UPF
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

new style base game

Browse Source
This commit is contained in:
Sewmina
2022-08-26 22:53:36 +05:30
parent 2eccd00c84
commit a50eba6029
8 changed files with 259 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Assets/PolygonSciFiWorlds/Textures/Misc/NewLayer.terrainlayer
View File

@@ -17,6 +17,6 @@ TerrainLayer:
m_Smoothness: 0
m_NormalScale: 1
m_DiffuseRemapMin: {x: 0, y: 0, z: 0, w: 0}
m_DiffuseRemapMax: {x: 0.9245283, y: 0.9201673, z: 0.9201673, w: 1}
m_DiffuseRemapMax: {x: 1, y: 0.9477139, z: 0.8443396, w: 1}
m_MaskMapRemapMin: {x: 0, y: 0, z: 0, w: 0}
m_MaskMapRemapMax: {x: 1, y: 1, z: 1, w: 1}

82
Assets/Game/Scenes/GameScene/GameScene.unity
View File

@@ -746,7 +746,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &7038489
Transform:
m_ObjectHideFlags: 0
@@ -15611,7 +15611,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4764153474945758, guid: acac03912306d8a4889ae21318e9466d, type: 3}
propertyPath: m_RootOrder
value: 59
value: 58
objectReference: {fileID: 0}
- target: {fileID: 4764153474945758, guid: acac03912306d8a4889ae21318e9466d, type: 3}
propertyPath: m_LocalPosition.x
@@ -50959,7 +50959,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &409818847
Transform:
m_ObjectHideFlags: 0
@@ -86684,7 +86684,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &734005084
Transform:
m_ObjectHideFlags: 0
@@ -105918,7 +105918,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &888069988
Transform:
m_ObjectHideFlags: 0
@@ -113355,6 +113355,29 @@ Transform:
m_CorrespondingSourceObject: {fileID: 4715379540816738, guid: b225b6c4fbbf1f5419c8b635c434c1c4, type: 3}
m_PrefabInstance: {fileID: 1902679643}
m_PrefabAsset: {fileID: 0}
--- !u!1 &951136117 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1883890970964992, guid: 971656936a8778940856cb4150f4711c, type: 3}
m_PrefabInstance: {fileID: 763888614}
m_PrefabAsset: {fileID: 0}
--- !u!114 &951136118
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 951136117}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5fea29bb7c508c244a1f805a5fd3fc4d, type: 3}
m_Name:
m_EditorClassIdentifier:
outlineMode: 0
outlineColor: {r: 1, g: 0.5476825, b: 0, a: 1}
outlineWidth: 7.82
precomputeOutline: 0
bakeKeys: []
bakeValues: []
--- !u!4 &951407229 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4557739507002878, guid: e8f26c3f9e07cc64cb501ce254066e31, type: 3}
@@ -115072,7 +115095,7 @@ Camera:
height: 1
near clip plane: 0.3
far clip plane: 1000
field of view: 47
field of view: 40
orthographic: 0
orthographic size: 49.3
m_Depth: -1
@@ -115098,7 +115121,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 963194225}
m_LocalRotation: {x: 0.38348946, y: 0, z: 0, w: 0.9235453}
m_LocalPosition: {x: 33.8, y: 100, z: -84.6}
m_LocalPosition: {x: 19.4, y: 80, z: -81.7}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
@@ -127484,7 +127507,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 4294967295
m_IsActive: 1
m_IsActive: 0
--- !u!4 &1065360779
Transform:
m_ObjectHideFlags: 0
@@ -131025,7 +131048,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4037819611104652, guid: 9cfed5dcd383d0341bf6753bd8128cd9, type: 3}
propertyPath: m_RootOrder
value: 61
value: 60
objectReference: {fileID: 0}
- target: {fileID: 4037819611104652, guid: 9cfed5dcd383d0341bf6753bd8128cd9, type: 3}
propertyPath: m_LocalPosition.x
@@ -162811,6 +162834,29 @@ PrefabInstance:
objectReference: {fileID: 2100000, guid: a513f125a1a39d94ab8670fd0646eba0, type: 2}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: bf37359aa0cddbb40be424b3e360baf5, type: 3}
--- !u!1 &1363243395 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1357506101398798, guid: 7f72c4f6a7c7bce4d80c9b3e2ee0aad9, type: 3}
m_PrefabInstance: {fileID: 1134181005}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1363243396
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1363243395}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5fea29bb7c508c244a1f805a5fd3fc4d, type: 3}
m_Name:
m_EditorClassIdentifier:
outlineMode: 0
outlineColor: {r: 1, g: 0.5476825, b: 0, a: 1}
outlineWidth: 7.82
precomputeOutline: 0
bakeKeys: []
bakeValues: []
--- !u!4 &1363341883 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4241811459315326, guid: b0c5c3f9b8286e14f95e62362776397f, type: 3}
@@ -167074,7 +167120,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4037819611104652, guid: 9cfed5dcd383d0341bf6753bd8128cd9, type: 3}
propertyPath: m_RootOrder
value: 60
value: 59
objectReference: {fileID: 0}
- target: {fileID: 4037819611104652, guid: 9cfed5dcd383d0341bf6753bd8128cd9, type: 3}
propertyPath: m_LocalScale.x
@@ -183732,7 +183778,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &1550431834
Transform:
m_ObjectHideFlags: 0
@@ -187502,7 +187548,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1583058843}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -24.2, y: 0, z: 11.4}
m_LocalPosition: {x: -106, y: 0, z: 11.4}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 929464283}
@@ -202870,7 +202916,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &1697685459
Transform:
m_ObjectHideFlags: 0
@@ -203962,7 +204008,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!4 &1711156235
Transform:
m_ObjectHideFlags: 0
@@ -227436,7 +227482,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &1903681472
Transform:
m_ObjectHideFlags: 0
@@ -234856,7 +234902,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &1970335795
Transform:
m_ObjectHideFlags: 0
@@ -235683,7 +235729,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
cam: {fileID: 963194228}
sensitivity: 0.1
sensitivity: 0
camTransformSpeed: 0.1
mainHallTarget: {fileID: 220396509}
leaveHallBtn: {fileID: 366405336}
@@ -241004,7 +241050,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2016105855}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 69.7, y: 0, z: 65.9}
m_LocalPosition: {x: 149.8, y: 0, z: 65.9}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 366376363}

2
Assets/Game/Scripts/BuildingManager.cs
View File

@@ -26,7 +26,7 @@ public class BuildingManager : MonoBehaviour
if(buildingState.id == building.buildingData.buildingName){
buildingExists =true;
building.curLevel = buildingState.level;
building.transform.position = (buildingState.position != Vector3.zero) ? buildingState.position : building.transform.position;
// building.transform.position = (buildingState.position != Vector3.zero) ? buildingState.position : building.transform.position;
building.lastCollected = buildingState.lastCollectedTimestamp;
break;
}

BIN
Assets/New Terrain.asset
View File

Binary file not shown.

182
Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Electronic Highway Sign SDF.asset
View File

File diff suppressed because one or more lines are too long