diff --git a/Assets/GameObjects/Prefabs/LocalPlayer.prefab b/Assets/GameObjects/Prefabs/LocalPlayer.prefab index 3bbe7a6..d2ff9e8 100644 --- a/Assets/GameObjects/Prefabs/LocalPlayer.prefab +++ b/Assets/GameObjects/Prefabs/LocalPlayer.prefab @@ -543,6 +543,10 @@ PrefabInstance: propertyPath: m_Layer value: 10 objectReference: {fileID: 0} + - target: {fileID: 1865991757674780053, guid: 0bffd92c46c257840806f5e957954800, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} - target: {fileID: 1893019409343660811, guid: 0bffd92c46c257840806f5e957954800, type: 3} propertyPath: m_Layer value: 10 diff --git a/Assets/GameObjects/Prefabs/Player.prefab b/Assets/GameObjects/Prefabs/Player.prefab index 3088007..60841b5 100644 --- a/Assets/GameObjects/Prefabs/Player.prefab +++ b/Assets/GameObjects/Prefabs/Player.prefab @@ -41,7 +41,7 @@ CharacterJoint: m_Anchor: {x: 0, y: 0, z: 0} m_Axis: {x: -1, y: 0, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 0.0049999994, y: 0.004999996, z: -0.0000000010477379} + m_ConnectedAnchor: {x: 0.005000001, y: 0.004999998, z: -0.0000000016298145} serializedVersion: 2 m_SwingAxis: {x: 0, y: 0, z: -1} m_TwistLimitSpring: @@ -147,7 +147,7 @@ CharacterJoint: m_Anchor: {x: 0, y: 0, z: 0} m_Axis: {x: -1, y: 0, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 3.4924597e-10, y: 0.0069999993, z: 3.4924602e-10} + m_ConnectedAnchor: {x: 0.0000000012001307, y: 0.0069999946, z: 0.0000000023283067} serializedVersion: 2 m_SwingAxis: {x: 0, y: 0, z: 1} m_TwistLimitSpring: @@ -274,7 +274,7 @@ CharacterJoint: m_Anchor: {x: 0, y: 0, z: 0} m_Axis: {x: -1, y: 0, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 0.0020000003, y: 1.7881396e-10, z: 0} + m_ConnectedAnchor: {x: 0.0020000003, y: 0.0000000016880222, z: -6.9849193e-10} serializedVersion: 2 m_SwingAxis: {x: 0, y: 0, z: 1} m_TwistLimitSpring: @@ -407,7 +407,7 @@ Transform: - {fileID: 5713660789478474713} - {fileID: 6532210512705233048} m_Father: {fileID: 4833458671639168932} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!54 &3034403183751315802 Rigidbody: @@ -449,7 +449,7 @@ CharacterJoint: m_Anchor: {x: 0, y: 0, z: 0} m_Axis: {x: -1, y: 0, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 9.313226e-10, y: 0.007999994, z: 0.0009999966} + m_ConnectedAnchor: {x: 0.0000000012660166, y: 0.007999996, z: 0.0009999954} serializedVersion: 2 m_SwingAxis: {x: 0, y: 0, z: -1} m_TwistLimitSpring: @@ -524,7 +524,7 @@ CharacterJoint: m_Anchor: {x: 0, y: 0, z: 0} m_Axis: {x: -1, y: 0, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 6.400208e-16, y: 0.008999997, z: 0} + m_ConnectedAnchor: {x: -1.5825846e-10, y: 0.008999998, z: -9.313226e-10} serializedVersion: 2 m_SwingAxis: {x: 0, y: 0, z: -1} m_TwistLimitSpring: @@ -599,7 +599,7 @@ CharacterJoint: m_Anchor: {x: 0, y: 0, z: 0} m_Axis: {x: -1, y: 0, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 2.910383e-10, y: 0.007, z: 2.3283067e-10} + m_ConnectedAnchor: {x: 2.056404e-10, y: 0.007, z: 2.9103833e-10} serializedVersion: 2 m_SwingAxis: {x: 0, y: 0, z: 1} m_TwistLimitSpring: @@ -674,7 +674,7 @@ CharacterJoint: m_Anchor: {x: 0, y: 0, z: 0} m_Axis: {x: 0, y: 0, z: -1} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 0.000000001222361, y: 0.0050000027, z: -6.9849193e-10} + m_ConnectedAnchor: {x: 2.9103833e-10, y: 0.0050000013, z: 8.1490725e-10} serializedVersion: 2 m_SwingAxis: {x: 1, y: 0, z: 0} m_TwistLimitSpring: @@ -749,7 +749,7 @@ CharacterJoint: m_Anchor: {x: 0, y: 0, z: 0} m_Axis: {x: 0, y: -1, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: -0.0039999993, y: 0.004999999, z: 5.820766e-10} + m_ConnectedAnchor: {x: -0.004, y: 0.0049999994, z: -6.9849193e-10} serializedVersion: 2 m_SwingAxis: {x: 1, y: 0, z: 0} m_TwistLimitSpring: @@ -824,7 +824,7 @@ CharacterJoint: m_Anchor: {x: 0, y: 0, z: 0} m_Axis: {x: -1, y: 0, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: -0.002, y: 0.0000000013969838, z: 5.9604616e-10} + m_ConnectedAnchor: {x: -0.002, y: 4.947651e-10, z: -2.910383e-11} serializedVersion: 2 m_SwingAxis: {x: 0, y: 0, z: 1} m_TwistLimitSpring: @@ -899,7 +899,7 @@ CharacterJoint: m_Anchor: {x: 0, y: 0, z: 0} m_Axis: {x: -1, y: 0, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: -1.7000673e-10, y: 0.009, z: 5.9604544e-11} + m_ConnectedAnchor: {x: -6.7484507e-10, y: 0.008999997, z: 8.731149e-11} serializedVersion: 2 m_SwingAxis: {x: 0, y: 0, z: -1} m_TwistLimitSpring: @@ -933,6 +933,22 @@ CharacterJoint: m_EnablePreprocessing: 0 m_MassScale: 1 m_ConnectedMassScale: 1 +--- !u!114 &8126968570320153119 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4958852355926309971} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 114f8f02ec9ed22488ee2bc97f60f6f3, type: 3} + m_Name: + m_EditorClassIdentifier: + RenderTextureToCopy: {fileID: 8400000, guid: f3187e94a6fef04428cc361250daa902, type: 2} + Camera: {fileID: 8440773692779321063} + Renderer: {fileID: 6904472884974394758} + MaterialIndex: 1 --- !u!54 &6926105415076449191 Rigidbody: m_ObjectHideFlags: 0 @@ -973,7 +989,7 @@ CharacterJoint: m_Anchor: {x: 0, y: 0, z: 0} m_Axis: {x: -1, y: 0, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: -5.820766e-11, y: 0.008, z: 0.0009999993} + m_ConnectedAnchor: {x: -2.910383e-10, y: 0.007999997, z: 0.0009999977} serializedVersion: 2 m_SwingAxis: {x: 0, y: 0, z: -1} m_TwistLimitSpring: @@ -1048,7 +1064,7 @@ CharacterJoint: m_Anchor: {x: 0, y: 0, z: 0} m_Axis: {x: -1, y: 0, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: -0.0020000003, y: -1.7881396e-10, z: 0} + m_ConnectedAnchor: {x: -0.0019999999, y: 0.0000000029685907, z: -2.3283064e-10} serializedVersion: 2 m_SwingAxis: {x: 0, y: 0, z: 1} m_TwistLimitSpring: @@ -1123,7 +1139,7 @@ CharacterJoint: m_Anchor: {x: 0, y: 0, z: 0} m_Axis: {x: 1, y: 0, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: -0.004999999, y: 0.0049999976, z: 0} + m_ConnectedAnchor: {x: -0.005, y: 0.004999999, z: -0.0000000017462298} serializedVersion: 2 m_SwingAxis: {x: 0, y: 0, z: -1} m_TwistLimitSpring: @@ -1198,7 +1214,7 @@ CharacterJoint: m_Anchor: {x: 0, y: 0, z: 0} m_Axis: {x: -1, y: 0, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 5.1722515e-12, y: 0.006999997, z: -9.313226e-10} + m_ConnectedAnchor: {x: -1.9310109e-10, y: 0.006999999, z: -3.4924597e-10} serializedVersion: 2 m_SwingAxis: {x: 0, y: 0, z: 1} m_TwistLimitSpring: @@ -1273,7 +1289,7 @@ CharacterJoint: m_Anchor: {x: 0, y: 0, z: 0} m_Axis: {x: -1, y: 0, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: -8.485318e-11, y: 0.0069999965, z: -9.313226e-10} + m_ConnectedAnchor: {x: -1.5743856e-10, y: 0.007000001, z: 0.0000000013969839} serializedVersion: 2 m_SwingAxis: {x: 0, y: 0, z: 1} m_TwistLimitSpring: @@ -1505,7 +1521,7 @@ CharacterJoint: m_Anchor: {x: 0, y: 0, z: 0} m_Axis: {x: 0, y: 1, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: -5.8207654e-11, y: 0.0050000004, z: 8.1490725e-10} + m_ConnectedAnchor: {x: 7.566995e-10, y: 0.0050000004, z: 0.000000002386514} serializedVersion: 2 m_SwingAxis: {x: 1, y: 0, z: 0} m_TwistLimitSpring: @@ -1569,6 +1585,112 @@ Transform: m_Father: {fileID: 1865991757674780053} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7376043460032831961 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4219995598675074942} + - component: {fileID: 8440773692779321063} + - component: {fileID: 2016770580725278479} + m_Layer: 0 + m_Name: ScopeCamera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4219995598675074942 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7376043460032831961} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 50, y: 50, z: 50} + m_Children: [] + m_Father: {fileID: 4833458671639168932} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!20 &8440773692779321063 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7376043460032831961} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 1.5 + far clip plane: 1000 + field of view: 3 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!114 &2016770580725278479 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7376043460032831961} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 --- !u!1 &7391558912582364398 GameObject: m_ObjectHideFlags: 0 @@ -1829,7 +1951,7 @@ CharacterJoint: m_Anchor: {x: 0, y: 0, z: 0} m_Axis: {x: 0, y: 0, z: 1} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 0.0040000007, y: 0.005000002, z: 4.656613e-10} + m_ConnectedAnchor: {x: 0.0039999993, y: 0.0049999966, z: -0.0000000012805685} serializedVersion: 2 m_SwingAxis: {x: 0, y: 1, z: 0} m_TwistLimitSpring: @@ -1904,7 +2026,7 @@ CharacterJoint: m_Anchor: {x: 0, y: 0, z: 0} m_Axis: {x: 0, y: 0, z: -1} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 3.492459e-10, y: 0.0050000004, z: -0.0000000023283067} + m_ConnectedAnchor: {x: 8.731148e-10, y: 0.005000002, z: 0.0000000013969841} serializedVersion: 2 m_SwingAxis: {x: -1, y: 0, z: 0} m_TwistLimitSpring: @@ -2009,7 +2131,7 @@ CharacterJoint: m_Anchor: {x: 0, y: 0, z: 0} m_Axis: {x: 0, y: 1, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: -6.9849193e-10, y: 0.0049999994, z: -0.0000000018626447} + m_ConnectedAnchor: {x: 2.3283064e-10, y: 0.004999999, z: -0.0000000032596281} serializedVersion: 2 m_SwingAxis: {x: 1, y: 0, z: 0} m_TwistLimitSpring: @@ -2197,6 +2319,7 @@ Transform: m_LocalPosition: {x: 0, y: 1.6, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 4219995598675074942} - {fileID: 1865991757674780053} m_Father: {fileID: 7391558912774766616} m_RootOrder: 4 @@ -2242,7 +2365,7 @@ CharacterJoint: m_Anchor: {x: 0, y: 0, z: 0} m_Axis: {x: -1, y: 0, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 0.002, y: 0.0000000013969838, z: 5.9604616e-10} + m_ConnectedAnchor: {x: 0.002, y: 4.3655746e-10, z: -1.7462298e-10} serializedVersion: 2 m_SwingAxis: {x: 0, y: 0, z: 1} m_TwistLimitSpring: @@ -3052,16 +3175,21 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} ---- !u!1 &2976767849567766614 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: -8328862363880354971, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} - m_PrefabInstance: {fileID: 2676956051575718707} - m_PrefabAsset: {fileID: 0} --- !u!1 &4604321914683741605 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1928564536991127190, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} m_PrefabInstance: {fileID: 2676956051575718707} m_PrefabAsset: {fileID: 0} +--- !u!1 &2909126165159328361 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 970877069575420250, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + m_PrefabInstance: {fileID: 2676956051575718707} + m_PrefabAsset: {fileID: 0} +--- !u!1 &2976767849567766614 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -8328862363880354971, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + m_PrefabInstance: {fileID: 2676956051575718707} + m_PrefabAsset: {fileID: 0} --- !u!1 &6953174386727810892 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4996979199693665407, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} @@ -3072,29 +3200,14 @@ Animator: m_CorrespondingSourceObject: {fileID: 5866666021909216657, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} m_PrefabInstance: {fileID: 2676956051575718707} m_PrefabAsset: {fileID: 0} ---- !u!4 &2498596356784760024 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} - m_PrefabInstance: {fileID: 2676956051575718707} - m_PrefabAsset: {fileID: 0} ---- !u!1 &2909126165159328361 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 970877069575420250, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} - m_PrefabInstance: {fileID: 2676956051575718707} - m_PrefabAsset: {fileID: 0} ---- !u!1 &5591340088261064748 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: -1675871812770890977, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} - m_PrefabInstance: {fileID: 2676956051575718707} - m_PrefabAsset: {fileID: 0} --- !u!1 &378181050955954659 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2313131607479007952, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} m_PrefabInstance: {fileID: 2676956051575718707} m_PrefabAsset: {fileID: 0} ---- !u!1 &8020497713614398660 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 5361814037758830583, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} +--- !u!4 &2498596356784760024 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} m_PrefabInstance: {fileID: 2676956051575718707} m_PrefabAsset: {fileID: 0} --- !u!1 &5585551264296828372 stripped @@ -3102,9 +3215,9 @@ GameObject: m_CorrespondingSourceObject: {fileID: -1682754096888168729, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} m_PrefabInstance: {fileID: 2676956051575718707} m_PrefabAsset: {fileID: 0} ---- !u!1 &5615618764339399952 stripped +--- !u!1 &8020497713614398660 stripped GameObject: - m_CorrespondingSourceObject: {fileID: -1672846623409500637, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + m_CorrespondingSourceObject: {fileID: 5361814037758830583, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} m_PrefabInstance: {fileID: 2676956051575718707} m_PrefabAsset: {fileID: 0} --- !u!1 &4058563969374220487 stripped @@ -3112,11 +3225,21 @@ GameObject: m_CorrespondingSourceObject: {fileID: 2122496377756791796, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} m_PrefabInstance: {fileID: 2676956051575718707} m_PrefabAsset: {fileID: 0} +--- !u!1 &5615618764339399952 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -1672846623409500637, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + m_PrefabInstance: {fileID: 2676956051575718707} + m_PrefabAsset: {fileID: 0} --- !u!1 &8744249650485362980 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6665228367387902487, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} m_PrefabInstance: {fileID: 2676956051575718707} m_PrefabAsset: {fileID: 0} +--- !u!1 &5591340088261064748 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -1675871812770890977, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + m_PrefabInstance: {fileID: 2676956051575718707} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4574503883554023504 PrefabInstance: m_ObjectHideFlags: 0 @@ -3835,34 +3958,9 @@ GameObject: m_CorrespondingSourceObject: {fileID: 156644665701319248, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} m_PrefabInstance: {fileID: 4574503883554023504} m_PrefabAsset: {fileID: 0} ---- !u!4 &4103164600241655739 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} - m_PrefabInstance: {fileID: 4574503883554023504} - m_PrefabAsset: {fileID: 0} ---- !u!1 &439248789966776954 stripped +--- !u!1 &5143876166499415354 stripped GameObject: - m_CorrespondingSourceObject: {fileID: -5088115977802186198, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} - m_PrefabInstance: {fileID: 4574503883554023504} - m_PrefabAsset: {fileID: 0} ---- !u!1 &8134722540108977799 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: -3485874040580669737, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} - m_PrefabInstance: {fileID: 4574503883554023504} - m_PrefabAsset: {fileID: 0} ---- !u!1 &7861152345155936203 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: -3286630041556977765, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} - m_PrefabInstance: {fileID: 4574503883554023504} - m_PrefabAsset: {fileID: 0} ---- !u!1 &3404627525641887855 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1172147262814881855, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} - m_PrefabInstance: {fileID: 4574503883554023504} - m_PrefabAsset: {fileID: 0} ---- !u!1 &1328534562678190810 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3248221432074918538, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + m_CorrespondingSourceObject: {fileID: 8654052703341272426, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} m_PrefabInstance: {fileID: 4574503883554023504} m_PrefabAsset: {fileID: 0} --- !u!1 &8167146500820978587 stripped @@ -3870,19 +3968,14 @@ GameObject: m_CorrespondingSourceObject: {fileID: -3590372263194287157, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} m_PrefabInstance: {fileID: 4574503883554023504} m_PrefabAsset: {fileID: 0} ---- !u!1 &4799245472480801387 stripped +--- !u!1 &7861152345155936203 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 9070741543337286203, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + m_CorrespondingSourceObject: {fileID: -3286630041556977765, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} m_PrefabInstance: {fileID: 4574503883554023504} m_PrefabAsset: {fileID: 0} ---- !u!1 &5143876166499415354 stripped +--- !u!1 &1328534562678190810 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 8654052703341272426, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} - m_PrefabInstance: {fileID: 4574503883554023504} - m_PrefabAsset: {fileID: 0} ---- !u!1 &5077275728796870648 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8722905492793823144, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + m_CorrespondingSourceObject: {fileID: 3248221432074918538, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} m_PrefabInstance: {fileID: 4574503883554023504} m_PrefabAsset: {fileID: 0} --- !u!1 &7078895688717378999 stripped @@ -3890,11 +3983,41 @@ GameObject: m_CorrespondingSourceObject: {fileID: -2502122241363620377, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} m_PrefabInstance: {fileID: 4574503883554023504} m_PrefabAsset: {fileID: 0} +--- !u!1 &3404627525641887855 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1172147262814881855, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + m_PrefabInstance: {fileID: 4574503883554023504} + m_PrefabAsset: {fileID: 0} +--- !u!1 &439248789966776954 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -5088115977802186198, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + m_PrefabInstance: {fileID: 4574503883554023504} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4103164600241655739 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + m_PrefabInstance: {fileID: 4574503883554023504} + m_PrefabAsset: {fileID: 0} +--- !u!1 &5077275728796870648 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8722905492793823144, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + m_PrefabInstance: {fileID: 4574503883554023504} + m_PrefabAsset: {fileID: 0} --- !u!95 &7931246460515997121 stripped Animator: m_CorrespondingSourceObject: {fileID: 5866666021909216657, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} m_PrefabInstance: {fileID: 4574503883554023504} m_PrefabAsset: {fileID: 0} +--- !u!1 &4799245472480801387 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 9070741543337286203, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + m_PrefabInstance: {fileID: 4574503883554023504} + m_PrefabAsset: {fileID: 0} +--- !u!1 &8134722540108977799 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -3485874040580669737, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + m_PrefabInstance: {fileID: 4574503883554023504} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5192659304772370690 PrefabInstance: m_ObjectHideFlags: 0 @@ -3964,8 +4087,18 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4f2bbe1f3791622448504110deb9f847, type: 3} +--- !u!1 &4958852355926309971 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 4f2bbe1f3791622448504110deb9f847, type: 3} + m_PrefabInstance: {fileID: 5192659304772370690} + m_PrefabAsset: {fileID: 0} --- !u!4 &5736092089644017385 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4f2bbe1f3791622448504110deb9f847, type: 3} m_PrefabInstance: {fileID: 5192659304772370690} m_PrefabAsset: {fileID: 0} +--- !u!23 &6904472884974394758 stripped +MeshRenderer: + m_CorrespondingSourceObject: {fileID: -7511558181221131132, guid: 4f2bbe1f3791622448504110deb9f847, type: 3} + m_PrefabInstance: {fileID: 5192659304772370690} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Graphics/Models/Guns/Scope.mat b/Assets/Graphics/Models/Guns/Scope.mat new file mode 100644 index 0000000..80e44d3 --- /dev/null +++ b/Assets/Graphics/Models/Guns/Scope.mat @@ -0,0 +1,95 @@ +%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: Scope + m_Shader: {fileID: -6465566751694194690, guid: 71d11b4c0834f344c970cb7561773350, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - Texture2D_471BDC5: + m_Texture: {fileID: 2800000, guid: bcc47b7f7afd67b458d102260bad7d77, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + 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} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _SampleGI: 0 + - _Smoothness: 0.232 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 0} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] +--- !u!114 &4366056616345760041 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 2 diff --git a/Assets/Graphics/Models/Guns/Scope.mat.meta b/Assets/Graphics/Models/Guns/Scope.mat.meta new file mode 100644 index 0000000..6cb7a8e --- /dev/null +++ b/Assets/Graphics/Models/Guns/Scope.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 094595bc0d373c344aae6b826ce13e41 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Graphics/Models/Guns/ScopeRenderTexture.renderTexture b/Assets/Graphics/Models/Guns/ScopeRenderTexture.renderTexture new file mode 100644 index 0000000..4665dd0 --- /dev/null +++ b/Assets/Graphics/Models/Guns/ScopeRenderTexture.renderTexture @@ -0,0 +1,37 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!84 &8400000 +RenderTexture: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ScopeRenderTexture + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + serializedVersion: 3 + m_Width: 128 + m_Height: 128 + m_AntiAliasing: 4 + m_MipCount: -1 + m_DepthFormat: 2 + m_ColorFormat: 8 + m_MipMap: 0 + m_GenerateMips: 1 + m_SRGB: 0 + m_UseDynamicScale: 0 + m_BindMS: 0 + m_EnableCompatibleFormat: 1 + m_TextureSettings: + serializedVersion: 2 + m_FilterMode: 1 + m_Aniso: 0 + m_MipBias: 0 + m_WrapU: 1 + m_WrapV: 1 + m_WrapW: 1 + m_Dimension: 2 + m_VolumeDepth: 1 diff --git a/Assets/Graphics/Models/Guns/ScopeRenderTexture.renderTexture.meta b/Assets/Graphics/Models/Guns/ScopeRenderTexture.renderTexture.meta new file mode 100644 index 0000000..65dd979 --- /dev/null +++ b/Assets/Graphics/Models/Guns/ScopeRenderTexture.renderTexture.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f3187e94a6fef04428cc361250daa902 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Graphics/Models/Guns/ScopeShader.shadergraph b/Assets/Graphics/Models/Guns/ScopeShader.shadergraph new file mode 100644 index 0000000..761def7 --- /dev/null +++ b/Assets/Graphics/Models/Guns/ScopeShader.shadergraph @@ -0,0 +1,62 @@ +{ + "m_SerializedProperties": [ + { + "typeInfo": { + "fullName": "UnityEditor.ShaderGraph.Internal.Texture2DShaderProperty" + }, + "JSONnodeData": "{\n \"m_Guid\": {\n \"m_GuidSerialized\": \"58f049af-bade-44b3-9d93-b5f4c76f89d5\"\n },\n \"m_Name\": \"RenderTexture\",\n \"m_DefaultReferenceName\": \"Texture2D_471BDC5\",\n \"m_OverrideReferenceName\": \"\",\n \"m_GeneratePropertyBlock\": true,\n \"m_Precision\": 0,\n \"m_GPUInstanced\": false,\n \"m_Hidden\": false,\n \"m_Value\": {\n \"m_SerializedTexture\": \"{\\\"texture\\\":{\\\"instanceID\\\":0}}\",\n \"m_Guid\": \"\"\n },\n \"m_Modifiable\": true,\n \"m_DefaultType\": 0\n}" + } + ], + "m_SerializedKeywords": [], + "m_SerializableNodes": [ + { + "typeInfo": { + "fullName": "UnityEditor.ShaderGraph.PBRMasterNode" + }, + "JSONnodeData": "{\n \"m_GuidSerialized\": \"1fa2de82-dc3d-4f12-8359-7aa504fa334f\",\n \"m_GroupGuidSerialized\": \"00000000-0000-0000-0000-000000000000\",\n \"m_Name\": \"PBR Master\",\n \"m_NodeVersion\": 0,\n \"m_DrawState\": {\n \"m_Expanded\": true,\n \"m_Position\": {\n \"serializedVersion\": \"2\",\n \"x\": 0.0,\n \"y\": 0.0,\n \"width\": 0.0,\n \"height\": 0.0\n }\n },\n \"m_SerializableSlots\": [\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.PositionMaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 9,\\n \\\"m_DisplayName\\\": \\\"Vertex Position\\\",\\n \\\"m_SlotType\\\": 0,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"Vertex Position\\\",\\n \\\"m_StageCapability\\\": 1,\\n \\\"m_Value\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0\\n },\\n \\\"m_DefaultValue\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0\\n },\\n \\\"m_Labels\\\": [\\n \\\"X\\\",\\n \\\"Y\\\",\\n \\\"Z\\\"\\n ],\\n \\\"m_Space\\\": 0\\n}\"\n },\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.NormalMaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 10,\\n \\\"m_DisplayName\\\": \\\"Vertex Normal\\\",\\n \\\"m_SlotType\\\": 0,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"Vertex Normal\\\",\\n \\\"m_StageCapability\\\": 1,\\n \\\"m_Value\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0\\n },\\n \\\"m_DefaultValue\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0\\n },\\n \\\"m_Labels\\\": [\\n \\\"X\\\",\\n \\\"Y\\\",\\n \\\"Z\\\"\\n ],\\n \\\"m_Space\\\": 0\\n}\"\n },\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.TangentMaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 11,\\n \\\"m_DisplayName\\\": \\\"Vertex Tangent\\\",\\n \\\"m_SlotType\\\": 0,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"Vertex Tangent\\\",\\n \\\"m_StageCapability\\\": 1,\\n \\\"m_Value\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0\\n },\\n \\\"m_DefaultValue\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0\\n },\\n \\\"m_Labels\\\": [\\n \\\"X\\\",\\n \\\"Y\\\",\\n \\\"Z\\\"\\n ],\\n \\\"m_Space\\\": 0\\n}\"\n },\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.ColorRGBMaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 0,\\n \\\"m_DisplayName\\\": \\\"Albedo\\\",\\n \\\"m_SlotType\\\": 0,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"Albedo\\\",\\n \\\"m_StageCapability\\\": 2,\\n \\\"m_Value\\\": {\\n \\\"x\\\": 0.7353569269180298,\\n \\\"y\\\": 0.7353569269180298,\\n \\\"z\\\": 0.7353569269180298\\n },\\n \\\"m_DefaultValue\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0\\n },\\n \\\"m_Labels\\\": [\\n \\\"X\\\",\\n \\\"Y\\\",\\n \\\"Z\\\"\\n ],\\n \\\"m_ColorMode\\\": 0\\n}\"\n },\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.NormalMaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 1,\\n \\\"m_DisplayName\\\": \\\"Normal\\\",\\n \\\"m_SlotType\\\": 0,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"Normal\\\",\\n \\\"m_StageCapability\\\": 2,\\n \\\"m_Value\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0\\n },\\n \\\"m_DefaultValue\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0\\n },\\n \\\"m_Labels\\\": [\\n \\\"X\\\",\\n \\\"Y\\\",\\n \\\"Z\\\"\\n ],\\n \\\"m_Space\\\": 3\\n}\"\n },\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.ColorRGBMaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 4,\\n \\\"m_DisplayName\\\": \\\"Emission\\\",\\n \\\"m_SlotType\\\": 0,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"Emission\\\",\\n \\\"m_StageCapability\\\": 2,\\n \\\"m_Value\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0\\n },\\n \\\"m_DefaultValue\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0\\n },\\n \\\"m_Labels\\\": [\\n \\\"X\\\",\\n \\\"Y\\\",\\n \\\"Z\\\"\\n ],\\n \\\"m_ColorMode\\\": 0\\n}\"\n },\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.Vector1MaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 2,\\n \\\"m_DisplayName\\\": \\\"Metallic\\\",\\n \\\"m_SlotType\\\": 0,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"Metallic\\\",\\n \\\"m_StageCapability\\\": 2,\\n \\\"m_Value\\\": 1.0,\\n \\\"m_DefaultValue\\\": 0.0,\\n \\\"m_Labels\\\": [\\n \\\"X\\\"\\n ]\\n}\"\n },\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.Vector1MaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 5,\\n \\\"m_DisplayName\\\": \\\"Smoothness\\\",\\n \\\"m_SlotType\\\": 0,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"Smoothness\\\",\\n \\\"m_StageCapability\\\": 2,\\n \\\"m_Value\\\": 0.699999988079071,\\n \\\"m_DefaultValue\\\": 0.5,\\n \\\"m_Labels\\\": [\\n \\\"X\\\"\\n ]\\n}\"\n },\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.Vector1MaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 6,\\n \\\"m_DisplayName\\\": \\\"Occlusion\\\",\\n \\\"m_SlotType\\\": 0,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"Occlusion\\\",\\n \\\"m_StageCapability\\\": 2,\\n \\\"m_Value\\\": 1.0,\\n \\\"m_DefaultValue\\\": 1.0,\\n \\\"m_Labels\\\": [\\n \\\"X\\\"\\n ]\\n}\"\n },\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.Vector1MaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 7,\\n \\\"m_DisplayName\\\": \\\"Alpha\\\",\\n \\\"m_SlotType\\\": 0,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"Alpha\\\",\\n \\\"m_StageCapability\\\": 2,\\n \\\"m_Value\\\": 1.0,\\n \\\"m_DefaultValue\\\": 1.0,\\n \\\"m_Labels\\\": [\\n \\\"X\\\"\\n ]\\n}\"\n },\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.Vector1MaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 8,\\n \\\"m_DisplayName\\\": \\\"AlphaClipThreshold\\\",\\n \\\"m_SlotType\\\": 0,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"AlphaClipThreshold\\\",\\n \\\"m_StageCapability\\\": 2,\\n \\\"m_Value\\\": 0.0,\\n \\\"m_DefaultValue\\\": 0.0,\\n \\\"m_Labels\\\": [\\n \\\"X\\\"\\n ]\\n}\"\n }\n ],\n \"m_Precision\": 0,\n \"m_PreviewExpanded\": true,\n \"m_CustomColors\": {\n \"m_SerializableColors\": []\n },\n \"m_DOTSInstancing\": false,\n \"m_SerializableSubShaders\": [\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.Rendering.Universal.UniversalPBRSubShader\"\n },\n \"JSONnodeData\": \"{}\"\n }\n ],\n \"m_ShaderGUIOverride\": \"\",\n \"m_OverrideEnabled\": false,\n \"m_Model\": 1,\n \"m_SurfaceType\": 0,\n \"m_AlphaMode\": 0,\n \"m_TwoSided\": false,\n \"m_NormalDropOffSpace\": 0\n}" + }, + { + "typeInfo": { + "fullName": "UnityEditor.ShaderGraph.SampleTexture2DNode" + }, + "JSONnodeData": "{\n \"m_GuidSerialized\": \"93da7409-021f-49d4-af63-405d0f501766\",\n \"m_GroupGuidSerialized\": \"00000000-0000-0000-0000-000000000000\",\n \"m_Name\": \"Sample Texture 2D\",\n \"m_NodeVersion\": 0,\n \"m_DrawState\": {\n \"m_Expanded\": true,\n \"m_Position\": {\n \"serializedVersion\": \"2\",\n \"x\": -376.0,\n \"y\": 71.99996948242188,\n \"width\": 208.0,\n \"height\": 433.5999755859375\n }\n },\n \"m_SerializableSlots\": [\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.Vector4MaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 0,\\n \\\"m_DisplayName\\\": \\\"RGBA\\\",\\n \\\"m_SlotType\\\": 1,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"RGBA\\\",\\n \\\"m_StageCapability\\\": 2,\\n \\\"m_Value\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0,\\n \\\"w\\\": 0.0\\n },\\n \\\"m_DefaultValue\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0,\\n \\\"w\\\": 0.0\\n }\\n}\"\n },\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.Vector1MaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 4,\\n \\\"m_DisplayName\\\": \\\"R\\\",\\n \\\"m_SlotType\\\": 1,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"R\\\",\\n \\\"m_StageCapability\\\": 2,\\n \\\"m_Value\\\": 0.0,\\n \\\"m_DefaultValue\\\": 0.0,\\n \\\"m_Labels\\\": [\\n \\\"X\\\"\\n ]\\n}\"\n },\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.Vector1MaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 5,\\n \\\"m_DisplayName\\\": \\\"G\\\",\\n \\\"m_SlotType\\\": 1,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"G\\\",\\n \\\"m_StageCapability\\\": 2,\\n \\\"m_Value\\\": 0.0,\\n \\\"m_DefaultValue\\\": 0.0,\\n \\\"m_Labels\\\": [\\n \\\"X\\\"\\n ]\\n}\"\n },\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.Vector1MaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 6,\\n \\\"m_DisplayName\\\": \\\"B\\\",\\n \\\"m_SlotType\\\": 1,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"B\\\",\\n \\\"m_StageCapability\\\": 2,\\n \\\"m_Value\\\": 0.0,\\n \\\"m_DefaultValue\\\": 0.0,\\n \\\"m_Labels\\\": [\\n \\\"X\\\"\\n ]\\n}\"\n },\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.Vector1MaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 7,\\n \\\"m_DisplayName\\\": \\\"A\\\",\\n \\\"m_SlotType\\\": 1,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"A\\\",\\n \\\"m_StageCapability\\\": 2,\\n \\\"m_Value\\\": 0.0,\\n \\\"m_DefaultValue\\\": 0.0,\\n \\\"m_Labels\\\": [\\n \\\"X\\\"\\n ]\\n}\"\n },\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.Texture2DInputMaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 1,\\n \\\"m_DisplayName\\\": \\\"Texture\\\",\\n \\\"m_SlotType\\\": 0,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"Texture\\\",\\n \\\"m_StageCapability\\\": 3,\\n \\\"m_Texture\\\": {\\n \\\"m_SerializedTexture\\\": \\\"{\\\\\\\"texture\\\\\\\":{\\\\\\\"instanceID\\\\\\\":0}}\\\",\\n \\\"m_Guid\\\": \\\"\\\"\\n },\\n \\\"m_DefaultType\\\": 0\\n}\"\n },\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.UVMaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 2,\\n \\\"m_DisplayName\\\": \\\"UV\\\",\\n \\\"m_SlotType\\\": 0,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"UV\\\",\\n \\\"m_StageCapability\\\": 3,\\n \\\"m_Value\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0\\n },\\n \\\"m_DefaultValue\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0\\n },\\n \\\"m_Labels\\\": [\\n \\\"X\\\",\\n \\\"Y\\\"\\n ],\\n \\\"m_Channel\\\": 0\\n}\"\n },\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.SamplerStateMaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 3,\\n \\\"m_DisplayName\\\": \\\"Sampler\\\",\\n \\\"m_SlotType\\\": 0,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"Sampler\\\",\\n \\\"m_StageCapability\\\": 3\\n}\"\n }\n ],\n \"m_Precision\": 0,\n \"m_PreviewExpanded\": true,\n \"m_CustomColors\": {\n \"m_SerializableColors\": []\n },\n \"m_TextureType\": 0,\n \"m_NormalMapSpace\": 0\n}" + }, + { + "typeInfo": { + "fullName": "UnityEditor.ShaderGraph.PropertyNode" + }, + "JSONnodeData": "{\n \"m_GuidSerialized\": \"dd8ccfc0-fbb7-4c10-8610-5e2f0601bd55\",\n \"m_GroupGuidSerialized\": \"00000000-0000-0000-0000-000000000000\",\n \"m_Name\": \"Property\",\n \"m_NodeVersion\": 0,\n \"m_DrawState\": {\n \"m_Expanded\": true,\n \"m_Position\": {\n \"serializedVersion\": \"2\",\n \"x\": -584.7999877929688,\n \"y\": 87.19998931884766,\n \"width\": 163.20001220703126,\n \"height\": 33.600006103515628\n }\n },\n \"m_SerializableSlots\": [\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.Texture2DMaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 0,\\n \\\"m_DisplayName\\\": \\\"RenderTexture\\\",\\n \\\"m_SlotType\\\": 1,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"Out\\\",\\n \\\"m_StageCapability\\\": 3\\n}\"\n }\n ],\n \"m_Precision\": 0,\n \"m_PreviewExpanded\": true,\n \"m_CustomColors\": {\n \"m_SerializableColors\": []\n },\n \"m_PropertyGuidSerialized\": \"58f049af-bade-44b3-9d93-b5f4c76f89d5\"\n}" + } + ], + "m_Groups": [], + "m_StickyNotes": [], + "m_SerializableEdges": [ + { + "typeInfo": { + "fullName": "UnityEditor.Graphing.Edge" + }, + "JSONnodeData": "{\n \"m_OutputSlot\": {\n \"m_SlotId\": 0,\n \"m_NodeGUIDSerialized\": \"93da7409-021f-49d4-af63-405d0f501766\"\n },\n \"m_InputSlot\": {\n \"m_SlotId\": 0,\n \"m_NodeGUIDSerialized\": \"1fa2de82-dc3d-4f12-8359-7aa504fa334f\"\n }\n}" + }, + { + "typeInfo": { + "fullName": "UnityEditor.Graphing.Edge" + }, + "JSONnodeData": "{\n \"m_OutputSlot\": {\n \"m_SlotId\": 0,\n \"m_NodeGUIDSerialized\": \"93da7409-021f-49d4-af63-405d0f501766\"\n },\n \"m_InputSlot\": {\n \"m_SlotId\": 4,\n \"m_NodeGUIDSerialized\": \"1fa2de82-dc3d-4f12-8359-7aa504fa334f\"\n }\n}" + }, + { + "typeInfo": { + "fullName": "UnityEditor.Graphing.Edge" + }, + "JSONnodeData": "{\n \"m_OutputSlot\": {\n \"m_SlotId\": 0,\n \"m_NodeGUIDSerialized\": \"dd8ccfc0-fbb7-4c10-8610-5e2f0601bd55\"\n },\n \"m_InputSlot\": {\n \"m_SlotId\": 1,\n \"m_NodeGUIDSerialized\": \"93da7409-021f-49d4-af63-405d0f501766\"\n }\n}" + } + ], + "m_PreviewData": { + "serializedMesh": { + "m_SerializedMesh": "{\"mesh\":{\"fileID\":10210,\"guid\":\"0000000000000000e000000000000000\",\"type\":0}}", + "m_Guid": "" + } + }, + "m_Path": "Shader Graphs", + "m_ConcretePrecision": 0, + "m_ActiveOutputNodeGuidSerialized": "1fa2de82-dc3d-4f12-8359-7aa504fa334f" +} \ No newline at end of file diff --git a/Assets/Graphics/Models/Guns/ScopeShader.shadergraph.meta b/Assets/Graphics/Models/Guns/ScopeShader.shadergraph.meta new file mode 100644 index 0000000..063de63 --- /dev/null +++ b/Assets/Graphics/Models/Guns/ScopeShader.shadergraph.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 71d11b4c0834f344c970cb7561773350 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3} diff --git a/Assets/Graphics/Models/Guns/SniperRifle.fbx b/Assets/Graphics/Models/Guns/SniperRifle.fbx index 999a812..692198c 100644 Binary files a/Assets/Graphics/Models/Guns/SniperRifle.fbx and b/Assets/Graphics/Models/Guns/SniperRifle.fbx differ diff --git a/Assets/Graphics/Models/Guns/SniperRifle.fbx.meta b/Assets/Graphics/Models/Guns/SniperRifle.fbx.meta index 03eba8d..998673f 100644 --- a/Assets/Graphics/Models/Guns/SniperRifle.fbx.meta +++ b/Assets/Graphics/Models/Guns/SniperRifle.fbx.meta @@ -12,6 +12,11 @@ ModelImporter: assembly: UnityEngine.CoreModule name: Gear second: {fileID: 2100000, guid: ed22b038e8ff59c4a8fdc81878bf1f71, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Scope + second: {fileID: 2100000, guid: 094595bc0d373c344aae6b826ce13e41, type: 2} materials: materialImportMode: 1 materialName: 0 diff --git a/Assets/Scripts/Util/RenderTextureSetter.cs b/Assets/Scripts/Util/RenderTextureSetter.cs new file mode 100644 index 0000000..8813c7b --- /dev/null +++ b/Assets/Scripts/Util/RenderTextureSetter.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace NeonTea.Quakeball.Util { + public class RenderTextureSetter : MonoBehaviour { + public RenderTexture RenderTextureToCopy; + public Camera Camera; + public MeshRenderer Renderer; + public int MaterialIndex; + + private void Awake() { + RenderTexture RenderTexture = new RenderTexture(RenderTextureToCopy); + Camera.targetTexture = RenderTexture; + Renderer.materials[MaterialIndex].SetTexture("Texture2D_471BDC5", RenderTexture); + } + } +} diff --git a/Assets/Scripts/Util/RenderTextureSetter.cs.meta b/Assets/Scripts/Util/RenderTextureSetter.cs.meta new file mode 100644 index 0000000..e39f214 --- /dev/null +++ b/Assets/Scripts/Util/RenderTextureSetter.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 114f8f02ec9ed22488ee2bc97f60f6f3 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/RawAssets/Soldier/SniperRifle.blend b/RawAssets/Soldier/SniperRifle.blend index 944befd..ac4468f 100644 Binary files a/RawAssets/Soldier/SniperRifle.blend and b/RawAssets/Soldier/SniperRifle.blend differ