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

[GH-411] Dungeon supercampaign scene #478

Open
wants to merge 15 commits into
base: main
Choose a base branch
from
+2,385 −74
Open

[GH-411] Dungeon supercampaign scene #478

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
bc3bebf
Dungeon supercampaign prefab
ncontinanza Jun 3, 2024
e8448ff
Add redirection to dungeon supercampaign
ncontinanza Jun 3, 2024
7fb8c0f
Fix dungeon supercampaign name
ncontinanza Jun 3, 2024
f4c1abe
Remove background from template prefab
ncontinanza Jun 3, 2024
1122e4c
Dungeon campaign and level selection scenes. Change levels data assig…
ncontinanza Jun 3, 2024
05c172a
Improve variable naming
ncontinanza Jun 3, 2024
fce02dd
Fix SupercampaignsMap back button behaviour
ncontinanza Jun 3, 2024
884e8d1
Handle the units exceeded error case for a dungeon level
ncontinanza Jun 5, 2024
edeab89
Fix conflicts
ncontinanza Jun 6, 2024
82113a8
Merge branch 'main' of github.com:lambdaclass/afk_gacha_game into gh-…
ncontinanza Jun 9, 2024
9a218ac
Undo unwanted changes in Overworld scene
ncontinanza Jun 10, 2024
d363462
Fix conflicts
ncontinanza Jun 11, 2024
9ef3278
Add missing currencies to the client
ncontinanza Jun 12, 2024
e739d27
Add pearls currency
ncontinanza Jun 12, 2024
7e7021d
Fix conflicts
ncontinanza Jun 12, 2024
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
4 changes: 4 additions & 0 deletions client/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ MonoBehaviour:
m_Address: Assets/Prefabs/Supercampaigns/Main.prefab
m_ReadOnly: 0
m_SerializedLabels: []
- m_GUID: bcc177b52cf864a9a9d5cd2fcfd41c31
m_Address: Assets/Prefabs/Supercampaigns/Dungeon.prefab
m_ReadOnly: 0
m_SerializedLabels: []
m_ReadOnly: 0
m_Settings: {fileID: 11400000, guid: efd010cd563fe468e87a76524ec767ac, type: 2}
m_SchemaSet:
Expand Down
4 changes: 4 additions & 0 deletions client/Assets/Prefabs/Campaigns/Campaign1.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,10 @@ PrefabInstance:
propertyPath: m_ConstrainProportionsScale
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1708985256362400060, guid: b9905ae9753b542f18093f7a97853e0c, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: b88f80f6bbe624b45b0a8cff2d544c64, type: 3}
- target: {fileID: 1708985256362400060, guid: b9905ae9753b542f18093f7a97853e0c, type: 3}
propertyPath: m_RaycastTarget
value: 0
Expand Down
1,251 changes: 1,251 additions & 0 deletions client/Assets/Prefabs/Campaigns/DungeonCampaign.prefab
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions client/Assets/Prefabs/Campaigns/DungeonCampaign.prefab.meta
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions client/Assets/Prefabs/Campaigns/SimpleCampaign.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ GameObject:
- component: {fileID: 1708985256031450660}
- component: {fileID: 1708985256031450661}
m_Layer: 0
m_Name: LevelManager
m_Name: CampaignLevelManager
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Expand Down Expand Up @@ -112,7 +112,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: b88f80f6bbe624b45b0a8cff2d544c64, type: 3}
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 1
m_FillCenter: 1
Expand Down
239 changes: 239 additions & 0 deletions client/Assets/Prefabs/Supercampaigns/Dungeon.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,239 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &3033895082258670459
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 9047704793432490153}
m_Modifications:
- target: {fileID: 3918512608832285016, guid: b976b0f1477c04167ab8adef6b5cfa20, type: 3}
propertyPath: campaignToShowPrefab
value:
objectReference: {fileID: 3892094856036709759, guid: 3d23f3d0a625e488ab6c2d9a2aa352ee, type: 3}
- target: {fileID: 5425641655313808468, guid: b976b0f1477c04167ab8adef6b5cfa20, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6927763661763116159, guid: b976b0f1477c04167ab8adef6b5cfa20, type: 3}
propertyPath: m_text
value: 'Dungeon

