Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rework/loot #80

Merged
merged 5 commits into from
Feb 26, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
91 changes: 0 additions & 91 deletions Assets/Materials/Loot/Currency.mat

This file was deleted.

8 changes: 0 additions & 8 deletions Assets/Materials/Loot/Currency.mat.meta

This file was deleted.

91 changes: 0 additions & 91 deletions Assets/Materials/Loot/Loot material.mat

This file was deleted.

8 changes: 0 additions & 8 deletions Assets/Materials/Loot/Loot material.mat.meta

This file was deleted.

11 changes: 7 additions & 4 deletions Assets/Materials/Loot/Loot.mat
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Loot
m_Shader: {fileID: -6465566751694194690, guid: 97287dcf0baaca246b7ef5e7591c75ec, type: 3}
m_Shader: {fileID: -6465566751694194690, guid: 1cc698f8d3bdd9f488a2f3e6158d15dc, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
Expand Down Expand Up @@ -64,13 +64,15 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- DissolveNoiseScale: 30
- Rate: 1
- State: 0
- Vector1_1DC7BFE3: 140.76
- Vector1_3B95BBD: 0.4
- Vector1_20C92801: 0.6
- Vector1_3B95BBD: 0.5
- Vector1_92557405: 0.01
- Vector1_B9C007CA: 1
- Vector1_E4C8FF72: -0.16
- Vector1_E4C8FF72: -0
- _AlphaClip: 0
- _Blend: 0
- _BumpScale: 1
Expand All @@ -94,7 +96,8 @@ Material:
- _ZWrite: 1
m_Colors:
- Color_3D9B4E3C: {r: 0.2509804, g: 0.9098039, b: 5.992157, a: 0}
- Color_FA745793: {r: 1, g: 1, b: 1, a: 0}
- Color_Edge: {r: 0.5490196, g: 1.003922, b: 2.541177, a: 0}
- Color_FA745793: {r: 0, g: 1.4918967, b: 3.8113208, a: 0}
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
Expand Down
4 changes: 2 additions & 2 deletions Assets/Models/Loot/Loot crystal.fbx
Git LFS file not shown
4 changes: 2 additions & 2 deletions Assets/Models/Loot/Loot crystal.fbx.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 12 additions & 10 deletions Assets/Prefabs/Base/Base.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 416639624}
- component: {fileID: 416639625}
- component: {fileID: 8716177432359548056}
m_Layer: 0
m_Name: PlayerTrigger
m_TagString: Untagged
Expand All @@ -31,8 +31,8 @@ Transform:
m_Father: {fileID: 5829545455071137389}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!135 &416639625
SphereCollider:
--- !u!136 &8716177432359548056
CapsuleCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
Expand All @@ -41,8 +41,9 @@ SphereCollider:
m_Material: {fileID: 0}
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Radius: 2.56
m_Radius: 2.61
m_Height: 10
m_Direction: 1
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &432531315
GameObject:
Expand Down Expand Up @@ -71,7 +72,7 @@ Transform:
m_GameObject: {fileID: 432531315}
m_LocalRotation: {x: -0.7071062, y: -0, z: -0, w: 0.7071075}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 8.28, y: 8.28, z: 9.2}
m_LocalScale: {x: 8.2, y: 8.2, z: 8.2}
m_Children: []
m_Father: {fileID: 6926947724646838049}
m_RootOrder: 1
Expand Down Expand Up @@ -231,7 +232,7 @@ Transform:
m_GameObject: {fileID: 2438297476366917524}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 7, z: 0}
m_LocalScale: {x: 1.1111112, y: 1, z: 1.1111112}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 7990289546767576121}
- {fileID: 432531316}
Expand Down Expand Up @@ -530,15 +531,16 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 1af755870c7ae4186a96141b01af8563, type: 3}
m_Name:
m_EditorClassIdentifier:
gameOverScreen: {fileID: 6406541465688870762, guid: cf6616ecfd76d4b379c4e4fd196293af, type: 3}
gameOverScreen: {fileID: 7344749674710268611, guid: 913354e4f75f75b47a521dd6152a8fe8, type: 3}
destroyedBase: {fileID: 7907768064546073796, guid: ced5130962de4c54185e3ca432063c03, type: 3}
deathParticles: {fileID: 5015622875412468078, guid: f9753b14761704b478696f93e9bb9b68, type: 3}
spawnPoint: {fileID: 5829545455071137389}
mainCrystal: {fileID: 7990289546767576121}
gameManager: {fileID: 0}
crystals: 0
drainRay: {fileID: 2977432110045038679, guid: 1fa3e9df0696ada43b1fbfe045184210, type: 3}
explosionLightningCount: 20
explosionLightningSpawnDelay: 0.2
mainCrystal: {fileID: 7990289546767576121}
--- !u!114 &4549690278803359290
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -841,7 +843,7 @@ Transform:
m_GameObject: {fileID: 8284152995435755574}
m_LocalRotation: {x: -0.7071066, y: -0, z: -0, w: 0.70710707}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 8.2062, y: 8.2062, z: 9.117998}
m_LocalScale: {x: 8, y: 8, z: 8}
m_Children: []
m_Father: {fileID: 6926947724646838049}
m_RootOrder: 0
Expand Down
File renamed without changes.
Loading