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.

Sign up for GitHub

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

Redesign lasers #89

Merged
merged 1 commit into from
Dec 21, 2024
Merged

Redesign lasers #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 21 additions & 2 deletions Assets/Unity/Prefabs/Training Game/Moving Static Laser.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,7 @@ GameObject:
- component: {fileID: 5633569635942151663}
- component: {fileID: 5633569635942151649}
- component: {fileID: 3086422471175238755}
- component: {fileID: 8486463336291640574}
m_Layer: 15
m_Name: Beam
m_TagString: Untagged
Expand Down Expand Up @@ -301,7 +302,7 @@ SpriteRenderer:
m_SortingLayer: 2
m_SortingOrder: 1
m_Sprite: {fileID: 21300000, guid: dde82fa72012f48cdbac8b8d80101279, type: 3}
m_Color: {r: 0.54901963, g: 0, b: 0, a: 1}
m_Color: {r: 1, g: 0, b: 0, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
Expand Down Expand Up @@ -347,7 +348,7 @@ BoxCollider2D:
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
oldSize: {x: 0.4, y: 7}
oldSize: {x: 1.2666667, y: 7}
newSize: {x: 0.4, y: 6.0666666}
adaptiveTilingThreshold: 0.5
drawMode: 0
Expand Down Expand Up @@ -410,6 +411,24 @@ MonoBehaviour:
LaserHumTransform: {fileID: 2727955123760763624}
MinY: -3.5
MaxY: 3.5
--- !u!114 &8486463336291640574
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5633569635942151661}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 68a817e8c6bf94c38be7b0ea3a19cc6a, type: 3}
m_Name:
m_EditorClassIdentifier:
Transform: {fileID: 5633569635942151662}
BaseScale: 1
OscillationSpeed: 60
OscillationScale: 0.1
XAxis: 1
YAxis: 0
--- !u!1 &5633569635997688980
GameObject:
m_ObjectHideFlags: 0
Expand Down
67 changes: 53 additions & 14 deletions Assets/Unity/Prefabs/Training Game/Static Laser.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ GameObject:
- component: {fileID: 3067488481799572040}
- component: {fileID: 3067488481799572041}
- component: {fileID: 1202314657713874280}
- component: {fileID: 2647012434572189458}
m_Layer: 15
m_Name: Beam
m_TagString: Untagged
Expand All @@ -27,6 +28,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3067488481799572045}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
Expand All @@ -35,7 +37,6 @@ Transform:
- {fileID: 6005183075563472532}
- {fileID: 3901073867738938440}
m_Father: {fileID: 3067488481852135619}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &3067488481799572043
SpriteRenderer:
Expand Down Expand Up @@ -79,7 +80,7 @@ SpriteRenderer:
m_SortingLayer: 2
m_SortingOrder: 1
m_Sprite: {fileID: 21300000, guid: dde82fa72012f48cdbac8b8d80101279, type: 3}
m_Color: {r: 0, g: 0.30588236, b: 0.78039217, a: 1}
m_Color: {r: 0, g: 0.39215687, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
Expand All @@ -99,14 +100,33 @@ BoxCollider2D:
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_ForceSendLayers:
serializedVersion: 2
m_Bits: 4294967295
m_ForceReceiveLayers:
serializedVersion: 2
m_Bits: 4294967295
m_ContactCaptureLayers:
serializedVersion: 2
m_Bits: 4294967295
m_CallbackLayers:
serializedVersion: 2
m_Bits: 4294967295
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
oldSize: {x: 0.4, y: 7}
oldSize: {x: 1.2666667, y: 7}
newSize: {x: 0.4, y: 6.0666666}
adaptiveTilingThreshold: 0.5
drawMode: 0
Expand Down Expand Up @@ -167,9 +187,26 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
LaserHumTransform: {fileID: 6005183075563472532}
AudioLowPassFilter: {fileID: 4413527252640353038}
MinY: -3.5
MaxY: 3.5
--- !u!114 &2647012434572189458
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3067488481799572045}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 68a817e8c6bf94c38be7b0ea3a19cc6a, type: 3}
m_Name:
m_EditorClassIdentifier:
Transform: {fileID: 3067488481799572042}
BaseScale: 1
OscillationSpeed: 60
OscillationScale: 0.1
XAxis: 1
YAxis: 0
--- !u!1 &3067488481852135618
GameObject:
m_ObjectHideFlags: 0
Expand All @@ -194,14 +231,14 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3067488481852135618}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 3067488481799572042}
m_Father: {fileID: 3067488482230891370}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &3067488481852135616
SpriteRenderer:
Expand Down Expand Up @@ -278,6 +315,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3067488482230891372}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 5.4333, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
Expand All @@ -287,7 +325,6 @@ Transform:
- {fileID: 3067488481852135619}
- {fileID: 3067488482870971722}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &3067488482870971725
GameObject:
Expand All @@ -313,13 +350,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3067488482870971725}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 1.1833, y: 0, z: 2.5009727}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3067488482230891370}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &3067488482870971723
SpriteRenderer:
Expand Down Expand Up @@ -397,13 +434,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3067488483275559858}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -1.216666, y: 0, z: 2.5009727}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3067488482230891370}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &3067488483275559856
SpriteRenderer:
Expand Down Expand Up @@ -462,6 +499,7 @@ PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 3067488481799572042}
m_Modifications:
- target: {fileID: 1186061867552009996, guid: 583bbe636a139433d854b0ad783de470,
Expand Down Expand Up @@ -525,6 +563,9 @@ PrefabInstance:
value: Laser Damage
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 583bbe636a139433d854b0ad783de470, type: 3}
--- !u!114 &3374771667547269398 stripped
MonoBehaviour:
Expand All @@ -549,6 +590,7 @@ PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 3067488481799572042}
m_Modifications:
- target: {fileID: 1504687451264260564, guid: da5610c3757554b9ba970e31cb5a5187,
Expand Down Expand Up @@ -612,13 +654,10 @@ PrefabInstance:
value: Laser Hum
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: da5610c3757554b9ba970e31cb5a5187, type: 3}
--- !u!169 &4413527252640353038 stripped
AudioLowPassFilter:
m_CorrespondingSourceObject: {fileID: 8829576262920721486, guid: da5610c3757554b9ba970e31cb5a5187,
type: 3}
m_PrefabInstance: {fileID: 5167611688005803840}
m_PrefabAsset: {fileID: 0}
--- !u!4 &6005183075563472532 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1504687451264260564, guid: da5610c3757554b9ba970e31cb5a5187,
Expand Down
Binary file added Assets/images/Laser Beam.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 9 additions & 4 deletions Assets/images/Static Laser Beam.png.meta → Assets/images/Laser Beam.png.meta
View file
Open in desktop

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

Binary file added Assets/images/Laser Emitter Pair.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 9 additions & 4 deletions Assets/images/Static Laser.png.meta → Assets/images/Laser Emitter Pair.png.meta
View file
Open in desktop

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

Binary file removed Assets/images/Static Laser Beam.png
View file
Open in desktop
Binary file not shown.
Binary file removed Assets/images/Static Laser.png
View file
Open in desktop
Binary file not shown.
Loading
Loading