Skip to content

Commit

Permalink
Merge pull request #76 from 2024FALL-SWPP/feature/battery-pack
Browse files Browse the repository at this point in the history
[#65] Implemented Battery Pack
  • Loading branch information
gyusang authored Nov 27, 2024
2 parents 85dd32c + 83b38cb commit b9a208a
Show file tree
Hide file tree
Showing 28 changed files with 841 additions and 21 deletions.
17 changes: 17 additions & 0 deletions Assets/ItemMapping.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
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: ca28bbe822a600d49b0c70aff37a7c3f, type: 3}
m_Name: ItemMapping
m_EditorClassIdentifier:
ItemMappings:
- markerTile: {fileID: 11400000, guid: a512ba98e4e177943af7edd569bc2f22, type: 2}
itemPrefab: {fileID: 8442164045550583437, guid: 4c4165bef2249844c9989d7511ef7d2e, type: 3}
8 changes: 8 additions & 0 deletions Assets/ItemMapping.asset.meta

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

Binary file added Assets/Models/Battery.fbx
Binary file not shown.
107 changes: 107 additions & 0 deletions Assets/Models/Battery.fbx.meta

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

121 changes: 121 additions & 0 deletions Assets/Prefabs/Battery.prefab
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &8442164045550583437
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6323857230887193251}
- component: {fileID: 4117922816007559392}
m_Layer: 0
m_Name: Battery
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6323857230887193251
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8442164045550583437}
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: 4149585698551529594}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &4117922816007559392
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8442164045550583437}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d57e44f9eca455340a85cd8333bf438c, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &4475719622033270673
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 6323857230887193251}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: 2dcfdf373ae33484a99a163c2e557d30, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 2dcfdf373ae33484a99a163c2e557d30, type: 3}
propertyPath: m_LocalScale.x
value: 30
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 2dcfdf373ae33484a99a163c2e557d30, type: 3}
propertyPath: m_LocalScale.y
value: 30
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 2dcfdf373ae33484a99a163c2e557d30, type: 3}
propertyPath: m_LocalScale.z
value: 30
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 2dcfdf373ae33484a99a163c2e557d30, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 2dcfdf373ae33484a99a163c2e557d30, type: 3}
propertyPath: m_LocalPosition.y
value: 0.3
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 2dcfdf373ae33484a99a163c2e557d30, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 2dcfdf373ae33484a99a163c2e557d30, type: 3}
propertyPath: m_LocalRotation.w
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 2dcfdf373ae33484a99a163c2e557d30, type: 3}
propertyPath: m_LocalRotation.x
value: -0.7071068
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 2dcfdf373ae33484a99a163c2e557d30, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 2dcfdf373ae33484a99a163c2e557d30, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 2dcfdf373ae33484a99a163c2e557d30, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -90
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 2dcfdf373ae33484a99a163c2e557d30, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 2dcfdf373ae33484a99a163c2e557d30, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 2dcfdf373ae33484a99a163c2e557d30, type: 3}
propertyPath: m_Name
value: Battery
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2dcfdf373ae33484a99a163c2e557d30, type: 3}
--- !u!4 &4149585698551529594 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 2dcfdf373ae33484a99a163c2e557d30, type: 3}
m_PrefabInstance: {fileID: 4475719622033270673}
m_PrefabAsset: {fileID: 0}
7 changes: 7 additions & 0 deletions Assets/Prefabs/Battery.prefab.meta

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

Loading

0 comments on commit b9a208a

Please sign in to comment.