Campaign'
objectReference: {fileID: 0}
- target: {fileID: 6927763661763116159, guid: b976b0f1477c04167ab8adef6b5cfa20, type: 3}
propertyPath: m_fontSize
value: 25
objectReference: {fileID: 0}
- target: {fileID: 7096975054899021653, guid: b976b0f1477c04167ab8adef6b5cfa20, type: 3}
propertyPath: m_Name
value: Campaign
objectReference: {fileID: 0}
- target: {fileID: 7096975054899021674, guid: b976b0f1477c04167ab8adef6b5cfa20, type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 7096975054899021674, guid: b976b0f1477c04167ab8adef6b5cfa20, type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 7096975054899021674, guid: b976b0f1477c04167ab8adef6b5cfa20, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7096975054899021674, guid: b976b0f1477c04167ab8adef6b5cfa20, type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 7096975054899021674, guid: b976b0f1477c04167ab8adef6b5cfa20, type: 3}
propertyPath: m_AnchorMax.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 7096975054899021674, guid: b976b0f1477c04167ab8adef6b5cfa20, type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 7096975054899021674, guid: b976b0f1477c04167ab8adef6b5cfa20, type: 3}
propertyPath: m_AnchorMin.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 7096975054899021674, guid: b976b0f1477c04167ab8adef6b5cfa20, type: 3}
propertyPath: m_SizeDelta.x
value: 130
objectReference: {fileID: 0}
- target: {fileID: 7096975054899021674, guid: b976b0f1477c04167ab8adef6b5cfa20, type: 3}
propertyPath: m_SizeDelta.y
value: 130
objectReference: {fileID: 0}
- target: {fileID: 7096975054899021674, guid: b976b0f1477c04167ab8adef6b5cfa20, type: 3}
propertyPath: m_LocalScale.x
value: 1.8
objectReference: {fileID: 0}
- target: {fileID: 7096975054899021674, guid: b976b0f1477c04167ab8adef6b5cfa20, type: 3}
propertyPath: m_LocalScale.y
value: 1.8
objectReference: {fileID: 0}
- target: {fileID: 7096975054899021674, guid: b976b0f1477c04167ab8adef6b5cfa20, type: 3}
propertyPath: m_LocalScale.z
value: 1.8
objectReference: {fileID: 0}
- target: {fileID: 7096975054899021674, guid: b976b0f1477c04167ab8adef6b5cfa20, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7096975054899021674, guid: b976b0f1477c04167ab8adef6b5cfa20, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7096975054899021674, guid: b976b0f1477c04167ab8adef6b5cfa20, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7096975054899021674, guid: b976b0f1477c04167ab8adef6b5cfa20, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7096975054899021674, guid: b976b0f1477c04167ab8adef6b5cfa20, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 7096975054899021674, guid: b976b0f1477c04167ab8adef6b5cfa20, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 7096975054899021674, guid: b976b0f1477c04167ab8adef6b5cfa20, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 7096975054899021674, guid: b976b0f1477c04167ab8adef6b5cfa20, type: 3}
propertyPath: m_AnchoredPosition.x
value: 50
objectReference: {fileID: 0}
- target: {fileID: 7096975054899021674, guid: b976b0f1477c04167ab8adef6b5cfa20, type: 3}
propertyPath: m_AnchoredPosition.y
value: -267
objectReference: {fileID: 0}
- target: {fileID: 7096975054899021674, guid: b976b0f1477c04167ab8adef6b5cfa20, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7096975054899021674, guid: b976b0f1477c04167ab8adef6b5cfa20, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7096975054899021674, guid: b976b0f1477c04167ab8adef6b5cfa20, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7096975054899021674, guid: b976b0f1477c04167ab8adef6b5cfa20, type: 3}
propertyPath: m_ConstrainProportionsScale
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b976b0f1477c04167ab8adef6b5cfa20, type: 3}
--- !u!1001 &8696133338949758226
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 432919336127990152, guid: 7d325aeded1dd47d0ba273b4ab2f509d, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 3d200f7027c76482a9606d52634f0bf7, type: 3}
- target: {fileID: 878307748023876113, guid: 7d325aeded1dd47d0ba273b4ab2f509d, type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 878307748023876113, guid: 7d325aeded1dd47d0ba273b4ab2f509d, type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 878307748023876113, guid: 7d325aeded1dd47d0ba273b4ab2f509d, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 878307748023876113, guid: 7d325aeded1dd47d0ba273b4ab2f509d, type: 3}
propertyPath: m_AnchorMax.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 878307748023876113, guid: 7d325aeded1dd47d0ba273b4ab2f509d, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 878307748023876113, guid: 7d325aeded1dd47d0ba273b4ab2f509d, type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 878307748023876113, guid: 7d325aeded1dd47d0ba273b4ab2f509d, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 878307748023876113, guid: 7d325aeded1dd47d0ba273b4ab2f509d, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 878307748023876113, guid: 7d325aeded1dd47d0ba273b4ab2f509d, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 878307748023876113, guid: 7d325aeded1dd47d0ba273b4ab2f509d, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 878307748023876113, guid: 7d325aeded1dd47d0ba273b4ab2f509d, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 878307748023876113, guid: 7d325aeded1dd47d0ba273b4ab2f509d, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 878307748023876113, guid: 7d325aeded1dd47d0ba273b4ab2f509d, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 878307748023876113, guid: 7d325aeded1dd47d0ba273b4ab2f509d, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 878307748023876113, guid: 7d325aeded1dd47d0ba273b4ab2f509d, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 878307748023876113, guid: 7d325aeded1dd47d0ba273b4ab2f509d, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 878307748023876113, guid: 7d325aeded1dd47d0ba273b4ab2f509d, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 878307748023876113, guid: 7d325aeded1dd47d0ba273b4ab2f509d, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 878307748023876113, guid: 7d325aeded1dd47d0ba273b4ab2f509d, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 878307748023876113, guid: 7d325aeded1dd47d0ba273b4ab2f509d, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 878307748023876113, guid: 7d325aeded1dd47d0ba273b4ab2f509d, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1629329673291538868, guid: 7d325aeded1dd47d0ba273b4ab2f509d, type: 3}
propertyPath: m_Name
value: Dungeon
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 7d325aeded1dd47d0ba273b4ab2f509d, type: 3}
--- !u!224 &9047704793432490153 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 369638905318518203, guid: 7d325aeded1dd47d0ba273b4ab2f509d, type: 3}
m_PrefabInstance: {fileID: 8696133338949758226}
m_PrefabAsset: {fileID: 0}
7 changes: 7 additions & 0 deletions client/Assets/Prefabs/Supercampaigns/Dungeon.prefab.meta
View file
Open in desktop

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

Loading
Loading