diff --git a/Assets/MarioParadiso/BasketballRing/Built-In/Materials/BasketballRing.mat b/Assets/MarioParadiso/BasketballRing/Built-In/Materials/BasketballRing.mat index 0fd9294..68a5913 100644 --- a/Assets/MarioParadiso/BasketballRing/Built-In/Materials/BasketballRing.mat +++ b/Assets/MarioParadiso/BasketballRing/Built-In/Materials/BasketballRing.mat @@ -55,7 +55,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: f8d9d3aa83a455e49947758c3b5a78cf, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/MarioParadiso/BasketballRing/Built-In/Materials/Glass.mat b/Assets/MarioParadiso/BasketballRing/Built-In/Materials/Glass.mat index ebae27b..420cd05 100644 --- a/Assets/MarioParadiso/BasketballRing/Built-In/Materials/Glass.mat +++ b/Assets/MarioParadiso/BasketballRing/Built-In/Materials/Glass.mat @@ -25,7 +25,6 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -37,6 +36,7 @@ Material: disabledShaderPasses: - MOTIONVECTORS - DepthOnly + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -135,7 +135,7 @@ Material: - _ZWrite: 0 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 0} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/MarioParadiso/BasketballRing/Built-In/Materials/Net.mat b/Assets/MarioParadiso/BasketballRing/Built-In/Materials/Net.mat index 6dea1c7..f778725 100644 --- a/Assets/MarioParadiso/BasketballRing/Built-In/Materials/Net.mat +++ b/Assets/MarioParadiso/BasketballRing/Built-In/Materials/Net.mat @@ -68,7 +68,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: a9616e50c792cbc4aacf8604f8843fa4, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 9321c3a..680e16e 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -256,67 +256,66 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 38800814} m_CullTransparentMesh: 1 ---- !u!1001 &108060096 +--- !u!1001 &42406087 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1660361743} + m_TransformParent: {fileID: 2027009476} m_Modifications: - - target: {fileID: 2584641278423287896, guid: 580cc6b7383632745add7a1ee6560042, type: 3} + - target: {fileID: 3682496519326268224, guid: 216411d97f5a68f4a87e27e0d0ade2d7, type: 3} + propertyPath: m_Name + value: 'Net ' + objectReference: {fileID: 0} + - target: {fileID: 4058037651045720570, guid: 216411d97f5a68f4a87e27e0d0ade2d7, type: 3} propertyPath: m_LocalPosition.x - value: 0.07523441 + value: -1.88 objectReference: {fileID: 0} - - target: {fileID: 2584641278423287896, guid: 580cc6b7383632745add7a1ee6560042, type: 3} + - target: {fileID: 4058037651045720570, guid: 216411d97f5a68f4a87e27e0d0ade2d7, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 2.38 objectReference: {fileID: 0} - - target: {fileID: 2584641278423287896, guid: 580cc6b7383632745add7a1ee6560042, type: 3} + - target: {fileID: 4058037651045720570, guid: 216411d97f5a68f4a87e27e0d0ade2d7, type: 3} propertyPath: m_LocalPosition.z - value: 0.08609508 + value: -0.023 objectReference: {fileID: 0} - - target: {fileID: 2584641278423287896, guid: 580cc6b7383632745add7a1ee6560042, type: 3} + - target: {fileID: 4058037651045720570, guid: 216411d97f5a68f4a87e27e0d0ade2d7, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 2584641278423287896, guid: 580cc6b7383632745add7a1ee6560042, type: 3} + - target: {fileID: 4058037651045720570, guid: 216411d97f5a68f4a87e27e0d0ade2d7, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 2584641278423287896, guid: 580cc6b7383632745add7a1ee6560042, type: 3} + - target: {fileID: 4058037651045720570, guid: 216411d97f5a68f4a87e27e0d0ade2d7, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 2584641278423287896, guid: 580cc6b7383632745add7a1ee6560042, type: 3} + - target: {fileID: 4058037651045720570, guid: 216411d97f5a68f4a87e27e0d0ade2d7, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 2584641278423287896, guid: 580cc6b7383632745add7a1ee6560042, type: 3} + - target: {fileID: 4058037651045720570, guid: 216411d97f5a68f4a87e27e0d0ade2d7, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2584641278423287896, guid: 580cc6b7383632745add7a1ee6560042, type: 3} + - target: {fileID: 4058037651045720570, guid: 216411d97f5a68f4a87e27e0d0ade2d7, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2584641278423287896, guid: 580cc6b7383632745add7a1ee6560042, type: 3} + - target: {fileID: 4058037651045720570, guid: 216411d97f5a68f4a87e27e0d0ade2d7, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2584641278423287903, guid: 580cc6b7383632745add7a1ee6560042, type: 3} - propertyPath: m_Name - value: Hero_Ice - objectReference: {fileID: 0} - - target: {fileID: 2584641278423287903, guid: 580cc6b7383632745add7a1ee6560042, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 580cc6b7383632745add7a1ee6560042, type: 3} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3682496519326268224, guid: 216411d97f5a68f4a87e27e0d0ade2d7, type: 3} + insertIndex: -1 + addedObject: {fileID: 1075063774} + m_SourcePrefab: {fileID: 100100000, guid: 216411d97f5a68f4a87e27e0d0ade2d7, type: 3} --- !u!1 &141601765 GameObject: m_ObjectHideFlags: 0 @@ -636,13 +635,13 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1755326606} - m_TargetAssemblyTypeName: - m_MethodName: + - m_Target: {fileID: 1755326608} + m_TargetAssemblyTypeName: BallShooter, Assembly-CSharp + m_MethodName: ShootBall m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 m_StringArgument: @@ -735,11 +734,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &914802799 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2584641278423287896, guid: 580cc6b7383632745add7a1ee6560042, type: 3} - m_PrefabInstance: {fileID: 108060096} - m_PrefabAsset: {fileID: 0} --- !u!4 &942389252 stripped Transform: m_CorrespondingSourceObject: {fileID: 3426146483806157536, guid: 810eccd8d23152e4e873f7c1a46a53bc, type: 3} @@ -894,6 +888,29 @@ MonoBehaviour: mCastedBehaviour: {fileID: 968778834} mMeshFilter: {fileID: 0} mMeshRenderer: {fileID: 0} +--- !u!1 &1075063772 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3682496519326268224, guid: 216411d97f5a68f4a87e27e0d0ade2d7, type: 3} + m_PrefabInstance: {fileID: 42406087} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1075063773 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4058037651045720570, guid: 216411d97f5a68f4a87e27e0d0ade2d7, type: 3} + m_PrefabInstance: {fileID: 42406087} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1075063774 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1075063772} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0e765d1a694a2154fb4a9269fab69216, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::ScoreManager + scoreText: {fileID: 38800816} --- !u!1 &1172560393 GameObject: m_ObjectHideFlags: 0 @@ -1161,6 +1178,17 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 8135886326569738822, guid: 56fae09712773584fb63896d473a98ee, type: 3} m_PrefabInstance: {fileID: 1239197810} m_PrefabAsset: {fileID: 0} +--- !u!114 &1239197812 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8135886326569738823, guid: 56fae09712773584fb63896d473a98ee, type: 3} + m_PrefabInstance: {fileID: 1239197810} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ba0d0e7a039f526499c356a3c5cd6d3f, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1429989160 GameObject: m_ObjectHideFlags: 0 @@ -1265,6 +1293,66 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!1001 &1616289390 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1660361743} + m_Modifications: + - target: {fileID: 4708965725589232951, guid: f1ed58764d968b047b58d640e9cf1417, type: 3} + propertyPath: m_Name + value: Ring + objectReference: {fileID: 0} + - target: {fileID: 5337411849267447693, guid: f1ed58764d968b047b58d640e9cf1417, type: 3} + propertyPath: m_LocalPosition.x + value: -0.3635254 + objectReference: {fileID: 0} + - target: {fileID: 5337411849267447693, guid: f1ed58764d968b047b58d640e9cf1417, type: 3} + propertyPath: m_LocalPosition.y + value: -0.0004516709 + objectReference: {fileID: 0} + - target: {fileID: 5337411849267447693, guid: f1ed58764d968b047b58d640e9cf1417, type: 3} + propertyPath: m_LocalPosition.z + value: 0.17551857 + objectReference: {fileID: 0} + - target: {fileID: 5337411849267447693, guid: f1ed58764d968b047b58d640e9cf1417, type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5337411849267447693, guid: f1ed58764d968b047b58d640e9cf1417, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5337411849267447693, guid: f1ed58764d968b047b58d640e9cf1417, type: 3} + propertyPath: m_LocalRotation.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5337411849267447693, guid: f1ed58764d968b047b58d640e9cf1417, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5337411849267447693, guid: f1ed58764d968b047b58d640e9cf1417, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5337411849267447693, guid: f1ed58764d968b047b58d640e9cf1417, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 5337411849267447693, guid: f1ed58764d968b047b58d640e9cf1417, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 5337411849267447693, guid: f1ed58764d968b047b58d640e9cf1417, type: 3} + insertIndex: -1 + addedObject: {fileID: 1075063773} + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f1ed58764d968b047b58d640e9cf1417, type: 3} --- !u!1 &1660361740 GameObject: m_ObjectHideFlags: 0 @@ -1368,7 +1456,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 914802799} + - {fileID: 2027009476} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1660361744 @@ -1407,8 +1495,24 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 035bae4b47cc0a7409e163485252de07, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::PlayerController - joystick: {fileID: 0} + joystick: {fileID: 1239197812} moveSpeed: 2 +--- !u!114 &1755326608 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1755326606} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c6c0a82d816383b42b88cd49c8c61f42, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::BallShooter + ballPrefab: {fileID: 7093238386133182062, guid: b3933a290fbfc9c45b7e78415684fec3, type: 3} + shootPoint: {fileID: 267563063} + shootForce: 500 + upwardForce: 200 --- !u!1001 &1771565563 PrefabInstance: m_ObjectHideFlags: 0 @@ -1475,7 +1579,15 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 3426146483806157543, guid: 810eccd8d23152e4e873f7c1a46a53bc, type: 3} insertIndex: -1 addedObject: {fileID: 1755326607} + - targetCorrespondingSourceObject: {fileID: 3426146483806157543, guid: 810eccd8d23152e4e873f7c1a46a53bc, type: 3} + insertIndex: -1 + addedObject: {fileID: 1755326608} m_SourcePrefab: {fileID: 100100000, guid: 810eccd8d23152e4e873f7c1a46a53bc, type: 3} +--- !u!4 &2027009476 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5337411849267447693, guid: f1ed58764d968b047b58d640e9cf1417, type: 3} + m_PrefabInstance: {fileID: 1616289390} + m_PrefabAsset: {fileID: 0} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0