diff --git a/.vs/Place/v16/.suo b/.vs/Place/v16/.suo index 5f4d376..b7e6995 100644 Binary files a/.vs/Place/v16/.suo and b/.vs/Place/v16/.suo differ diff --git a/Assembly-CSharp.Player.csproj b/Assembly-CSharp.Player.csproj index b20b2df..370cace 100644 --- a/Assembly-CSharp.Player.csproj +++ b/Assembly-CSharp.Player.csproj @@ -641,6 +641,8 @@ + + diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index f957b00..9d68231 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -78,6 +78,8 @@ + + D:/UnityHub/2019.4.17f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.dll diff --git a/Assets/BuildSystem/Example/BuildExample.unity b/Assets/BuildSystem/Example/BuildExample.unity index 10d9be1..6d65e90 100644 --- a/Assets/BuildSystem/Example/BuildExample.unity +++ b/Assets/BuildSystem/Example/BuildExample.unity @@ -1635,7 +1635,7 @@ Transform: - {fileID: 3695930167267611842} - {fileID: 3801088227897269504} m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &213381405 GameObject: @@ -2982,8 +2982,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 793444225} m_HandleRect: {fileID: 793444224} m_Direction: 0 - m_Value: 0 - m_Size: 0.61248404 + m_Value: -0.00000020328112 + m_Size: 0.6130799 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -3493,8 +3493,7 @@ MonoBehaviour: startPos: {x: 0, y: 0, z: 0} isCanPlace: 1 isRemove: 0 - green: {fileID: 2100000, guid: 1104f6a3c258a474487112336d7a4381, type: 2} - red: {fileID: 2100000, guid: ea6704263e39ac742abc2ac233c3dcb0, type: 2} + flag: {fileID: 523532168} isGameEnd: 0 t2up: {fileID: 11400000, guid: b23c1945520cf224983adf6101d9f50e, type: 2} t2down: {fileID: 11400000, guid: 4d14daf8a6aefb54db22812b28dafddf, type: 2} @@ -4730,6 +4729,100 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 523488559} m_Mesh: {fileID: 4300000, guid: 172699eecd3e19a4d8a3a7cea559c989, type: 3} +--- !u!1 &523532168 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 523532172} + - component: {fileID: 523532171} + - component: {fileID: 523532170} + - component: {fileID: 523532169} + m_Layer: 8 + m_Name: flag + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!64 &523532169 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 523532168} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 0 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &523532170 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 523532168} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 6e0d68f11c3f99447bc72c2a74b53c77, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &523532171 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 523532168} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &523532172 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 523532168} + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: -216.4, y: 0, z: 0} + m_LocalScale: {x: 49, y: 49, z: 50} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!1 &539568124 GameObject: m_ObjectHideFlags: 0 @@ -5273,7 +5366,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 04ffff9f7902578439e89a8112d2a3c8, type: 2} + - {fileID: 2100000, guid: 65ec4d26f749b0a468dfb1d499d59630, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -5310,7 +5403,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 625233087} m_LocalRotation: {x: 0, y: -0.7071068, z: 0.7071068, w: 0} - m_LocalPosition: {x: 350, y: -0.5, z: 200} + m_LocalPosition: {x: 350, y: -0.6, z: 200} m_LocalScale: {x: 700, y: 400, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -5760,7 +5853,7 @@ Transform: m_Children: - {fileID: 820113293} m_Father: {fileID: 3695930167206425731} - m_RootOrder: 15 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &676090871 MeshRenderer: @@ -6191,7 +6284,7 @@ Transform: m_Children: - {fileID: 718537430} m_Father: {fileID: 3695930167206425731} - m_RootOrder: 19 + m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &738417824 MeshRenderer: @@ -6710,7 +6803,7 @@ Transform: - {fileID: 1297235554} - {fileID: 709375657} m_Father: {fileID: 3695930167206425731} - m_RootOrder: 17 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &787187331 MeshRenderer: @@ -7297,7 +7390,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -951.5, y: 141.49998} + m_AnchoredPosition: {x: -951.4998, y: 141.49998} m_SizeDelta: {x: 3104, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &875169250 @@ -7616,7 +7709,7 @@ Transform: - {fileID: 1032268337} - {fileID: 651108663} m_Father: {fileID: 3695930167206425731} - m_RootOrder: 18 + m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &891850753 MeshRenderer: @@ -7990,7 +8083,7 @@ Transform: - {fileID: 571804008} - {fileID: 512520961} m_Father: {fileID: 3695930167206425731} - m_RootOrder: 14 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 180.96799, z: 0} --- !u!23 &948946514 MeshRenderer: @@ -8180,7 +8273,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 963194225} m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: 347.41, y: 491, z: 120.9} + m_LocalPosition: {x: 349, y: 491, z: 123} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -8998,12 +9091,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1073373207} - m_LocalRotation: {x: -0.36599812, y: -0.4531539, z: 0.2113091, w: -0.7848855} - m_LocalPosition: {x: -410.5, y: 2.8689957, z: -819.9} + m_LocalRotation: {x: 0.40821788, y: -0.2345697, z: 0.109381646, w: 0.8754262} + m_LocalPosition: {x: 741.5115, y: 3, z: 7.738373} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 3695930167206425731} - m_RootOrder: 11 + m_Father: {fileID: 0} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!108 &1073373209 Light: @@ -9017,7 +9110,7 @@ Light: m_Type: 1 m_Shape: 0 m_Color: {r: 1, g: 0.9962034, b: 0.9858491, a: 1} - m_Intensity: 2.21 + m_Intensity: 2 m_Range: 10 m_SpotAngle: 30 m_InnerSpotAngle: 21.80208 @@ -9054,7 +9147,7 @@ Light: m_RenderMode: 0 m_CullingMask: serializedVersion: 2 - m_Bits: 4294967295 + m_Bits: 311 m_RenderingLayerMask: 1 m_Lightmapping: 1 m_LightShadowCasterMode: 0 @@ -10376,6 +10469,98 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1220851880} m_CullTransparentMesh: 0 +--- !u!1 &1222441510 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1222441512} + - component: {fileID: 1222441511} + m_Layer: 0 + m_Name: maplight + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &1222441511 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1222441510} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 1 + m_Shape: 0 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Intensity: 1.58 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 0 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 512 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &1222441512 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1222441510} + m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} + m_LocalPosition: {x: 417.6921, y: 37.6136, z: 291.03146} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1 &1226922445 GameObject: m_ObjectHideFlags: 0 @@ -11749,7 +11934,7 @@ Transform: m_Children: - {fileID: 1334164791} m_Father: {fileID: 3695930167206425731} - m_RootOrder: 13 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &1458202260 MeshRenderer: @@ -12731,7 +12916,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1581471647 PrefabInstance: @@ -13310,7 +13495,7 @@ Transform: m_Children: - {fileID: 963599440} m_Father: {fileID: 3695930167206425731} - m_RootOrder: 16 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &1652931736 MeshRenderer: @@ -13456,7 +13641,7 @@ RectTransform: - {fileID: 1431439163} - {fileID: 202321946} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -15226,84 +15411,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2011034131} m_Mesh: {fileID: 4300008, guid: c2b1bafd07e77b74db1ed4246cf7b10e, type: 3} ---- !u!1 &2026525584 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2026525585} - - component: {fileID: 2026525587} - - component: {fileID: 2026525586} - m_Layer: 0 - m_Name: GirdManager - m_TagString: Untagged - m_Icon: {fileID: 7422848464349959988, guid: 0000000000000000d000000000000000, type: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2026525585 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2026525584} - m_LocalRotation: {x: -0, y: -0.7071068, z: -0, w: -0.7071068} - m_LocalPosition: {x: -410.5, y: -0.1310044, z: -819.9} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 3695930167206425731} - m_RootOrder: 12 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2026525586 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2026525584} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f8906aeb558119c41a9efa855093b3b9, type: 3} - m_Name: - m_EditorClassIdentifier: - ground: {fileID: 625233091} - camera: {fileID: 963194227} ---- !u!114 &2026525587 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2026525584} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ac40ffb0b6afa094fb98cd10e9d0d7df, type: 3} - m_Name: - m_EditorClassIdentifier: - buildTip: {fileID: 313295615} - mapSize: {x: 14, y: 8} - gridSize: 50 - startPos: {x: 0, y: 0, z: 0} - isCanPlace: 1 - isRemove: 0 - green: {fileID: 2100000, guid: 1104f6a3c258a474487112336d7a4381, type: 2} - red: {fileID: 2100000, guid: ea6704263e39ac742abc2ac233c3dcb0, type: 2} - isGameEnd: 0 - t2up: {fileID: 11400000, guid: b23c1945520cf224983adf6101d9f50e, type: 2} - t2down: {fileID: 11400000, guid: 4d14daf8a6aefb54db22812b28dafddf, type: 2} - h2: {fileID: 11400000, guid: a8c03fa26591de3439bc8fdc6fee07b2, type: 2} - t2left: {fileID: 11400000, guid: 68fcae5128572a240b43ba0e36664520, type: 2} - t2right: {fileID: 11400000, guid: 1e0149d6058a0b444b818bb8157731cc, type: 2} - v2: {fileID: 11400000, guid: da05c01ed36598a48890f5800fd65827, type: 2} - w: - - {fileID: 11400000, guid: 66d23174d39b7434eb3676c06e7e015e, type: 2} - - {fileID: 11400000, guid: 4be0b7185c2b65741a3e7bcf45d1ff7a, type: 2} - - {fileID: 11400000, guid: 7c8287ab574aeb94382e8a9d35df4d70, type: 2} - - {fileID: 11400000, guid: 9fb40cefeec895d409c6f621e936203f, type: 2} --- !u!1 &2039357372 GameObject: m_ObjectHideFlags: 0 @@ -29910,7 +30017,7 @@ Transform: - {fileID: 588042038} - {fileID: 998809370} m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!1 &1840495766553027207 GameObject: @@ -52016,7 +52123,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3695930166495303639} m_LocalRotation: {x: -0, y: -1, z: -0, w: 0.00038775796} - m_LocalPosition: {x: 426.49152, y: 0.14999801, z: 108.91833} + m_LocalPosition: {x: 423.8, y: 0.14999801, z: 105.1} m_LocalScale: {x: 0.9952533, y: 1, z: 1} m_Children: - {fileID: 3695930166431037562} @@ -80880,8 +80987,6 @@ Transform: - {fileID: 1508535495} - {fileID: 1019021275} - {fileID: 1633125379} - - {fileID: 1073373208} - - {fileID: 2026525585} - {fileID: 1458202259} - {fileID: 948946513} - {fileID: 676090870} @@ -83451,8 +83556,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3695930167267611845} m_LocalRotation: {x: -0, y: 1, z: -0, w: 0} - m_LocalPosition: {x: 278.8, y: 0.1499939, z: 110.2} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalPosition: {x: 272.5, y: 0.1499939, z: 101.16} + m_LocalScale: {x: 1.2394, y: 1, z: 1.2134} m_Children: - {fileID: 3695930168337716533} - {fileID: 3695930168073413983} @@ -97247,7 +97352,7 @@ Transform: m_GameObject: {fileID: 3695930167627777499} m_LocalRotation: {x: -0, y: -0, z: -0, w: -1} m_LocalPosition: {x: 374.49997, y: 0.15100098, z: 274.7} - m_LocalScale: {x: 0.99995893, y: 1, z: 1} + m_LocalScale: {x: 1.58, y: 0.32, z: 1.58} m_Children: - {fileID: 3695930168100389677} m_Father: {fileID: 208293046} @@ -129473,7 +129578,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4579031855412283322} m_LocalRotation: {x: -0, y: 0.7071068, z: 0.7071068, w: 0} - m_LocalPosition: {x: 576.9916, y: 7.81, z: 237.11835} + m_LocalPosition: {x: 576.2, y: 7.81, z: 230.7} m_LocalScale: {x: 1.0841004, y: 1.0841002, z: 1.0841} m_Children: - {fileID: 788027160514921762} diff --git a/Assets/BuildSystem/Example/New Material.mat b/Assets/BuildSystem/Example/New Material.mat index 4199f0a..95c2e05 100644 --- a/Assets/BuildSystem/Example/New Material.mat +++ b/Assets/BuildSystem/Example/New Material.mat @@ -37,11 +37,11 @@ Material: m_Offset: {x: 0, y: 0} - _EmissionMap: m_Texture: {fileID: 0} - m_Scale: {x: 0.27, y: 0.188} + m_Scale: {x: 0.977, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: bbc41a5d9567a724e9bc7c860d7eee4c, type: 3} - m_Scale: {x: 0.27, y: 0.188} + m_Texture: {fileID: 2800000, guid: 65657a1191534ac40b370638e0d07716, type: 3} + m_Scale: {x: 0.977, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: m_Texture: {fileID: 0} diff --git a/Assets/BuildSystem/Scripts/BuildSystemManager.cs b/Assets/BuildSystem/Scripts/BuildSystemManager.cs index 65dda3d..1da8df8 100644 --- a/Assets/BuildSystem/Scripts/BuildSystemManager.cs +++ b/Assets/BuildSystem/Scripts/BuildSystemManager.cs @@ -24,8 +24,7 @@ namespace BuildSystem [NonSerialized] public PlaceObject placeObj; - public Material green; - public Material red; + public GameObject flag; public bool isGameEnd = false; @@ -335,17 +334,18 @@ namespace BuildSystem } //变色提示 - //if (placeObj) - //{ - // if (isCanCreateToTip()) - // { - // placeObj.GetComponent().materials[1] = green; - // } - // else - // { - // placeObj.GetComponent().materials[1] = red; - // } - //} + if (placeObj) + { + flag.transform.position = placeObj.transform.position - new Vector3(0,0.5f,0); + if (isCanCreateToTip()) + { + flag.GetComponent().material.SetColor("_Color", new Color32(48,255,30,128)); + } + else + { + flag.GetComponent().material.SetColor("_Color", new Color32(255, 41, 0, 128)); + } + } //判断通关 if (IsGameEnd() && !isGameEnd) diff --git a/Assets/BuildSystem/Scripts/Grid.cs b/Assets/BuildSystem/Scripts/Grid.cs index c0e3688..da91dae 100644 --- a/Assets/BuildSystem/Scripts/Grid.cs +++ b/Assets/BuildSystem/Scripts/Grid.cs @@ -99,6 +99,7 @@ namespace BuildSystem public void Init() { isHaves = new IsHave[4] { IsHave.None, IsHave.None, IsHave.None, IsHave.None }; isPlace = false; + isTS = false; roadType = RoadType.Straight; type = new PlaceObjectType[4] { PlaceObjectType.None, PlaceObjectType.None, PlaceObjectType.None, PlaceObjectType.None }; } diff --git a/Assets/Changjing/Prefabs/Ding/T2Down.prefab b/Assets/Changjing/Prefabs/Ding/T2Down.prefab index 0962588..1f8af23 100644 --- a/Assets/Changjing/Prefabs/Ding/T2Down.prefab +++ b/Assets/Changjing/Prefabs/Ding/T2Down.prefab @@ -26,7 +26,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8716334521011121182} m_LocalRotation: {x: 0, y: 0.7071068, z: 0.7071068, w: 0} - m_LocalPosition: {x: 48.6, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} diff --git a/Assets/Changjing/Prefabs/Ding/T2Left.prefab b/Assets/Changjing/Prefabs/Ding/T2Left.prefab index 7842d0c..f65762b 100644 --- a/Assets/Changjing/Prefabs/Ding/T2Left.prefab +++ b/Assets/Changjing/Prefabs/Ding/T2Left.prefab @@ -26,7 +26,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8716334521011121182} m_LocalRotation: {x: 0.5, y: 0.5, z: 0.5, w: -0.5} - m_LocalPosition: {x: 48.6, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} diff --git a/Assets/Changjing/Prefabs/Ding/T2Right.prefab b/Assets/Changjing/Prefabs/Ding/T2Right.prefab index c9f34d6..b6bed38 100644 --- a/Assets/Changjing/Prefabs/Ding/T2Right.prefab +++ b/Assets/Changjing/Prefabs/Ding/T2Right.prefab @@ -26,7 +26,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8716334521011121182} m_LocalRotation: {x: -0.5, y: 0.5, z: 0.5, w: 0.5} - m_LocalPosition: {x: 48.6, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} diff --git a/Assets/Changjing/Prefabs/Ding/T2UP.prefab b/Assets/Changjing/Prefabs/Ding/T2UP.prefab index c7ae2f0..795372c 100644 --- a/Assets/Changjing/Prefabs/Ding/T2UP.prefab +++ b/Assets/Changjing/Prefabs/Ding/T2UP.prefab @@ -26,7 +26,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8716334521011121182} m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} - m_LocalPosition: {x: 48.6, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} diff --git a/Assets/Changjing/Prefabs/Ding/T3Down.prefab b/Assets/Changjing/Prefabs/Ding/T3Down.prefab index c2474d6..d991b4e 100644 --- a/Assets/Changjing/Prefabs/Ding/T3Down.prefab +++ b/Assets/Changjing/Prefabs/Ding/T3Down.prefab @@ -26,7 +26,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1970792486835008168} m_LocalRotation: {x: 0, y: 0.7071068, z: 0.7071068, w: 0} - m_LocalPosition: {x: -70.3, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} diff --git a/Assets/Changjing/Prefabs/Ding/T3Left.prefab b/Assets/Changjing/Prefabs/Ding/T3Left.prefab index 871574c..3cbb983 100644 --- a/Assets/Changjing/Prefabs/Ding/T3Left.prefab +++ b/Assets/Changjing/Prefabs/Ding/T3Left.prefab @@ -26,7 +26,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1970792486835008168} m_LocalRotation: {x: 0.5, y: 0.5, z: 0.5, w: -0.5} - m_LocalPosition: {x: -70.3, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} diff --git a/Assets/Changjing/Prefabs/Ding/T3Right.prefab b/Assets/Changjing/Prefabs/Ding/T3Right.prefab index aa7d088..1ef3329 100644 --- a/Assets/Changjing/Prefabs/Ding/T3Right.prefab +++ b/Assets/Changjing/Prefabs/Ding/T3Right.prefab @@ -26,7 +26,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1970792486835008168} m_LocalRotation: {x: -0.5, y: 0.5, z: 0.5, w: 0.5} - m_LocalPosition: {x: -70.3, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} diff --git a/Assets/Changjing/Prefabs/Ding/T3UP.prefab b/Assets/Changjing/Prefabs/Ding/T3UP.prefab index f09a464..59bd946 100644 --- a/Assets/Changjing/Prefabs/Ding/T3UP.prefab +++ b/Assets/Changjing/Prefabs/Ding/T3UP.prefab @@ -26,7 +26,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1970792486835008168} m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} - m_LocalPosition: {x: -70.3, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} diff --git a/Assets/Changjing/Prefabs/Straight/Horizontal2.prefab b/Assets/Changjing/Prefabs/Straight/Horizontal2.prefab index e174ea5..357cd92 100644 --- a/Assets/Changjing/Prefabs/Straight/Horizontal2.prefab +++ b/Assets/Changjing/Prefabs/Straight/Horizontal2.prefab @@ -26,7 +26,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6918255244896162420} m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} - m_LocalPosition: {x: 5.3, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} diff --git a/Assets/Changjing/Prefabs/Straight/Horizontal3.prefab b/Assets/Changjing/Prefabs/Straight/Horizontal3.prefab index 67c69ff..40f7297 100644 --- a/Assets/Changjing/Prefabs/Straight/Horizontal3.prefab +++ b/Assets/Changjing/Prefabs/Straight/Horizontal3.prefab @@ -26,7 +26,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1768239880150500486} m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} - m_LocalPosition: {x: -128, y: 0.00000015258789, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} diff --git a/Assets/Changjing/Prefabs/Straight/Vertical2.prefab b/Assets/Changjing/Prefabs/Straight/Vertical2.prefab index fdf9092..8f72557 100644 --- a/Assets/Changjing/Prefabs/Straight/Vertical2.prefab +++ b/Assets/Changjing/Prefabs/Straight/Vertical2.prefab @@ -26,7 +26,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6918255244896162420} m_LocalRotation: {x: -0.5, y: 0.5, z: 0.5, w: 0.5} - m_LocalPosition: {x: 103.9, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} diff --git a/Assets/Changjing/Prefabs/Straight/Vertical3.prefab b/Assets/Changjing/Prefabs/Straight/Vertical3.prefab index 9a6f4fc..c48e0fe 100644 --- a/Assets/Changjing/Prefabs/Straight/Vertical3.prefab +++ b/Assets/Changjing/Prefabs/Straight/Vertical3.prefab @@ -26,7 +26,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1768239880150500486} m_LocalRotation: {x: -0.5, y: 0.5, z: 0.5, w: 0.5} - m_LocalPosition: {x: -128, y: 0.00000015258789, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} diff --git a/Assets/Changjing/Prefabs/T3-2/T32Left.prefab b/Assets/Changjing/Prefabs/T3-2/T32Left.prefab index 163b97d..71a2479 100644 --- a/Assets/Changjing/Prefabs/T3-2/T32Left.prefab +++ b/Assets/Changjing/Prefabs/T3-2/T32Left.prefab @@ -26,7 +26,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6927694691712325220} m_LocalRotation: {x: 0.5, y: 0.5, z: 0.5, w: -0.5} - m_LocalPosition: {x: -3.9055655, y: 0, z: 4.0158534} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} diff --git a/Assets/Changjing/Prefabs/T3-2/T32Right.prefab b/Assets/Changjing/Prefabs/T3-2/T32Right.prefab index 0d8a20c..5025dc3 100644 --- a/Assets/Changjing/Prefabs/T3-2/T32Right.prefab +++ b/Assets/Changjing/Prefabs/T3-2/T32Right.prefab @@ -26,7 +26,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6927694691712325220} m_LocalRotation: {x: -0.5, y: 0.5, z: 0.5, w: 0.5} - m_LocalPosition: {x: 3.8325887, y: 0, z: 4.665814} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} diff --git a/Assets/Changjing/Prefabs/Ten/shizilu_2.prefab b/Assets/Changjing/Prefabs/Ten/shizilu_2.prefab index 6d9ece3..804a59d 100644 --- a/Assets/Changjing/Prefabs/Ten/shizilu_2.prefab +++ b/Assets/Changjing/Prefabs/Ten/shizilu_2.prefab @@ -26,7 +26,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3288116807597003724} m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} - m_LocalPosition: {x: -10.8, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} diff --git a/Assets/Changjing/Prefabs/Ten/shizilu_3.prefab b/Assets/Changjing/Prefabs/Ten/shizilu_3.prefab index 53c6276..28ae28c 100644 --- a/Assets/Changjing/Prefabs/Ten/shizilu_3.prefab +++ b/Assets/Changjing/Prefabs/Ten/shizilu_3.prefab @@ -26,7 +26,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2333984037620919469} m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} - m_LocalPosition: {x: -190.6, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} diff --git a/Assets/Changjing/Prefabs/wan/2Down.prefab b/Assets/Changjing/Prefabs/wan/2Down.prefab index b1de586..0d7e5cf 100644 --- a/Assets/Changjing/Prefabs/wan/2Down.prefab +++ b/Assets/Changjing/Prefabs/wan/2Down.prefab @@ -12,7 +12,7 @@ GameObject: - component: {fileID: 1835680217862511362} - component: {fileID: 4511852730242363336} m_Layer: 8 - m_Name: 2Up + m_Name: 2Down m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -26,7 +26,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2710514241417727517} m_LocalRotation: {x: 0, y: 0.7071068, z: 0.7071068, w: 0} - m_LocalPosition: {x: 13.282761, y: 0, z: 14.747814} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.101158, y: 0.101158, z: 0.101158} m_Children: [] m_Father: {fileID: 0} diff --git a/Assets/Changjing/Prefabs/wan/2Right.prefab b/Assets/Changjing/Prefabs/wan/2Right.prefab index f4f1439..95e8937 100644 --- a/Assets/Changjing/Prefabs/wan/2Right.prefab +++ b/Assets/Changjing/Prefabs/wan/2Right.prefab @@ -12,7 +12,7 @@ GameObject: - component: {fileID: 1835680217862511362} - component: {fileID: 4511852730242363336} m_Layer: 8 - m_Name: 2Left + m_Name: 2Right m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -26,7 +26,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2710514241417727517} m_LocalRotation: {x: -0.5, y: 0.5, z: 0.5, w: 0.5} - m_LocalPosition: {x: 0.34950018, y: 0, z: 14.386154} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.101158, y: 0.101158, z: 0.101158} m_Children: [] m_Father: {fileID: 0} diff --git a/Assets/Map.mat b/Assets/Map.mat new file mode 100644 index 0000000..cc93a6c --- /dev/null +++ b/Assets/Map.mat @@ -0,0 +1,81 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Map + m_Shader: {fileID: 4800000, guid: 4a45564f85835914f8b5758ff6a1e492, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Grid: + m_Texture: {fileID: 2800000, guid: 65657a1191534ac40b370638e0d07716, type: 3} + m_Scale: {x: 0.97, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 8c91d4e7aca7ae1488b24b4818a46318, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.3584906, g: 0.3584906, b: 0.3584906, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Map.mat.meta b/Assets/Map.mat.meta new file mode 100644 index 0000000..db751d7 --- /dev/null +++ b/Assets/Map.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 65ec4d26f749b0a468dfb1d499d59630 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Map.shader b/Assets/Map.shader new file mode 100644 index 0000000..1a70190 --- /dev/null +++ b/Assets/Map.shader @@ -0,0 +1,56 @@ +Shader "Myshader/Map" +{ + Properties + { + _MainTex ("Texture", 2D) = "white" {} + _Grid ("Grid", 2D) = "white" {} + _Color("Color",COLOR) = (1,1,1,1) + } + SubShader + { + Tags { "RenderType"="Opaque" } + Pass + { + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + + #include "UnityCG.cginc" + + struct appdata + { + float4 vertex : POSITION; + float4 uv : TEXCOORD0; + }; + + struct v2f + { + float4 uv : TEXCOORD0; + float4 vertex : SV_POSITION; + }; + + sampler2D _MainTex; + float4 _MainTex_ST; + sampler2D _Grid; + float4 _Grid_ST; + fixed4 _Color; + v2f vert (appdata v) + { + v2f o; + o.vertex = UnityObjectToClipPos(v.vertex); + o.uv.xy = TRANSFORM_TEX(v.uv, _MainTex); + o.uv.zw = TRANSFORM_TEX(v.uv, _Grid); + return o; + } + + fixed4 frag (v2f i) : SV_Target + { + // sample the texture + fixed4 col = tex2D(_MainTex, i.uv.xy); + fixed4 col2 = tex2D(_Grid, i.uv.zw); + return col * (col2 + _Color); + } + ENDCG + } + } +} diff --git a/Assets/Map.shader.meta b/Assets/Map.shader.meta new file mode 100644 index 0000000..82d087a --- /dev/null +++ b/Assets/Map.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 4a45564f85835914f8b5758ff6a1e492 +ShaderImporter: + externalObjects: {} + defaultTextures: [] + nonModifiableTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TMD.mat b/Assets/TMD.mat new file mode 100644 index 0000000..11d3c1b --- /dev/null +++ b/Assets/TMD.mat @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: TMD + m_Shader: {fileID: 4800000, guid: 66a141981fe2f1f4dba9aaf7e7954808, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 0.1585162, b: 0, a: 0.5019608} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/TMD.mat.meta b/Assets/TMD.mat.meta new file mode 100644 index 0000000..375b14e --- /dev/null +++ b/Assets/TMD.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6e0d68f11c3f99447bc72c2a74b53c77 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TMD.shader b/Assets/TMD.shader new file mode 100644 index 0000000..8ef2233 --- /dev/null +++ b/Assets/TMD.shader @@ -0,0 +1,61 @@ +Shader "Myshader/TMD" +{ + Properties + { + _MainTex ("Texture", 2D) = "white" {} + _Color("Color",COLOR) = (1,1,1,1) + } + SubShader + { + Tags { "RenderType"="Transparent" "Queue"="Transparent"} + LOD 100 + ZWrite Off + Blend SrcAlpha OneMinusSrcAlpha + Pass + { + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + // make fog work + #pragma multi_compile_fog + + #include "UnityCG.cginc" + + struct appdata + { + float4 vertex : POSITION; + float2 uv : TEXCOORD0; + }; + + struct v2f + { + float2 uv : TEXCOORD0; + UNITY_FOG_COORDS(1) + float4 vertex : SV_POSITION; + }; + + sampler2D _MainTex; + float4 _MainTex_ST; + fixed4 _Color; + + v2f vert (appdata v) + { + v2f o; + o.vertex = UnityObjectToClipPos(v.vertex); + o.uv = TRANSFORM_TEX(v.uv, _MainTex); + UNITY_TRANSFER_FOG(o,o.vertex); + return o; + } + + fixed4 frag (v2f i) : SV_Target + { + // sample the texture + fixed4 col = tex2D(_MainTex, i.uv); + // apply fog + UNITY_APPLY_FOG(i.fogCoord, col); + return col * _Color; + } + ENDCG + } + } +} diff --git a/Assets/TMD.shader.meta b/Assets/TMD.shader.meta new file mode 100644 index 0000000..f931e2c --- /dev/null +++ b/Assets/TMD.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 66a141981fe2f1f4dba9aaf7e7954808 +ShaderImporter: + externalObjects: {} + defaultTextures: [] + nonModifiableTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/无标题.png b/Assets/无标题.png new file mode 100644 index 0000000..ab6636d Binary files /dev/null and b/Assets/无标题.png differ diff --git a/Assets/无标题.png.meta b/Assets/无标题.png.meta new file mode 100644 index 0000000..ba43646 --- /dev/null +++ b/Assets/无标题.png.meta @@ -0,0 +1,116 @@ +fileFormatVersion: 2 +guid: 65657a1191534ac40b370638e0d07716 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: