diff --git a/client/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset b/client/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset index 7a16b1eb..e601803d 100644 --- a/client/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset +++ b/client/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset @@ -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: diff --git a/client/Assets/Prefabs/Campaigns/Campaign1.prefab b/client/Assets/Prefabs/Campaigns/Campaign1.prefab index c373a718..7969deaa 100644 --- a/client/Assets/Prefabs/Campaigns/Campaign1.prefab +++ b/client/Assets/Prefabs/Campaigns/Campaign1.prefab @@ -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 diff --git a/client/Assets/Prefabs/Campaigns/DungeonCampaign.prefab b/client/Assets/Prefabs/Campaigns/DungeonCampaign.prefab new file mode 100644 index 00000000..bb374bc9 --- /dev/null +++ b/client/Assets/Prefabs/Campaigns/DungeonCampaign.prefab @@ -0,0 +1,1251 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &1769640232615250460 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 4280617237659593690} + m_Modifications: + - target: {fileID: 3525489903353544345, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_Name + value: Level_7 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_SizeDelta.y + value: 140 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_AnchoredPosition.x + value: -65 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_AnchoredPosition.y + value: -141 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3653781648818980275, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_text + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 8486713405277786233, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: campaignLevelManager + value: + objectReference: {fileID: 4280617237659593691} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} +--- !u!114 &7875065713120336485 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8486713405277786233, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + m_PrefabInstance: {fileID: 1769640232615250460} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d6b7db17f0772488390f161908a79557, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &2821316713594835321 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 4280617237659593690} + m_Modifications: + - target: {fileID: 3525489903353544345, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_Name + value: Level_5 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_SizeDelta.y + value: 140 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_AnchoredPosition.x + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_AnchoredPosition.y + value: 165 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3653781648818980275, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_text + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8486713405277786233, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: campaignLevelManager + value: + objectReference: {fileID: 4280617237659593691} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} +--- !u!114 &5972204641802354944 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8486713405277786233, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + m_PrefabInstance: {fileID: 2821316713594835321} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d6b7db17f0772488390f161908a79557, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &2894089516285783313 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 4280617237659593690} + m_Modifications: + - target: {fileID: 3525489903353544345, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_Name + value: Level_1 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_SizeDelta.y + value: 140 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_AnchoredPosition.x + value: -500 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_AnchoredPosition.y + value: 597 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3653781648818980275, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_text + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8486713405277786233, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: campaignLevelManager + value: + objectReference: {fileID: 4280617237659593691} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} +--- !u!114 &6768633113452330344 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8486713405277786233, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + m_PrefabInstance: {fileID: 2894089516285783313} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d6b7db17f0772488390f161908a79557, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &3229159803561401854 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1708985256031450661, guid: b9905ae9753b542f18093f7a97853e0c, type: 3} + propertyPath: levelIndicators.Array.size + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1708985256031450661, guid: b9905ae9753b542f18093f7a97853e0c, type: 3} + propertyPath: levelIndicators.Array.data[0] + value: + objectReference: {fileID: 6768633113452330344} + - target: {fileID: 1708985256031450661, guid: b9905ae9753b542f18093f7a97853e0c, type: 3} + propertyPath: levelIndicators.Array.data[1] + value: + objectReference: {fileID: 4696108883787384410} + - target: {fileID: 1708985256031450661, guid: b9905ae9753b542f18093f7a97853e0c, type: 3} + propertyPath: levelIndicators.Array.data[2] + value: + objectReference: {fileID: 2647619469809791421} + - target: {fileID: 1708985256031450661, guid: b9905ae9753b542f18093f7a97853e0c, type: 3} + propertyPath: levelIndicators.Array.data[3] + value: + objectReference: {fileID: 3550735899533893395} + - target: {fileID: 1708985256031450661, guid: b9905ae9753b542f18093f7a97853e0c, type: 3} + propertyPath: levelIndicators.Array.data[4] + value: + objectReference: {fileID: 5972204641802354944} + - target: {fileID: 1708985256031450661, guid: b9905ae9753b542f18093f7a97853e0c, type: 3} + propertyPath: levelIndicators.Array.data[5] + value: + objectReference: {fileID: 3999080955652591893} + - target: {fileID: 1708985256031450661, guid: b9905ae9753b542f18093f7a97853e0c, type: 3} + propertyPath: levelIndicators.Array.data[6] + value: + objectReference: {fileID: 7875065713120336485} + - target: {fileID: 1708985256031450661, guid: b9905ae9753b542f18093f7a97853e0c, type: 3} + propertyPath: levelIndicators.Array.data[7] + value: + objectReference: {fileID: 4568529050698574671} + - target: {fileID: 1708985256031450661, guid: b9905ae9753b542f18093f7a97853e0c, type: 3} + propertyPath: levelIndicators.Array.data[8] + value: + objectReference: {fileID: 5380456747581138664} + - target: {fileID: 1708985256031450661, guid: b9905ae9753b542f18093f7a97853e0c, type: 3} + propertyPath: levelIndicators.Array.data[9] + value: + objectReference: {fileID: 4568529050698574671} + - target: {fileID: 1708985256031450714, guid: b9905ae9753b542f18093f7a97853e0c, type: 3} + propertyPath: m_Name + value: CampaignLevelManager + objectReference: {fileID: 0} + - target: {fileID: 1708985256362400060, guid: b9905ae9753b542f18093f7a97853e0c, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: d1fce90a32e2e434db78cf9485ecec1f, type: 3} + - target: {fileID: 1932950366438959233, guid: b9905ae9753b542f18093f7a97853e0c, type: 3} + propertyPath: m_Name + value: DungeonCampaign + objectReference: {fileID: 0} + - target: {fileID: 3615009627882092730, guid: b9905ae9753b542f18093f7a97853e0c, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3615009627882092730, guid: b9905ae9753b542f18093f7a97853e0c, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3615009627882092730, guid: b9905ae9753b542f18093f7a97853e0c, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3615009627882092730, guid: b9905ae9753b542f18093f7a97853e0c, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3615009627882092730, guid: b9905ae9753b542f18093f7a97853e0c, type: 3} + propertyPath: m_AnchorMax.y + value: 0.9 + objectReference: {fileID: 0} + - target: {fileID: 3615009627882092730, guid: b9905ae9753b542f18093f7a97853e0c, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3615009627882092730, guid: b9905ae9753b542f18093f7a97853e0c, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3615009627882092730, guid: b9905ae9753b542f18093f7a97853e0c, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3615009627882092730, guid: b9905ae9753b542f18093f7a97853e0c, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3615009627882092730, guid: b9905ae9753b542f18093f7a97853e0c, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3615009627882092730, guid: b9905ae9753b542f18093f7a97853e0c, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3615009627882092730, guid: b9905ae9753b542f18093f7a97853e0c, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3615009627882092730, guid: b9905ae9753b542f18093f7a97853e0c, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3615009627882092730, guid: b9905ae9753b542f18093f7a97853e0c, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3615009627882092730, guid: b9905ae9753b542f18093f7a97853e0c, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3615009627882092730, guid: b9905ae9753b542f18093f7a97853e0c, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3615009627882092730, guid: b9905ae9753b542f18093f7a97853e0c, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3615009627882092730, guid: b9905ae9753b542f18093f7a97853e0c, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3615009627882092730, guid: b9905ae9753b542f18093f7a97853e0c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3615009627882092730, guid: b9905ae9753b542f18093f7a97853e0c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3615009627882092730, guid: b9905ae9753b542f18093f7a97853e0c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8764588092832897319, guid: b9905ae9753b542f18093f7a97853e0c, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8764588092832897319, guid: b9905ae9753b542f18093f7a97853e0c, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8764588092832897319, guid: b9905ae9753b542f18093f7a97853e0c, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8764588092832897319, guid: b9905ae9753b542f18093f7a97853e0c, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8764588092832897319, guid: b9905ae9753b542f18093f7a97853e0c, type: 3} + propertyPath: m_SizeDelta.x + value: 350 + objectReference: {fileID: 0} + - target: {fileID: 8764588092832897319, guid: b9905ae9753b542f18093f7a97853e0c, type: 3} + propertyPath: m_SizeDelta.y + value: 115 + objectReference: {fileID: 0} + - target: {fileID: 8764588092832897319, guid: b9905ae9753b542f18093f7a97853e0c, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8764588092832897319, guid: b9905ae9753b542f18093f7a97853e0c, type: 3} + propertyPath: m_AnchoredPosition.y + value: -737 + objectReference: {fileID: 0} + - target: {fileID: 8764588092832897324, guid: b9905ae9753b542f18093f7a97853e0c, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b9905ae9753b542f18093f7a97853e0c, type: 3} +--- !u!4 &4280617237659593690 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1708985256031450660, guid: b9905ae9753b542f18093f7a97853e0c, type: 3} + m_PrefabInstance: {fileID: 3229159803561401854} + m_PrefabAsset: {fileID: 0} +--- !u!114 &4280617237659593691 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1708985256031450661, guid: b9905ae9753b542f18093f7a97853e0c, type: 3} + m_PrefabInstance: {fileID: 3229159803561401854} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2f02632d55d1c47748b18909cdc2b2c4, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &3813760288601462307 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 4280617237659593690} + m_Modifications: + - target: {fileID: 3525489903353544345, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_Name + value: Level_2 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_SizeDelta.y + value: 140 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_AnchoredPosition.x + value: -353 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_AnchoredPosition.y + value: 489 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3653781648818980275, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_text + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3653781648818980275, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_fontSize + value: 38 + objectReference: {fileID: 0} + - target: {fileID: 8486713405277786233, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: campaignLevelManager + value: + objectReference: {fileID: 4280617237659593691} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} +--- !u!114 &4696108883787384410 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8486713405277786233, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + m_PrefabInstance: {fileID: 3813760288601462307} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d6b7db17f0772488390f161908a79557, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &4570559915982960273 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 4280617237659593690} + m_Modifications: + - target: {fileID: 3525489903353544345, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_Name + value: Level_9 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_SizeDelta.y + value: 140 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_AnchoredPosition.x + value: -201 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_AnchoredPosition.y + value: -482 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3653781648818980275, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_text + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 8486713405277786233, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: campaignLevelManager + value: + objectReference: {fileID: 4280617237659593691} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} +--- !u!114 &5380456747581138664 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8486713405277786233, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + m_PrefabInstance: {fileID: 4570559915982960273} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d6b7db17f0772488390f161908a79557, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &4807955510941909356 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 4280617237659593690} + m_Modifications: + - target: {fileID: 3525489903353544345, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_Name + value: Level_6 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_SizeDelta.y + value: 140 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_AnchoredPosition.x + value: 87 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_AnchoredPosition.y + value: -37 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3653781648818980275, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_text + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 8486713405277786233, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: campaignLevelManager + value: + objectReference: {fileID: 4280617237659593691} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} +--- !u!114 &3999080955652591893 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8486713405277786233, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + m_PrefabInstance: {fileID: 4807955510941909356} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d6b7db17f0772488390f161908a79557, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &4936054714452217706 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 4280617237659593690} + m_Modifications: + - target: {fileID: 3525489903353544345, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_Name + value: Level_4 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_SizeDelta.y + value: 140 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_AnchoredPosition.x + value: -61 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_AnchoredPosition.y + value: 273 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3653781648818980275, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_text + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 8486713405277786233, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: campaignLevelManager + value: + objectReference: {fileID: 4280617237659593691} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} +--- !u!114 &3550735899533893395 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8486713405277786233, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + m_PrefabInstance: {fileID: 4936054714452217706} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d6b7db17f0772488390f161908a79557, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &5377421202468911926 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 4280617237659593690} + m_Modifications: + - target: {fileID: 3525489903353544345, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_Name + value: Level_8 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_RootOrder + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_SizeDelta.y + value: 140 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_AnchoredPosition.x + value: -204 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_AnchoredPosition.y + value: -269 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3653781648818980275, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_text + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 8486713405277786233, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: campaignLevelManager + value: + objectReference: {fileID: 4280617237659593691} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} +--- !u!114 &4568529050698574671 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8486713405277786233, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + m_PrefabInstance: {fileID: 5377421202468911926} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d6b7db17f0772488390f161908a79557, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &5870696109622124996 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 4280617237659593690} + m_Modifications: + - target: {fileID: 3525489903353544345, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_Name + value: Level_3 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_SizeDelta.y + value: 140 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_AnchoredPosition.x + value: -209 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_AnchoredPosition.y + value: 392 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3525489903353544358, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3653781648818980275, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: m_text + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8486713405277786233, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + propertyPath: campaignLevelManager + value: + objectReference: {fileID: 4280617237659593691} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} +--- !u!114 &2647619469809791421 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8486713405277786233, guid: df6e452c4c1ce499a9f27dd07077905a, type: 3} + m_PrefabInstance: {fileID: 5870696109622124996} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d6b7db17f0772488390f161908a79557, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/client/Assets/Prefabs/Campaigns/DungeonCampaign.prefab.meta b/client/Assets/Prefabs/Campaigns/DungeonCampaign.prefab.meta new file mode 100644 index 00000000..2cc93a15 --- /dev/null +++ b/client/Assets/Prefabs/Campaigns/DungeonCampaign.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3d23f3d0a625e488ab6c2d9a2aa352ee +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/client/Assets/Prefabs/Campaigns/SimpleCampaign.prefab b/client/Assets/Prefabs/Campaigns/SimpleCampaign.prefab index f9d59b9d..4334b247 100644 --- a/client/Assets/Prefabs/Campaigns/SimpleCampaign.prefab +++ b/client/Assets/Prefabs/Campaigns/SimpleCampaign.prefab @@ -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 @@ -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 diff --git a/client/Assets/Prefabs/Supercampaigns/Dungeon.prefab b/client/Assets/Prefabs/Supercampaigns/Dungeon.prefab new file mode 100644 index 00000000..07a2ddc5 --- /dev/null +++ b/client/Assets/Prefabs/Supercampaigns/Dungeon.prefab @@ -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} diff --git a/client/Assets/Prefabs/Supercampaigns/Dungeon.prefab.meta b/client/Assets/Prefabs/Supercampaigns/Dungeon.prefab.meta new file mode 100644 index 00000000..2e0642e6 --- /dev/null +++ b/client/Assets/Prefabs/Supercampaigns/Dungeon.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: bcc177b52cf864a9a9d5cd2fcfd41c31 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/client/Assets/Scenes/Battle.unity b/client/Assets/Scenes/Battle.unity index bc1fc250..83e77468 100644 --- a/client/Assets/Scenes/Battle.unity +++ b/client/Assets/Scenes/Battle.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.3708708, g: 0.37838137, b: 0.35725543, a: 1} + m_IndirectSpecularColor: {r: 0.37311947, g: 0.38074014, b: 0.3587274, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -555,6 +555,82 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 77190551} m_CullTransparentMesh: 1 +--- !u!1 &88520427 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 88520428} + - component: {fileID: 88520430} + - component: {fileID: 88520429} + m_Layer: 0 + m_Name: ImageSlot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &88520428 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 88520427} + 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: [] + m_Father: {fileID: 1797760235} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 90, y: 0} + m_SizeDelta: {x: 140, y: 140} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &88520429 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 88520427} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + 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: 21300000, guid: 9e248addd09ec4dbd9b75abe02c0d608, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &88520430 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 88520427} + m_CullTransparentMesh: 1 --- !u!1 &97969246 GameObject: m_ObjectHideFlags: 0 @@ -1520,6 +1596,82 @@ LineRenderer: m_CorrespondingSourceObject: {fileID: 3340029395093796299, guid: ecaf737f0b07146d69c6c5e29ea6bbfc, type: 3} m_PrefabInstance: {fileID: 263330290} m_PrefabAsset: {fileID: 0} +--- !u!1 &394788742 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 394788743} + - component: {fileID: 394788745} + - component: {fileID: 394788744} + m_Layer: 0 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &394788743 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 394788742} + 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: [] + m_Father: {fileID: 1797760235} + m_RootOrder: 0 + 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: 0} + m_SizeDelta: {x: -4, y: -4} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &394788744 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 394788742} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.28235295, g: 0.12941177, b: 0.10980392, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &394788745 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 394788742} + m_CullTransparentMesh: 1 --- !u!1001 &437390390 PrefabInstance: m_ObjectHideFlags: 0 @@ -4652,6 +4804,7 @@ MonoBehaviour: - {fileID: 11400000, guid: ff1deca6a5c88444f999ac0b9e479e4a, type: 2} - {fileID: 11400000, guid: c341c323258d5462083a1e99524f19bf, type: 2} - {fileID: 11400000, guid: 4e3f04b14eefd4c509e96a36eb4d3034, type: 2} + maxUnitsExceededPopup: {fileID: 2125487499} --- !u!4 &1419209956 Transform: m_ObjectHideFlags: 0 @@ -5035,6 +5188,85 @@ LineRenderer: m_CorrespondingSourceObject: {fileID: 3340029395093796299, guid: ecaf737f0b07146d69c6c5e29ea6bbfc, type: 3} m_PrefabInstance: {fileID: 1716823737} m_PrefabAsset: {fileID: 0} +--- !u!1 &1797760234 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1797760235} + - component: {fileID: 1797760237} + - component: {fileID: 1797760236} + m_Layer: 0 + m_Name: ItemDetail + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1797760235 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1797760234} + 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: 394788743} + - {fileID: 88520428} + - {fileID: 2133729444} + m_Father: {fileID: 2125487498} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.65} + m_AnchorMax: {x: 0.5, y: 0.65} + m_AnchoredPosition: {x: 0.000030517576, y: 3.480011} + m_SizeDelta: {x: 600, y: 180} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1797760236 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1797760234} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + 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: 21300000, guid: f1542cf5e4ce3424da87a5f60f7c4fca, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1797760237 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1797760234} + m_CullTransparentMesh: 1 --- !u!1001 &1807628185 PrefabInstance: m_ObjectHideFlags: 0 @@ -6022,6 +6254,388 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &2125487497 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 442142762} + m_Modifications: + - target: {fileID: 133597137547516579, guid: 376fe761576f5457bb52f16e42ab2860, type: 3} + propertyPath: m_Name + value: MaxUnitsExceededPopup + objectReference: {fileID: 0} + - target: {fileID: 133597137547516579, guid: 376fe761576f5457bb52f16e42ab2860, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 133597137547516588, guid: 376fe761576f5457bb52f16e42ab2860, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 133597137547516588, guid: 376fe761576f5457bb52f16e42ab2860, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 133597137547516588, guid: 376fe761576f5457bb52f16e42ab2860, type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 133597137547516588, guid: 376fe761576f5457bb52f16e42ab2860, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 133597137547516588, guid: 376fe761576f5457bb52f16e42ab2860, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 133597137547516588, guid: 376fe761576f5457bb52f16e42ab2860, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 133597137547516588, guid: 376fe761576f5457bb52f16e42ab2860, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 133597137547516588, guid: 376fe761576f5457bb52f16e42ab2860, type: 3} + propertyPath: m_SizeDelta.x + value: 900 + objectReference: {fileID: 0} + - target: {fileID: 133597137547516588, guid: 376fe761576f5457bb52f16e42ab2860, type: 3} + propertyPath: m_SizeDelta.y + value: 1950 + objectReference: {fileID: 0} + - target: {fileID: 133597137547516588, guid: 376fe761576f5457bb52f16e42ab2860, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 133597137547516588, guid: 376fe761576f5457bb52f16e42ab2860, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 133597137547516588, guid: 376fe761576f5457bb52f16e42ab2860, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 133597137547516588, guid: 376fe761576f5457bb52f16e42ab2860, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 133597137547516588, guid: 376fe761576f5457bb52f16e42ab2860, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 133597137547516588, guid: 376fe761576f5457bb52f16e42ab2860, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 133597137547516588, guid: 376fe761576f5457bb52f16e42ab2860, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 133597137547516588, guid: 376fe761576f5457bb52f16e42ab2860, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 133597137547516588, guid: 376fe761576f5457bb52f16e42ab2860, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 133597137547516588, guid: 376fe761576f5457bb52f16e42ab2860, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 133597137547516588, guid: 376fe761576f5457bb52f16e42ab2860, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 133597137547516588, guid: 376fe761576f5457bb52f16e42ab2860, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 133597137547516588, guid: 376fe761576f5457bb52f16e42ab2860, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 133597137547516588, guid: 376fe761576f5457bb52f16e42ab2860, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 133597137547516588, guid: 376fe761576f5457bb52f16e42ab2860, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 133597137547516588, guid: 376fe761576f5457bb52f16e42ab2860, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1034708200250406556, guid: 376fe761576f5457bb52f16e42ab2860, type: 3} + propertyPath: m_text + value: Error + objectReference: {fileID: 0} + - target: {fileID: 1374520013353734708, guid: 376fe761576f5457bb52f16e42ab2860, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1374520013353734708, guid: 376fe761576f5457bb52f16e42ab2860, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1374520013353734708, guid: 376fe761576f5457bb52f16e42ab2860, type: 3} + propertyPath: m_SizeDelta.x + value: 334 + objectReference: {fileID: 0} + - target: {fileID: 1419227374130472490, guid: 376fe761576f5457bb52f16e42ab2860, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1419227374130472490, guid: 376fe761576f5457bb52f16e42ab2860, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1419227374130472490, guid: 376fe761576f5457bb52f16e42ab2860, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 1256287885} + - target: {fileID: 1419227374130472490, guid: 376fe761576f5457bb52f16e42ab2860, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1419227374130472490, guid: 376fe761576f5457bb52f16e42ab2860, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: BackToPreviousScene + objectReference: {fileID: 0} + - target: {fileID: 1419227374130472490, guid: 376fe761576f5457bb52f16e42ab2860, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: SceneNavigator, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 1419227374130472490, guid: 376fe761576f5457bb52f16e42ab2860, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 1419227374130472495, guid: 376fe761576f5457bb52f16e42ab2860, type: 3} + propertyPath: m_Color.b + value: 0.13725491 + objectReference: {fileID: 0} + - target: {fileID: 1419227374130472495, guid: 376fe761576f5457bb52f16e42ab2860, type: 3} + propertyPath: m_Color.g + value: 0.5529412 + objectReference: {fileID: 0} + - target: {fileID: 1419227374130472495, guid: 376fe761576f5457bb52f16e42ab2860, type: 3} + propertyPath: m_Color.r + value: 0.6117647 + objectReference: {fileID: 0} + - target: {fileID: 1820677119451765637, guid: 376fe761576f5457bb52f16e42ab2860, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1820677119451765637, guid: 376fe761576f5457bb52f16e42ab2860, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1820677119451765637, guid: 376fe761576f5457bb52f16e42ab2860, type: 3} + propertyPath: m_SizeDelta.x + value: 128 + objectReference: {fileID: 0} + - target: {fileID: 1820677119451765637, guid: 376fe761576f5457bb52f16e42ab2860, type: 3} + propertyPath: m_AnchoredPosition.x + value: 334 + objectReference: {fileID: 0} + - target: {fileID: 6102236603491242828, guid: 376fe761576f5457bb52f16e42ab2860, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6102236603491242828, guid: 376fe761576f5457bb52f16e42ab2860, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6102236603491242828, guid: 376fe761576f5457bb52f16e42ab2860, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 1256287885} + - target: {fileID: 6102236603491242828, guid: 376fe761576f5457bb52f16e42ab2860, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6102236603491242828, guid: 376fe761576f5457bb52f16e42ab2860, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: BackToPreviousScene + objectReference: {fileID: 0} + - target: {fileID: 6102236603491242828, guid: 376fe761576f5457bb52f16e42ab2860, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: SceneNavigator, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 6102236603491242828, guid: 376fe761576f5457bb52f16e42ab2860, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 6992527488023465669, guid: 376fe761576f5457bb52f16e42ab2860, type: 3} + propertyPath: m_text + value: go back + objectReference: {fileID: 0} + - target: {fileID: 8504881325326043790, guid: 376fe761576f5457bb52f16e42ab2860, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8504881325326043790, guid: 376fe761576f5457bb52f16e42ab2860, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8504881325326043790, guid: 376fe761576f5457bb52f16e42ab2860, type: 3} + propertyPath: m_SizeDelta.x + value: 334 + objectReference: {fileID: 0} + - target: {fileID: 8504881325326043790, guid: 376fe761576f5457bb52f16e42ab2860, type: 3} + propertyPath: m_AnchoredPosition.x + value: 462 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 376fe761576f5457bb52f16e42ab2860, type: 3} +--- !u!224 &2125487498 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1805342863988975925, guid: 376fe761576f5457bb52f16e42ab2860, type: 3} + m_PrefabInstance: {fileID: 2125487497} + m_PrefabAsset: {fileID: 0} +--- !u!1 &2125487499 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 133597137547516579, guid: 376fe761576f5457bb52f16e42ab2860, type: 3} + m_PrefabInstance: {fileID: 2125487497} + m_PrefabAsset: {fileID: 0} +--- !u!1 &2133729443 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2133729444} + - component: {fileID: 2133729446} + - component: {fileID: 2133729445} + m_Layer: 0 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2133729444 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2133729443} + 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: [] + m_Father: {fileID: 1797760235} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -220, y: -5} + m_SizeDelta: {x: 400, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2133729445 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2133729443} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Max units exceeded + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4288327614 + m_fontColor: {r: 0.74509805, g: 0.6862745, b: 0.6039216, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 38 + m_fontSizeBase: 38 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &2133729446 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2133729443} + m_CullTransparentMesh: 1 --- !u!1 &2135440449 GameObject: m_ObjectHideFlags: 0 diff --git a/client/Assets/Scenes/Dungeon.unity b/client/Assets/Scenes/Dungeon.unity index d354d716..cec81798 100644 --- a/client/Assets/Scenes/Dungeon.unity +++ b/client/Assets/Scenes/Dungeon.unity @@ -638,6 +638,38 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1938758588} m_Modifications: + - target: {fileID: 5680396890292483277, guid: c36f69f305d3c4336a02acc5a4050f98, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5680396890292483277, guid: c36f69f305d3c4336a02acc5a4050f98, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 5680396890292483277, guid: c36f69f305d3c4336a02acc5a4050f98, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 2009515041} + - target: {fileID: 5680396890292483277, guid: c36f69f305d3c4336a02acc5a4050f98, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5680396890292483277, guid: c36f69f305d3c4336a02acc5a4050f98, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: ChangeToSupercampaignMap + objectReference: {fileID: 0} + - target: {fileID: 5680396890292483277, guid: c36f69f305d3c4336a02acc5a4050f98, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: SceneNavigator, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 5680396890292483277, guid: c36f69f305d3c4336a02acc5a4050f98, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_StringArgument + value: Dungeon + objectReference: {fileID: 0} + - target: {fileID: 5680396890292483277, guid: c36f69f305d3c4336a02acc5a4050f98, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 7414010532041107313, guid: c36f69f305d3c4336a02acc5a4050f98, type: 3} propertyPath: m_AnchorMax.x value: 0.5 diff --git a/client/Assets/Scenes/Overworld.unity b/client/Assets/Scenes/Overworld.unity index bb34b2a0..2b345caf 100644 --- a/client/Assets/Scenes/Overworld.unity +++ b/client/Assets/Scenes/Overworld.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.3708708, g: 0.37838137, b: 0.35725543, a: 1} + m_IndirectSpecularColor: {r: 0.37311947, g: 0.38074014, b: 0.3587274, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -870,7 +870,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7414010533079904352, guid: c36f69f305d3c4336a02acc5a4050f98, type: 3} propertyPath: m_RootOrder - value: 8 + value: 7 objectReference: {fileID: 0} - target: {fileID: 7414010533079904352, guid: c36f69f305d3c4336a02acc5a4050f98, type: 3} propertyPath: m_AnchorMax.x @@ -1105,7 +1105,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7414010533079904352, guid: c36f69f305d3c4336a02acc5a4050f98, type: 3} propertyPath: m_RootOrder - value: 9 + value: 8 objectReference: {fileID: 0} - target: {fileID: 7414010533079904352, guid: c36f69f305d3c4336a02acc5a4050f98, type: 3} propertyPath: m_AnchorMax.x @@ -1904,7 +1904,7 @@ RectTransform: - {fileID: 552261515} - {fileID: 2131167416} m_Father: {fileID: 1938758588} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -2251,6 +2251,9 @@ MonoBehaviour: - {fileID: 11400000, guid: 0fefabd5029b34ec0bc56b5d48394835, type: 2} - {fileID: 11400000, guid: 9b881e5e020044a0dbaa5cc150b7f804, type: 2} - {fileID: 11400000, guid: 9434b4336cd944dd397476ec3469d409, type: 2} + - {fileID: 11400000, guid: 5663b5c0c5629454aa4760b4a3d1e1c6, type: 2} + - {fileID: 11400000, guid: 3774397a5e3e8423aacba3ae92f69c39, type: 2} + - {fileID: 11400000, guid: 49a1773794120405cacb08d3be32bd74, type: 2} OnChangeUser: m_PersistentCalls: m_Calls: [] @@ -2514,7 +2517,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7414010533079904352, guid: c36f69f305d3c4336a02acc5a4050f98, type: 3} propertyPath: m_RootOrder - value: 6 + value: 11 objectReference: {fileID: 0} - target: {fileID: 7414010533079904352, guid: c36f69f305d3c4336a02acc5a4050f98, type: 3} propertyPath: m_AnchorMax.x @@ -3187,7 +3190,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1880474394802326500, guid: 80a0e36580b14449684c7d9d960c6ba2, type: 3} propertyPath: m_RootOrder - value: 11 + value: 10 objectReference: {fileID: 0} - target: {fileID: 1880474394802326500, guid: 80a0e36580b14449684c7d9d960c6ba2, type: 3} propertyPath: m_AnchorMax.x @@ -3570,7 +3573,7 @@ RectTransform: - {fileID: 205570529} - {fileID: 1988015981} m_Father: {fileID: 1938758588} - m_RootOrder: 10 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} diff --git a/client/Assets/Scenes/SupercampaignsMap.unity b/client/Assets/Scenes/SupercampaignsMap.unity index cd40a6df..c191139f 100644 --- a/client/Assets/Scenes/SupercampaignsMap.unity +++ b/client/Assets/Scenes/SupercampaignsMap.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.3708708, g: 0.37838137, b: 0.35725543, a: 1} + m_IndirectSpecularColor: {r: 0.37311947, g: 0.38074014, b: 0.3587274, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -251,7 +251,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 114851839747405846, guid: f24057f0865f940aea63ebd760a46fb6, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Mode - value: 5 + value: 1 objectReference: {fileID: 0} - target: {fileID: 114851839747405846, guid: f24057f0865f940aea63ebd760a46fb6, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target @@ -263,7 +263,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 114851839747405846, guid: f24057f0865f940aea63ebd760a46fb6, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName - value: ChangeToSceneWithDelay + value: BackToPreviousScene objectReference: {fileID: 0} - target: {fileID: 114851839747405846, guid: f24057f0865f940aea63ebd760a46fb6, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName @@ -843,6 +843,11 @@ MonoBehaviour: m_SubObjectName: m_SubObjectType: m_EditorAssetChanged: 0 + _dungeonSupercampaign: + m_AssetGUID: bcc177b52cf864a9a9d5cd2fcfd41c31 + m_SubObjectName: + m_SubObjectType: + m_EditorAssetChanged: 0 --- !u!4 &863542536 Transform: m_ObjectHideFlags: 0 diff --git a/client/Assets/ScriptableObjects/Currencies/4 Star Shards.asset b/client/Assets/ScriptableObjects/Currencies/4 Star Shards.asset new file mode 100644 index 00000000..4f85583e --- /dev/null +++ b/client/Assets/ScriptableObjects/Currencies/4 Star Shards.asset @@ -0,0 +1,16 @@ +%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: 577388ae5bdaf4133a440f56cae98cfe, type: 3} + m_Name: 4 Star Shards + m_EditorClassIdentifier: + name: 4* Shards + image: {fileID: 21300000, guid: eddb0f61210d2f4429ae92bc08d1b3ba, type: 3} diff --git a/client/Assets/ScriptableObjects/Currencies/4 Star Shards.asset.meta b/client/Assets/ScriptableObjects/Currencies/4 Star Shards.asset.meta new file mode 100644 index 00000000..3712d6ee --- /dev/null +++ b/client/Assets/ScriptableObjects/Currencies/4 Star Shards.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5663b5c0c5629454aa4760b4a3d1e1c6 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/client/Assets/ScriptableObjects/Currencies/5 Star Shards.asset b/client/Assets/ScriptableObjects/Currencies/5 Star Shards.asset new file mode 100644 index 00000000..f48b4693 --- /dev/null +++ b/client/Assets/ScriptableObjects/Currencies/5 Star Shards.asset @@ -0,0 +1,16 @@ +%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: 577388ae5bdaf4133a440f56cae98cfe, type: 3} + m_Name: 5 Star Shards + m_EditorClassIdentifier: + name: 5* Shards + image: {fileID: 21300000, guid: 5c43a34aaf5811442a3197d0b97a3940, type: 3} diff --git a/client/Assets/ScriptableObjects/Currencies/5 Star Shards.asset.meta b/client/Assets/ScriptableObjects/Currencies/5 Star Shards.asset.meta new file mode 100644 index 00000000..b4bafd81 --- /dev/null +++ b/client/Assets/ScriptableObjects/Currencies/5 Star Shards.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3774397a5e3e8423aacba3ae92f69c39 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/client/Assets/ScriptableObjects/Currencies/Pearls.asset b/client/Assets/ScriptableObjects/Currencies/Pearls.asset new file mode 100644 index 00000000..b03b18be --- /dev/null +++ b/client/Assets/ScriptableObjects/Currencies/Pearls.asset @@ -0,0 +1,16 @@ +%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: 577388ae5bdaf4133a440f56cae98cfe, type: 3} + m_Name: Pearls + m_EditorClassIdentifier: + name: Pearls + image: {fileID: 21300000, guid: 7d0f73aed89f4e146b939c2b5afbcb89, type: 3} diff --git a/client/Assets/ScriptableObjects/Currencies/Pearls.asset.meta b/client/Assets/ScriptableObjects/Currencies/Pearls.asset.meta new file mode 100644 index 00000000..76a25f94 --- /dev/null +++ b/client/Assets/ScriptableObjects/Currencies/Pearls.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 49a1773794120405cacb08d3be32bd74 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/client/Assets/Scripts/BackendConnection/SocketConnection.cs b/client/Assets/Scripts/BackendConnection/SocketConnection.cs index 789261c4..443ff8b8 100644 --- a/client/Assets/Scripts/BackendConnection/SocketConnection.cs +++ b/client/Assets/Scripts/BackendConnection/SocketConnection.cs @@ -269,6 +269,7 @@ private List ParseCampaignsFromResponse(Protobuf.Messages.Campaigns ca id = level.Id, levelNumber = (int)level.LevelNumber, campaignId = level.CampaignId, + maxUnits = (int)level.MaxUnits == 0 ? 6 : (int)level.MaxUnits, units = levelUnits, rewards = GetLevelCurrencyRewards(level), status = levelStatus @@ -527,7 +528,7 @@ public void UnselectUnit(string unitId, string userId) SendWebSocketMessage(request); } - private void AwaitBattleResponse(byte[] data, Action onBattleResultReceived) + private void AwaitBattleResponse(byte[] data, Action onBattleResultReceived, Action onError = null) { try { @@ -538,6 +539,10 @@ private void AwaitBattleResponse(byte[] data, Action onBattleResul { onBattleResultReceived?.Invoke(webSocketResponse.BattleResult); } + else if (webSocketResponse.ResponseTypeCase == WebSocketResponse.ResponseTypeOneofCase.Error) + { + onError?.Invoke(webSocketResponse.Error.Reason); + } } catch (Exception e) { @@ -545,7 +550,7 @@ private void AwaitBattleResponse(byte[] data, Action onBattleResul } } - public IEnumerator Battle(string userId, string levelId, Action onBattleResultReceived) + public IEnumerator Battle(string userId, string levelId, Action onBattleResultReceived, Action onError = null) { FightLevel fightLevelRequest = new FightLevel { @@ -556,7 +561,7 @@ public IEnumerator Battle(string userId, string levelId, Action on { FightLevel = fightLevelRequest }; - currentMessageHandler = (data) => AwaitBattleResponse(data, onBattleResultReceived); + currentMessageHandler = (data) => AwaitBattleResponse(data, onBattleResultReceived, onError); ws.OnMessage += currentMessageHandler; ws.OnMessage -= OnWebSocketMessage; SendWebSocketMessage(request); diff --git a/client/Assets/Scripts/Battle/BattleManager.cs b/client/Assets/Scripts/Battle/BattleManager.cs index 111f7032..0c6154b1 100644 --- a/client/Assets/Scripts/Battle/BattleManager.cs +++ b/client/Assets/Scripts/Battle/BattleManager.cs @@ -25,6 +25,9 @@ public class BattleManager : MonoBehaviour [SerializeField] List statuses; + [SerializeField] + GameObject maxUnitsExceededPopup; + private bool continuePlayback = true; private const int MAX_ENERGY = 500; @@ -65,6 +68,13 @@ private IEnumerator Battle() yield return StartCoroutine(SocketConnection.Instance.Battle(GlobalUserData.Instance.User.id, LevelProgress.selectedLevelData.id, (replay) => { battleResult = replay; + }, + (reason) => + { + if (reason == "max_units_exceeded") + { + maxUnitsExceededPopup.SetActive(true); + } })); yield return new WaitUntil(() => battleResult != null); diff --git a/client/Assets/Scripts/Campaign/CampaignLevelIndicator.cs b/client/Assets/Scripts/Campaign/CampaignLevelIndicator.cs index afa2800c..32475f11 100644 --- a/client/Assets/Scripts/Campaign/CampaignLevelIndicator.cs +++ b/client/Assets/Scripts/Campaign/CampaignLevelIndicator.cs @@ -36,9 +36,8 @@ public void Init() public void SelectLevel() { - campaignLevelManager.LevelSelected(); - SetLevel(); + campaignLevelManager.LevelSelected(); } private void SetLevel() diff --git a/client/Assets/Scripts/Campaign/CampaignLevelsManager.cs b/client/Assets/Scripts/Campaign/CampaignLevelsManager.cs index 9616574f..e7c364e2 100644 --- a/client/Assets/Scripts/Campaign/CampaignLevelsManager.cs +++ b/client/Assets/Scripts/Campaign/CampaignLevelsManager.cs @@ -18,13 +18,14 @@ public void LevelSelected() public void AssignLevelsData(List levelsData, SceneNavigator sceneNavigator) { - // The campaign prefabs need to match the number of levels with the levels brought with the backend, if not this will break. + // The campaign prefabs should match the number of levels with the levels brought with the backend, if not a warning will be shown. + int levelsInScene = Math.Min(levelsData.Count, levelIndicators.Count); if (levelsData.Count != levelIndicators.Count) { - throw new Exception("The number of levels brought from the backend doesn't match with the number of levels on that campaign prefab."); + Debug.LogWarning("The number of levels brought from the backend doesn't match with the number of levels on that campaign prefab."); } - for (int levelIndex = 1; levelIndex < levelsData.Count + 1; levelIndex++) + for (int levelIndex = 1; levelIndex < levelsInScene + 1; levelIndex++) { levelIndicators[levelIndex - 1].levelData = levelsData[levelIndex - 1]; diff --git a/client/Assets/Scripts/Campaign/LevelData.cs b/client/Assets/Scripts/Campaign/LevelData.cs index ac23f794..7aec46ec 100644 --- a/client/Assets/Scripts/Campaign/LevelData.cs +++ b/client/Assets/Scripts/Campaign/LevelData.cs @@ -7,6 +7,7 @@ public class LevelData public string id; public int levelNumber; public string campaignId; + public int maxUnits; public List units; public Dictionary rewards = new Dictionary(); diff --git a/client/Assets/Scripts/CampaignsMap/SupercampaignsMapManager.cs b/client/Assets/Scripts/CampaignsMap/SupercampaignsMapManager.cs index 72b2a2b3..06f88340 100644 --- a/client/Assets/Scripts/CampaignsMap/SupercampaignsMapManager.cs +++ b/client/Assets/Scripts/CampaignsMap/SupercampaignsMapManager.cs @@ -42,12 +42,22 @@ private async Task InstantiateSupercampaign() if (selectedSuperCampaignName == "Main Campaign") { supercampaignInstance = await addressableInstantiator.InstantiateMainSupercampaign(); - supercampaignInstance.transform.SetParent(supercampaignContainer.transform, false); - supercampaignInstance.transform.SetSiblingIndex(0); + SetSupercampaignTransform(supercampaignInstance); + } + else if (selectedSuperCampaignName == "Dungeon") + { + supercampaignInstance = await addressableInstantiator.InstantiateDungeonSupercampaign(); + SetSupercampaignTransform(supercampaignInstance); } else { Debug.LogError("Supercampaign not found: " + selectedSuperCampaignName); } } + + private void SetSupercampaignTransform(GameObject supercampaignInstance) + { + supercampaignInstance.transform.SetParent(supercampaignContainer.transform, false); + supercampaignInstance.transform.SetSiblingIndex(0); + } } diff --git a/client/Assets/Scripts/Protobuf/Gateway.pb.cs b/client/Assets/Scripts/Protobuf/Gateway.pb.cs index 7c5f917a..f4618b57 100644 --- a/client/Assets/Scripts/Protobuf/Gateway.pb.cs +++ b/client/Assets/Scripts/Protobuf/Gateway.pb.cs @@ -127,59 +127,60 @@ static GatewayReflection() { "EgwKBG5hbWUYAiABKAkSDAoEdHlwZRgDIAEoCSIpCglDYW1wYWlnbnMSHAoJ", "Y2FtcGFpZ25zGAEgAygLMgkuQ2FtcGFpZ24iZAoIQ2FtcGFpZ24SCgoCaWQY", "ASABKAkSGwoTc3VwZXJfY2FtcGFpZ25fbmFtZRgCIAEoCRIXCg9jYW1wYWln", - "bl9udW1iZXIYAyABKA0SFgoGbGV2ZWxzGAQgAygLMgYuTGV2ZWwimgEKBUxl", + "bl9udW1iZXIYAyABKA0SFgoGbGV2ZWxzGAQgAygLMgYuTGV2ZWwirQEKBUxl", "dmVsEgoKAmlkGAEgASgJEhMKC2NhbXBhaWduX2lkGAIgASgJEhQKDGxldmVs", "X251bWJlchgDIAEoDRIUCgV1bml0cxgEIAMoCzIFLlVuaXQSKQoQY3VycmVu", "Y3lfcmV3YXJkcxgFIAMoCzIPLkN1cnJlbmN5UmV3YXJkEhkKEWV4cGVyaWVu", - "Y2VfcmV3YXJkGAYgASgNIj0KDkN1cnJlbmN5UmV3YXJkEhsKCGN1cnJlbmN5", - "GAEgASgLMgkuQ3VycmVuY3kSDgoGYW1vdW50GAMgASgEIi0KCkFma1Jld2Fy", - "ZHMSHwoLYWZrX3Jld2FyZHMYASADKAsyCi5BZmtSZXdhcmQiOAoJQWZrUmV3", - "YXJkEhsKCGN1cnJlbmN5GAEgASgLMgkuQ3VycmVuY3kSDgoGYW1vdW50GAIg", - "ASgEIhcKBUVycm9yEg4KBnJlYXNvbhgBIAEoCSIcCgVCb3hlcxITCgVib3hl", - "cxgBIAMoCzIELkJveCKHAQoDQm94EgoKAmlkGAEgASgJEgwKBG5hbWUYAiAB", - "KAkSEwoLZGVzY3JpcHRpb24YAyABKAkSEAoIZmFjdGlvbnMYBCADKAkSIgoM", - "cmFua193ZWlnaHRzGAUgAygLMgwuUmFua1dlaWdodHMSGwoEY29zdBgGIAMo", - "CzINLkN1cnJlbmN5Q29zdCIrCgtSYW5rV2VpZ2h0cxIMCgRyYW5rGAEgASgF", - "Eg4KBndlaWdodBgCIAEoBSI7CgxDdXJyZW5jeUNvc3QSGwoIY3VycmVuY3kY", - "ASABKAsyCS5DdXJyZW5jeRIOCgZhbW91bnQYAiABKAUiNwoLVXNlckFuZFVu", - "aXQSEwoEdXNlchgBIAEoCzIFLlVzZXISEwoEdW5pdBgCIAEoCzIFLlVuaXQi", - "UwoMQmF0dGxlUmVzdWx0Eh0KDWluaXRpYWxfc3RhdGUYASABKAsyBi5TdGF0", - "ZRIUCgVzdGVwcxgCIAMoCzIFLlN0ZXASDgoGcmVzdWx0GAMgASgJIiMKBVN0", - "YXRlEhoKBXVuaXRzGAEgAygLMgsuQmF0dGxlVW5pdCJqCgpCYXR0bGVVbml0", - "EgoKAmlkGAEgASgJEg4KBmhlYWx0aBgCIAEoBRIOCgZlbmVyZ3kYAyABKAUS", - "DAoEc2xvdBgEIAEoBRIUCgxjaGFyYWN0ZXJfaWQYBSABKAkSDAoEdGVhbRgG", - "IAEoBSI1CgRTdGVwEhMKC3N0ZXBfbnVtYmVyGAEgASgFEhgKB2FjdGlvbnMY", - "AiADKAsyBy5BY3Rpb24i/gIKBkFjdGlvbhIkCgxza2lsbF9hY3Rpb24YASAB", - "KAsyDC5Ta2lsbEFjdGlvbkgAEi4KEW1vZGlmaWVyX3JlY2VpdmVkGAIgASgL", - "MhEuTW9kaWZpZXJSZWNlaXZlZEgAEiQKDHRhZ19yZWNlaXZlZBgDIAEoCzIM", - "LlRhZ1JlY2VpdmVkSAASLAoQbW9kaWZpZXJfZXhwaXJlZBgEIAEoCzIQLk1v", - "ZGlmaWVyRXhwaXJlZEgAEiIKC3RhZ19leHBpcmVkGAUgASgLMgsuVGFnRXhw", - "aXJlZEgAEhcKBWRlYXRoGAYgASgLMgYuRGVhdGhIABIwChJleGVjdXRpb25f", - "cmVjZWl2ZWQYByABKAsyEi5FeGVjdXRpb25SZWNlaXZlZEgAEiQKDGVuZXJn", - "eV9yZWdlbhgIIAEoCzIMLkVuZXJneVJlZ2VuSAASJgoNc3RhdF9vdmVycmlk", - "ZRgJIAEoCzINLlN0YXRPdmVycmlkZUgAQg0KC2FjdGlvbl90eXBlIjMKDFN0", - "YXRBZmZlY3RlZBITCgRzdGF0GAEgASgOMgUuU3RhdBIOCgZhbW91bnQYAiAB", - "KAIicwoLU2tpbGxBY3Rpb24SEQoJY2FzdGVyX2lkGAEgASgJEhIKCnRhcmdl", - "dF9pZHMYAiADKAkSEAoIc2tpbGxfaWQYAyABKAkSKwoRc2tpbGxfYWN0aW9u", - "X3R5cGUYBCABKA4yEC5Ta2lsbEFjdGlvblR5cGUiTAoRRXhlY3V0aW9uUmVj", - "ZWl2ZWQSEQoJdGFyZ2V0X2lkGAEgASgJEiQKDXN0YXRfYWZmZWN0ZWQYAiAB", - "KAsyDS5TdGF0QWZmZWN0ZWQicAoQTW9kaWZpZXJSZWNlaXZlZBIQCghza2ls", - "bF9pZBgBIAEoCRIRCgl0YXJnZXRfaWQYAiABKAkSJAoNc3RhdF9hZmZlY3Rl", - "ZBgDIAEoCzINLlN0YXRBZmZlY3RlZBIRCglvcGVyYXRpb24YBCABKAkiPwoL", - "VGFnUmVjZWl2ZWQSEAoIc2tpbGxfaWQYASABKAkSEQoJdGFyZ2V0X2lkGAIg", - "ASgJEgsKA3RhZxgDIAEoCSJvCg9Nb2RpZmllckV4cGlyZWQSEAoIc2tpbGxf", - "aWQYASABKAkSEQoJdGFyZ2V0X2lkGAIgASgJEiQKDXN0YXRfYWZmZWN0ZWQY", - "AyABKAsyDS5TdGF0QWZmZWN0ZWQSEQoJb3BlcmF0aW9uGAQgASgJIj4KClRh", - "Z0V4cGlyZWQSEAoIc2tpbGxfaWQYASABKAkSEQoJdGFyZ2V0X2lkGAIgASgJ", - "EgsKA3RhZxgDIAEoCSIYCgVEZWF0aBIPCgd1bml0X2lkGAEgASgJIkIKC0Vu", - "ZXJneVJlZ2VuEhEKCXRhcmdldF9pZBgBIAEoCRIQCghza2lsbF9pZBgCIAEo", - "CRIOCgZhbW91bnQYAyABKAIiRwoMU3RhdE92ZXJyaWRlEhEKCXRhcmdldF9p", - "ZBgBIAEoCRIkCg1zdGF0X2FmZmVjdGVkGAIgASgLMg0uU3RhdEFmZmVjdGVk", - "KlsKD1NraWxsQWN0aW9uVHlwZRITCg9BTklNQVRJT05fU1RBUlQQABISCg5F", - "RkZFQ1RfVFJJR0dFUhABEg4KCkVGRkVDVF9ISVQQAhIPCgtFRkZFQ1RfTUlT", - "UxADKlgKBFN0YXQSCgoGSEVBTFRIEAASCgoGRU5FUkdZEAESCgoGQVRUQUNL", - "EAISCwoHREVGRU5TRRADEhQKEERBTUFHRV9SRURVQ1RJT04QBBIJCgVTUEVF", - "RBAFQhSqAhFQcm90b2J1Zi5NZXNzYWdlc2IGcHJvdG8z")); + "Y2VfcmV3YXJkGAYgASgNEhEKCW1heF91bml0cxgIIAEoDSI9Cg5DdXJyZW5j", + "eVJld2FyZBIbCghjdXJyZW5jeRgBIAEoCzIJLkN1cnJlbmN5Eg4KBmFtb3Vu", + "dBgDIAEoBCItCgpBZmtSZXdhcmRzEh8KC2Fma19yZXdhcmRzGAEgAygLMgou", + "QWZrUmV3YXJkIjgKCUFma1Jld2FyZBIbCghjdXJyZW5jeRgBIAEoCzIJLkN1", + "cnJlbmN5Eg4KBmFtb3VudBgCIAEoBCIXCgVFcnJvchIOCgZyZWFzb24YASAB", + "KAkiHAoFQm94ZXMSEwoFYm94ZXMYASADKAsyBC5Cb3gihwEKA0JveBIKCgJp", + "ZBgBIAEoCRIMCgRuYW1lGAIgASgJEhMKC2Rlc2NyaXB0aW9uGAMgASgJEhAK", + "CGZhY3Rpb25zGAQgAygJEiIKDHJhbmtfd2VpZ2h0cxgFIAMoCzIMLlJhbmtX", + "ZWlnaHRzEhsKBGNvc3QYBiADKAsyDS5DdXJyZW5jeUNvc3QiKwoLUmFua1dl", + "aWdodHMSDAoEcmFuaxgBIAEoBRIOCgZ3ZWlnaHQYAiABKAUiOwoMQ3VycmVu", + "Y3lDb3N0EhsKCGN1cnJlbmN5GAEgASgLMgkuQ3VycmVuY3kSDgoGYW1vdW50", + "GAIgASgFIjcKC1VzZXJBbmRVbml0EhMKBHVzZXIYASABKAsyBS5Vc2VyEhMK", + "BHVuaXQYAiABKAsyBS5Vbml0IlMKDEJhdHRsZVJlc3VsdBIdCg1pbml0aWFs", + "X3N0YXRlGAEgASgLMgYuU3RhdGUSFAoFc3RlcHMYAiADKAsyBS5TdGVwEg4K", + "BnJlc3VsdBgDIAEoCSIjCgVTdGF0ZRIaCgV1bml0cxgBIAMoCzILLkJhdHRs", + "ZVVuaXQiagoKQmF0dGxlVW5pdBIKCgJpZBgBIAEoCRIOCgZoZWFsdGgYAiAB", + "KAUSDgoGZW5lcmd5GAMgASgFEgwKBHNsb3QYBCABKAUSFAoMY2hhcmFjdGVy", + "X2lkGAUgASgJEgwKBHRlYW0YBiABKAUiNQoEU3RlcBITCgtzdGVwX251bWJl", + "chgBIAEoBRIYCgdhY3Rpb25zGAIgAygLMgcuQWN0aW9uIv4CCgZBY3Rpb24S", + "JAoMc2tpbGxfYWN0aW9uGAEgASgLMgwuU2tpbGxBY3Rpb25IABIuChFtb2Rp", + "Zmllcl9yZWNlaXZlZBgCIAEoCzIRLk1vZGlmaWVyUmVjZWl2ZWRIABIkCgx0", + "YWdfcmVjZWl2ZWQYAyABKAsyDC5UYWdSZWNlaXZlZEgAEiwKEG1vZGlmaWVy", + "X2V4cGlyZWQYBCABKAsyEC5Nb2RpZmllckV4cGlyZWRIABIiCgt0YWdfZXhw", + "aXJlZBgFIAEoCzILLlRhZ0V4cGlyZWRIABIXCgVkZWF0aBgGIAEoCzIGLkRl", + "YXRoSAASMAoSZXhlY3V0aW9uX3JlY2VpdmVkGAcgASgLMhIuRXhlY3V0aW9u", + "UmVjZWl2ZWRIABIkCgxlbmVyZ3lfcmVnZW4YCCABKAsyDC5FbmVyZ3lSZWdl", + "bkgAEiYKDXN0YXRfb3ZlcnJpZGUYCSABKAsyDS5TdGF0T3ZlcnJpZGVIAEIN", + "CgthY3Rpb25fdHlwZSIzCgxTdGF0QWZmZWN0ZWQSEwoEc3RhdBgBIAEoDjIF", + "LlN0YXQSDgoGYW1vdW50GAIgASgCInMKC1NraWxsQWN0aW9uEhEKCWNhc3Rl", + "cl9pZBgBIAEoCRISCgp0YXJnZXRfaWRzGAIgAygJEhAKCHNraWxsX2lkGAMg", + "ASgJEisKEXNraWxsX2FjdGlvbl90eXBlGAQgASgOMhAuU2tpbGxBY3Rpb25U", + "eXBlIkwKEUV4ZWN1dGlvblJlY2VpdmVkEhEKCXRhcmdldF9pZBgBIAEoCRIk", + "Cg1zdGF0X2FmZmVjdGVkGAIgASgLMg0uU3RhdEFmZmVjdGVkInAKEE1vZGlm", + "aWVyUmVjZWl2ZWQSEAoIc2tpbGxfaWQYASABKAkSEQoJdGFyZ2V0X2lkGAIg", + "ASgJEiQKDXN0YXRfYWZmZWN0ZWQYAyABKAsyDS5TdGF0QWZmZWN0ZWQSEQoJ", + "b3BlcmF0aW9uGAQgASgJIj8KC1RhZ1JlY2VpdmVkEhAKCHNraWxsX2lkGAEg", + "ASgJEhEKCXRhcmdldF9pZBgCIAEoCRILCgN0YWcYAyABKAkibwoPTW9kaWZp", + "ZXJFeHBpcmVkEhAKCHNraWxsX2lkGAEgASgJEhEKCXRhcmdldF9pZBgCIAEo", + "CRIkCg1zdGF0X2FmZmVjdGVkGAMgASgLMg0uU3RhdEFmZmVjdGVkEhEKCW9w", + "ZXJhdGlvbhgEIAEoCSI+CgpUYWdFeHBpcmVkEhAKCHNraWxsX2lkGAEgASgJ", + "EhEKCXRhcmdldF9pZBgCIAEoCRILCgN0YWcYAyABKAkiGAoFRGVhdGgSDwoH", + "dW5pdF9pZBgBIAEoCSJCCgtFbmVyZ3lSZWdlbhIRCgl0YXJnZXRfaWQYASAB", + "KAkSEAoIc2tpbGxfaWQYAiABKAkSDgoGYW1vdW50GAMgASgCIkcKDFN0YXRP", + "dmVycmlkZRIRCgl0YXJnZXRfaWQYASABKAkSJAoNc3RhdF9hZmZlY3RlZBgC", + "IAEoCzINLlN0YXRBZmZlY3RlZCpbCg9Ta2lsbEFjdGlvblR5cGUSEwoPQU5J", + "TUFUSU9OX1NUQVJUEAASEgoORUZGRUNUX1RSSUdHRVIQARIOCgpFRkZFQ1Rf", + "SElUEAISDwoLRUZGRUNUX01JU1MQAypYCgRTdGF0EgoKBkhFQUxUSBAAEgoK", + "BkVORVJHWRABEgoKBkFUVEFDSxACEgsKB0RFRkVOU0UQAxIUChBEQU1BR0Vf", + "UkVEVUNUSU9OEAQSCQoFU1BFRUQQBUIUqgIRUHJvdG9idWYuTWVzc2FnZXNi", + "BnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Protobuf.Messages.SkillActionType), typeof(global::Protobuf.Messages.Stat), }, null, new pbr::GeneratedClrTypeInfo[] { @@ -228,7 +229,7 @@ static GatewayReflection() { new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.Messages.ItemTemplate), global::Protobuf.Messages.ItemTemplate.Parser, new[]{ "Id", "Name", "Type" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.Messages.Campaigns), global::Protobuf.Messages.Campaigns.Parser, new[]{ "Campaigns_" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.Messages.Campaign), global::Protobuf.Messages.Campaign.Parser, new[]{ "Id", "SuperCampaignName", "CampaignNumber", "Levels" }, null, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.Messages.Level), global::Protobuf.Messages.Level.Parser, new[]{ "Id", "CampaignId", "LevelNumber", "Units", "CurrencyRewards", "ExperienceReward" }, null, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.Messages.Level), global::Protobuf.Messages.Level.Parser, new[]{ "Id", "CampaignId", "LevelNumber", "Units", "CurrencyRewards", "ExperienceReward", "MaxUnits" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.Messages.CurrencyReward), global::Protobuf.Messages.CurrencyReward.Parser, new[]{ "Currency", "Amount" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.Messages.AfkRewards), global::Protobuf.Messages.AfkRewards.Parser, new[]{ "AfkRewards_" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.Messages.AfkReward), global::Protobuf.Messages.AfkReward.Parser, new[]{ "Currency", "Amount" }, null, null, null, null), @@ -13352,6 +13353,7 @@ public Level(Level other) : this() { units_ = other.units_.Clone(); currencyRewards_ = other.currencyRewards_.Clone(); experienceReward_ = other.experienceReward_; + maxUnits_ = other.maxUnits_; _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } @@ -13431,6 +13433,18 @@ public uint ExperienceReward { } } + /// Field number for the "max_units" field. + public const int MaxUnitsFieldNumber = 8; + private uint maxUnits_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public uint MaxUnits { + get { return maxUnits_; } + set { + maxUnits_ = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override bool Equals(object other) { @@ -13452,6 +13466,7 @@ public bool Equals(Level other) { if(!units_.Equals(other.units_)) return false; if(!currencyRewards_.Equals(other.currencyRewards_)) return false; if (ExperienceReward != other.ExperienceReward) return false; + if (MaxUnits != other.MaxUnits) return false; return Equals(_unknownFields, other._unknownFields); } @@ -13465,6 +13480,7 @@ public override int GetHashCode() { hash ^= units_.GetHashCode(); hash ^= currencyRewards_.GetHashCode(); if (ExperienceReward != 0) hash ^= ExperienceReward.GetHashCode(); + if (MaxUnits != 0) hash ^= MaxUnits.GetHashCode(); if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); } @@ -13501,6 +13517,10 @@ public void WriteTo(pb::CodedOutputStream output) { output.WriteRawTag(48); output.WriteUInt32(ExperienceReward); } + if (MaxUnits != 0) { + output.WriteRawTag(64); + output.WriteUInt32(MaxUnits); + } if (_unknownFields != null) { _unknownFields.WriteTo(output); } @@ -13529,6 +13549,10 @@ public void WriteTo(pb::CodedOutputStream output) { output.WriteRawTag(48); output.WriteUInt32(ExperienceReward); } + if (MaxUnits != 0) { + output.WriteRawTag(64); + output.WriteUInt32(MaxUnits); + } if (_unknownFields != null) { _unknownFields.WriteTo(ref output); } @@ -13553,6 +13577,9 @@ public int CalculateSize() { if (ExperienceReward != 0) { size += 1 + pb::CodedOutputStream.ComputeUInt32Size(ExperienceReward); } + if (MaxUnits != 0) { + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(MaxUnits); + } if (_unknownFields != null) { size += _unknownFields.CalculateSize(); } @@ -13579,6 +13606,9 @@ public void MergeFrom(Level other) { if (other.ExperienceReward != 0) { ExperienceReward = other.ExperienceReward; } + if (other.MaxUnits != 0) { + MaxUnits = other.MaxUnits; + } _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); } @@ -13618,6 +13648,10 @@ public void MergeFrom(pb::CodedInputStream input) { ExperienceReward = input.ReadUInt32(); break; } + case 64: { + MaxUnits = input.ReadUInt32(); + break; + } } } #endif @@ -13657,6 +13691,10 @@ public void MergeFrom(pb::CodedInputStream input) { ExperienceReward = input.ReadUInt32(); break; } + case 64: { + MaxUnits = input.ReadUInt32(); + break; + } } } } diff --git a/client/Assets/Scripts/Shared/AddressableInstantiator.cs b/client/Assets/Scripts/Shared/AddressableInstantiator.cs index 224bbac3..8779b968 100644 --- a/client/Assets/Scripts/Shared/AddressableInstantiator.cs +++ b/client/Assets/Scripts/Shared/AddressableInstantiator.cs @@ -6,6 +6,7 @@ public class AddressableInstantiator : MonoBehaviour { [SerializeField] AssetReferenceGameObject _mainSupercampaign; + [SerializeField] AssetReferenceGameObject _dungeonSupercampaign; public async Task InstantiateMainSupercampaign() { @@ -13,4 +14,11 @@ public async Task InstantiateMainSupercampaign() await handle.Task; return handle.Result; } + + public async Task InstantiateDungeonSupercampaign() + { + AsyncOperationHandle handle = _dungeonSupercampaign.InstantiateAsync(Vector3.zero, Quaternion.identity); + await handle.Task; + return handle.Result; + } } diff --git a/gateway.proto b/gateway.proto index 2f9fc423..dbb0670b 100644 --- a/gateway.proto +++ b/gateway.proto @@ -298,6 +298,7 @@ option csharp_namespace = "Protobuf.Messages"; repeated Unit units = 4; repeated CurrencyReward currency_rewards = 5; uint32 experience_reward = 6; + uint32 max_units = 8; } message CurrencyReward {