Skip to content

Shell MVC #4

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

Open
abhi6403 wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Shell MVC #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b5966a3
Implemented MVC for shell
abhi6403 Feb 13, 2025
605b350
Updated Tank MVC
abhi6403 Feb 13, 2025
8bc7c7f
Spawning the bullet
abhi6403 Feb 14, 2025
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
64 changes: 32 additions & 32 deletions Assets/Prefabs/LobbyUI.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 252, y: -139}
m_AnchoredPosition: {x: 630, y: -275}
m_SizeDelta: {x: 200, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1221577733002267392
Expand Down Expand Up @@ -93,14 +93,14 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 36
m_fontSizeBase: 36
m_fontSize: 52
m_fontSizeBase: 52
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 1
m_HorizontalAlignment: 2
m_HorizontalAlignment: 1
m_VerticalAlignment: 256
m_textAlignment: 65535
m_characterSpacing: 0
Expand Down Expand Up @@ -129,7 +129,7 @@ MonoBehaviour:
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_margin: {x: -40.421753, y: 0, z: -61.979736, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
Expand All @@ -154,7 +154,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &3870283614252560928
RectTransform:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -210,7 +210,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
m_Name:
m_EditorClassIdentifier:
m_UiScaleMode: 1
m_UiScaleMode: 0
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 800, y: 600}
Expand Down Expand Up @@ -369,8 +369,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 250, y: 0}
m_SizeDelta: {x: 150, y: 200}
m_AnchoredPosition: {x: 600, y: 8}
m_SizeDelta: {x: 380, y: 430}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3870283614683537165
CanvasRenderer:
Expand Down Expand Up @@ -432,8 +432,8 @@ MonoBehaviour:
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.5471698, g: 0.5471698, b: 0.5471698, a: 1}
m_PressedColor: {r: 0.5471698, g: 0.5471698, b: 0.5471698, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
Expand Down Expand Up @@ -530,15 +530,15 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 0.54901963}
m_Color: {r: 0.20754719, g: 0.19873622, b: 0.19873622, a: 0.6039216}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
Expand Down Expand Up @@ -582,8 +582,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 150, y: 200}
m_AnchoredPosition: {x: 0, y: 5}
m_SizeDelta: {x: 380, y: 430}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3870283615308096693
CanvasRenderer:
Expand Down Expand Up @@ -645,8 +645,8 @@ MonoBehaviour:
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.5471698, g: 0.5471698, b: 0.5471698, a: 1}
m_PressedColor: {r: 0.5471698, g: 0.5471698, b: 0.5471698, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
Expand Down Expand Up @@ -714,8 +714,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -250, y: 0}
m_SizeDelta: {x: 150, y: 200}
m_AnchoredPosition: {x: -600, y: 5}
m_SizeDelta: {x: 380, y: 430}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3870283615956841255
CanvasRenderer:
Expand Down Expand Up @@ -777,8 +777,8 @@ MonoBehaviour:
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.5471698, g: 0.5471698, b: 0.5471698, a: 1}
m_PressedColor: {r: 0.5471698, g: 0.5471698, b: 0.5471698, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
Expand Down Expand Up @@ -845,7 +845,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -1, y: -139}
m_AnchoredPosition: {x: -30, y: -275}
m_SizeDelta: {x: 200, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1130081879593505292
Expand Down Expand Up @@ -904,14 +904,14 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 36
m_fontSizeBase: 36
m_fontSize: 52
m_fontSizeBase: 52
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 1
m_HorizontalAlignment: 2
m_HorizontalAlignment: 1
m_VerticalAlignment: 256
m_textAlignment: 65535
m_characterSpacing: 0
Expand Down Expand Up @@ -940,7 +940,7 @@ MonoBehaviour:
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_margin: {x: 0, y: 0, z: -64.67468, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
Expand Down Expand Up @@ -980,7 +980,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -250, y: -139}
m_AnchoredPosition: {x: -618, y: -275}
m_SizeDelta: {x: 200, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2841010330150748415
Expand Down Expand Up @@ -1039,14 +1039,14 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 36
m_fontSizeBase: 36
m_fontSize: 52
m_fontSizeBase: 52
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 1
m_HorizontalAlignment: 2
m_HorizontalAlignment: 1
m_VerticalAlignment: 256
m_textAlignment: 65535
m_characterSpacing: 0
Expand Down Expand Up @@ -1075,7 +1075,7 @@ MonoBehaviour:
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_margin: {x: 0, y: 0, z: -56.59021, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
Expand Down
10 changes: 4 additions & 6 deletions Assets/Prefabs/Shell.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ PrefabInstance:
- targetCorrespondingSourceObject: {fileID: 100000, guid: 9ed1e8a25f964bd4298944675e425a0d,
type: 3}
insertIndex: -1
addedObject: {fileID: 2080484652483106648}
addedObject: {fileID: 9094102746410450669}
m_SourcePrefab: {fileID: 100100000, guid: 9ed1e8a25f964bd4298944675e425a0d, type: 3}
--- !u!1 &6691933039618786073 stripped
GameObject:
Expand Down Expand Up @@ -123,7 +123,7 @@ BoxCollider:
serializedVersion: 3
m_Size: {x: 0.2987081, y: 0.26465786, z: 0.5166997}
m_Center: {x: 0, y: 0.008731306, z: 0.19371921}
--- !u!114 &2080484652483106648
--- !u!114 &9094102746410450669
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
Expand All @@ -132,10 +132,8 @@ MonoBehaviour:
m_GameObject: {fileID: 6691933039618786073}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: efe29f4b8836cd74684e96d6b8a21cdf, type: 3}
m_Script: {fileID: 11500000, guid: 19a26dfc617b47c43b975bac52edba00, type: 3}
m_Name:
m_EditorClassIdentifier:
explosion: {fileID: 876944751265867935, guid: a325166043ffcc448a7670e9fecd8815,
type: 3}
fireParticle: {fileID: 7731502986580185585, guid: ee6933974236ce54286eae798bb3287e,
shellExplosion: {fileID: 876944751265867935, guid: a325166043ffcc448a7670e9fecd8815,
type: 3}
40 changes: 26 additions & 14 deletions Assets/Prefabs/Tank.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -2.25}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &4357085371443335405
Expand All @@ -91,18 +91,18 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4357085371443335405}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -1}
m_LocalRotation: {x: -0.042976465, y: -0, z: -0, w: 0.9990761}
m_LocalPosition: {x: 0, y: 0, z: -0.96}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 3217123901393735791}
m_Father: {fileID: 1439225616756593854}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: -4.926, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0.087249964, y: 2.65}
m_SizeDelta: {x: -1.8255, y: 1.6907}
m_AnchoredPosition: {x: -0.000000059604645, y: 1.31}
m_SizeDelta: {x: 0, y: -1.4512}
m_Pivot: {x: 0.5, y: 0.45166743}
--- !u!114 &1289341129724263172
MonoBehaviour:
Expand Down Expand Up @@ -189,7 +189,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5902429766816407952
Expand Down Expand Up @@ -257,17 +257,17 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7892152523456331593}
m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalPosition: {x: 0, y: 0, z: 2.7489}
m_LocalScale: {x: 1.3333334, y: 1.3333334, z: 1.3333334}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 2630859995377569576}
m_Father: {fileID: 4959132435603548437}
m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0.1}
m_SizeDelta: {x: 3.5, y: 3.5}
m_AnchoredPosition: {x: -0.0031, y: 0.1}
m_SizeDelta: {x: 1.3918, y: 6.1901}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!223 &8053286205472130276
Canvas:
Expand Down Expand Up @@ -304,7 +304,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
m_Name:
m_EditorClassIdentifier:
m_UiScaleMode: 0
m_UiScaleMode: 2
m_ReferencePixelsPerUnit: 1
m_ScaleFactor: 1
m_ReferenceResolution: {x: 800, y: 600}
Expand Down Expand Up @@ -430,9 +430,9 @@ MonoBehaviour:
rb: {fileID: -6539351600588824667}
childs:
- {fileID: 4959132435605449605}
- {fileID: 4959132435605449603}
- {fileID: 4959132435605449613}
- {fileID: 4959132435605449607}
ShellController: {fileID: 2080484652483106648, guid: 28fefa089149ea847ae843638066c83a,
type: 3}
fireTransform: {fileID: 6544317465860475146}
aimSlider: {fileID: 1289341129724263172}
shell: {fileID: 8142298251708592852, guid: 28fefa089149ea847ae843638066c83a, type: 3}
Expand Down Expand Up @@ -490,6 +490,12 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 4959132435603420133}
m_PrefabAsset: {fileID: 0}
--- !u!23 &4959132435605449603 stripped
MeshRenderer:
m_CorrespondingSourceObject: {fileID: 2300006, guid: 002e2a607f5b64c48be0b3b0d8b8bfdd,
type: 3}
m_PrefabInstance: {fileID: 4959132435603420133}
m_PrefabAsset: {fileID: 0}
--- !u!23 &4959132435605449605 stripped
MeshRenderer:
m_CorrespondingSourceObject: {fileID: 2300000, guid: 002e2a607f5b64c48be0b3b0d8b8bfdd,
Expand All @@ -502,3 +508,9 @@ MeshRenderer:
type: 3}
m_PrefabInstance: {fileID: 4959132435603420133}
m_PrefabAsset: {fileID: 0}
--- !u!23 &4959132435605449613 stripped
MeshRenderer:
m_CorrespondingSourceObject: {fileID: 2300008, guid: 002e2a607f5b64c48be0b3b0d8b8bfdd,
type: 3}
m_PrefabInstance: {fileID: 4959132435603420133}
m_PrefabAsset: {fileID: 0}
Loading