diff --git a/client/Assets/Prefabs/Shared/Header.prefab b/client/Assets/Prefabs/Shared/Header.prefab index 623bcda7..6d964516 100644 --- a/client/Assets/Prefabs/Shared/Header.prefab +++ b/client/Assets/Prefabs/Shared/Header.prefab @@ -1,5 +1,83 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &100869007055250739 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1405295970729089136} + - component: {fileID: 5806036107452497487} + - component: {fileID: 7976505227853996864} + m_Layer: 5 + m_Name: Supplies + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1405295970729089136 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 100869007055250739} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.00032, y: 1.00032, z: 1.00032} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7018873092788250157} + - {fileID: 9099371337928331599} + m_Father: {fileID: 8514571268811103267} + m_RootOrder: 4 + 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: 20, y: -5} + m_SizeDelta: {x: 140, y: 45} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &5806036107452497487 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 100869007055250739} + m_CullTransparentMesh: 1 +--- !u!114 &7976505227853996864 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 100869007055250739} + 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: c9a9791847d4f4fa0afb81101e711284, 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!1 &260921082830793817 GameObject: m_ObjectHideFlags: 0 @@ -76,6 +154,82 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &498481247128686297 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7018873092788250157} + - component: {fileID: 4196017675861447680} + - component: {fileID: 7020400364398635873} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7018873092788250157 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 498481247128686297} + m_LocalRotation: {x: 0, y: 0, z: -0.5, w: 0.8660254} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1405295970729089136} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -60} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 70, y: 70} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4196017675861447680 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 498481247128686297} + m_CullTransparentMesh: 1 +--- !u!114 &7020400364398635873 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 498481247128686297} + 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: 0051cf6193c6749e7ab7cef8a48fcf3b, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &592328171030375166 GameObject: m_ObjectHideFlags: 0 @@ -194,6 +348,7 @@ MonoBehaviour: scrolls: {fileID: 3718164791782398575} fertilizer: {fileID: 45067436195482694} blueprints: {fileID: 2354998195384027185} + supplies: {fileID: 2549943678223092169} --- !u!1 &852510989775162454 GameObject: m_ObjectHideFlags: 0 @@ -1658,6 +1813,7 @@ RectTransform: - {fileID: 1531101293870657583} - {fileID: 3543484211400062038} - {fileID: 2772212721011641000} + - {fileID: 1405295970729089136} - {fileID: 3682576360670793022} m_Father: {fileID: 592328171030375167} m_RootOrder: 1 @@ -2287,6 +2443,141 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7973272286334014054 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9099371337928331599} + - component: {fileID: 3237963663496285650} + - component: {fileID: 2549943678223092169} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9099371337928331599 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7973272286334014054} + 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: 1405295970729089136} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 5, y: 0} + m_SizeDelta: {x: -30, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3237963663496285650 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7973272286334014054} + m_CullTransparentMesh: 1 +--- !u!114 &2549943678223092169 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7973272286334014054} + 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: 124 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 7acb85422e77346ba8edcfa489c617af, type: 2} + m_sharedMaterial: {fileID: -6068340767680993057, guid: 7acb85422e77346ba8edcfa489c617af, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4292269782 + m_fontColor: {r: 0.8392157, g: 0.8392157, b: 0.8392157, 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: 34 + m_fontSizeBase: 34 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 4 + m_VerticalAlignment: 4096 + 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!1 &8136338918257870668 GameObject: m_ObjectHideFlags: 0 @@ -2455,7 +2746,7 @@ RectTransform: - {fileID: 6215473090431934378} - {fileID: 157588706513866714} m_Father: {fileID: 8514571268811103267} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} diff --git a/client/Assets/Scenes/Dungeon.unity b/client/Assets/Scenes/Dungeon.unity index 43d78859..f16fe496 100644 --- a/client/Assets/Scenes/Dungeon.unity +++ b/client/Assets/Scenes/Dungeon.unity @@ -386,6 +386,50 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c36f69f305d3c4336a02acc5a4050f98, type: 3} +--- !u!1 &1265180409 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1265180410} + - component: {fileID: 1265180411} + m_Layer: 0 + m_Name: DungeonManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1265180410 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1265180409} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.49163482, y: 4.3567705, z: 100} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1265180411 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1265180409} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a54eae7bcc7b1478087ea0ca47ab66aa, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1563455796 GameObject: m_ObjectHideFlags: 0 @@ -747,6 +791,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 100869007658251648, guid: 580c190a426d64bc2adb1771024b893c, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 121765713848253420, guid: 580c190a426d64bc2adb1771024b893c, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -947,6 +995,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 1960125369243707596, guid: 580c190a426d64bc2adb1771024b893c, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2025439445525780713, guid: 580c190a426d64bc2adb1771024b893c, type: 3} propertyPath: m_AnchorMax.y value: 0 diff --git a/client/Assets/Scenes/DungeonSettlement.unity b/client/Assets/Scenes/DungeonSettlement.unity index 47f65cf7..49e370f7 100644 --- a/client/Assets/Scenes/DungeonSettlement.unity +++ b/client/Assets/Scenes/DungeonSettlement.unity @@ -123,82 +123,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &14746979 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 14746980} - - component: {fileID: 14746982} - - component: {fileID: 14746981} - m_Layer: 0 - m_Name: Background - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &14746980 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 14746979} - 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: 934873601} - 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 &14746981 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 14746979} - 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.09803922, g: 0.10980392, b: 0.11764706, 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 &14746982 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 14746979} - m_CullTransparentMesh: 1 --- !u!1 &105186692 GameObject: m_ObjectHideFlags: 0 @@ -670,7 +594,7 @@ RectTransform: - {fileID: 246556280} - {fileID: 646895274} m_Father: {fileID: 442142762} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1211,217 +1135,6 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 5341647534015625711, guid: 580c190a426d64bc2adb1771024b893c, type: 3} m_PrefabInstance: {fileID: 442142761} m_PrefabAsset: {fileID: 0} ---- !u!1001 &514234976 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 442142762} - m_Modifications: - - target: {fileID: 181886357402340045, guid: 80a0e36580b14449684c7d9d960c6ba2, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 181886357402340045, guid: 80a0e36580b14449684c7d9d960c6ba2, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 181886357402340045, guid: 80a0e36580b14449684c7d9d960c6ba2, type: 3} - propertyPath: m_SizeDelta.x - value: 128 - objectReference: {fileID: 0} - - target: {fileID: 181886357402340045, guid: 80a0e36580b14449684c7d9d960c6ba2, type: 3} - propertyPath: m_AnchoredPosition.x - value: 328.34338 - objectReference: {fileID: 0} - - target: {fileID: 608112785236227938, guid: 80a0e36580b14449684c7d9d960c6ba2, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 608112785236227938, guid: 80a0e36580b14449684c7d9d960c6ba2, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 514234978} - - target: {fileID: 608112785236227938, guid: 80a0e36580b14449684c7d9d960c6ba2, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: SetActive - objectReference: {fileID: 0} - - target: {fileID: 608112785236227938, guid: 80a0e36580b14449684c7d9d960c6ba2, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: UnityEngine.GameObject, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 635339837761848188, guid: 80a0e36580b14449684c7d9d960c6ba2, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 635339837761848188, guid: 80a0e36580b14449684c7d9d960c6ba2, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 635339837761848188, guid: 80a0e36580b14449684c7d9d960c6ba2, type: 3} - propertyPath: m_SizeDelta.x - value: 328.34338 - objectReference: {fileID: 0} - - target: {fileID: 1557802627527714772, guid: 80a0e36580b14449684c7d9d960c6ba2, type: 3} - propertyPath: m_text - value: AFK Rewards - objectReference: {fileID: 0} - - target: {fileID: 1680747253947817835, guid: 80a0e36580b14449684c7d9d960c6ba2, type: 3} - propertyPath: m_AnchorMin.y - value: 0.3 - objectReference: {fileID: 0} - - target: {fileID: 1680747253947817835, guid: 80a0e36580b14449684c7d9d960c6ba2, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1680747253947817835, guid: 80a0e36580b14449684c7d9d960c6ba2, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1880474394802326500, guid: 80a0e36580b14449684c7d9d960c6ba2, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1880474394802326500, guid: 80a0e36580b14449684c7d9d960c6ba2, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1880474394802326500, guid: 80a0e36580b14449684c7d9d960c6ba2, type: 3} - propertyPath: m_RootOrder - value: 8 - objectReference: {fileID: 0} - - target: {fileID: 1880474394802326500, guid: 80a0e36580b14449684c7d9d960c6ba2, type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1880474394802326500, guid: 80a0e36580b14449684c7d9d960c6ba2, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1880474394802326500, guid: 80a0e36580b14449684c7d9d960c6ba2, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1880474394802326500, guid: 80a0e36580b14449684c7d9d960c6ba2, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1880474394802326500, guid: 80a0e36580b14449684c7d9d960c6ba2, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1880474394802326500, guid: 80a0e36580b14449684c7d9d960c6ba2, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1880474394802326500, guid: 80a0e36580b14449684c7d9d960c6ba2, type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1880474394802326500, guid: 80a0e36580b14449684c7d9d960c6ba2, type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1880474394802326500, guid: 80a0e36580b14449684c7d9d960c6ba2, type: 3} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1880474394802326500, guid: 80a0e36580b14449684c7d9d960c6ba2, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1880474394802326500, guid: 80a0e36580b14449684c7d9d960c6ba2, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1880474394802326500, guid: 80a0e36580b14449684c7d9d960c6ba2, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1880474394802326500, guid: 80a0e36580b14449684c7d9d960c6ba2, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1880474394802326500, guid: 80a0e36580b14449684c7d9d960c6ba2, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1880474394802326500, guid: 80a0e36580b14449684c7d9d960c6ba2, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1880474394802326500, guid: 80a0e36580b14449684c7d9d960c6ba2, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1880474394802326500, guid: 80a0e36580b14449684c7d9d960c6ba2, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1880474394802326500, guid: 80a0e36580b14449684c7d9d960c6ba2, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1880474394802326500, guid: 80a0e36580b14449684c7d9d960c6ba2, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1880474394802326500, guid: 80a0e36580b14449684c7d9d960c6ba2, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1880474394802326500, guid: 80a0e36580b14449684c7d9d960c6ba2, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1880474394802326507, guid: 80a0e36580b14449684c7d9d960c6ba2, type: 3} - propertyPath: m_Name - value: AFKRewardsPopup - objectReference: {fileID: 0} - - target: {fileID: 1880474394802326507, guid: 80a0e36580b14449684c7d9d960c6ba2, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6315745947149158284, guid: 80a0e36580b14449684c7d9d960c6ba2, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7466081045049473760, guid: 80a0e36580b14449684c7d9d960c6ba2, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7909728445587250118, guid: 80a0e36580b14449684c7d9d960c6ba2, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7909728445587250118, guid: 80a0e36580b14449684c7d9d960c6ba2, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7909728445587250118, guid: 80a0e36580b14449684c7d9d960c6ba2, type: 3} - propertyPath: m_SizeDelta.x - value: 328.34338 - objectReference: {fileID: 0} - - target: {fileID: 7909728445587250118, guid: 80a0e36580b14449684c7d9d960c6ba2, type: 3} - propertyPath: m_AnchoredPosition.x - value: 456.34338 - objectReference: {fileID: 0} - - target: {fileID: 8847350261365432205, guid: 80a0e36580b14449684c7d9d960c6ba2, type: 3} - propertyPath: m_text - value: CLAIM - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 80a0e36580b14449684c7d9d960c6ba2, type: 3} ---- !u!224 &514234977 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 202579903054821501, guid: 80a0e36580b14449684c7d9d960c6ba2, type: 3} - m_PrefabInstance: {fileID: 514234976} - m_PrefabAsset: {fileID: 0} ---- !u!1 &514234978 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1880474394802326507, guid: 80a0e36580b14449684c7d9d960c6ba2, type: 3} - m_PrefabInstance: {fileID: 514234976} - m_PrefabAsset: {fileID: 0} --- !u!1 &611248004 GameObject: m_ObjectHideFlags: 0 @@ -1668,7 +1381,7 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &934873600 +--- !u!1 &1008975934 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1676,61 +1389,58 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 934873601} - - component: {fileID: 934873603} - - component: {fileID: 934873602} + - component: {fileID: 1008975935} + - component: {fileID: 1008975937} + - component: {fileID: 1008975936} m_Layer: 0 - m_Name: Supplies + m_Name: Background m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &934873601 +--- !u!224 &1008975935 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 934873600} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 1008975934} + 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: 1 - m_Children: - - {fileID: 14746980} - - {fileID: 2117596308} - - {fileID: 1328482320} - m_Father: {fileID: 514234977} - m_RootOrder: 1 + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 105186693} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 80} - m_SizeDelta: {x: 200, y: 270} + 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 &934873602 +--- !u!114 &1008975936 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 934873600} + m_GameObject: {fileID: 1008975934} 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_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: 21300000, guid: f1542cf5e4ce3424da87a5f60f7c4fca, type: 3} - m_Type: 1 + m_Sprite: {fileID: 0} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1739,92 +1449,16 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!222 &934873603 +--- !u!222 &1008975937 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 934873600} + m_GameObject: {fileID: 1008975934} m_CullTransparentMesh: 1 ---- !u!1 &1008975934 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1008975935} - - component: {fileID: 1008975937} - - component: {fileID: 1008975936} - m_Layer: 0 - m_Name: Background - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1008975935 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1008975934} - 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: 105186693} - 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 &1008975936 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1008975934} - 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 &1008975937 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1008975934} - m_CullTransparentMesh: 1 ---- !u!1001 &1113743643 -PrefabInstance: +--- !u!1001 &1113743643 +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: @@ -2237,141 +1871,6 @@ GameObject: m_CorrespondingSourceObject: {fileID: 8811879872254460255, guid: b00fb03a1acae45d3aefc817547b517c, type: 3} m_PrefabInstance: {fileID: 1279880157} m_PrefabAsset: {fileID: 0} ---- !u!1 &1328482319 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1328482320} - - component: {fileID: 1328482322} - - component: {fileID: 1328482321} - m_Layer: 0 - m_Name: Quantity - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1328482320 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1328482319} - 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: 934873601} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 25} - m_SizeDelta: {x: 200, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1328482321 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1328482319} - 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: 0 (0/m) - 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: 32 - m_fontSizeBase: 32 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - 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: 1 - 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: 2.1235085, y: 0, z: 1.613411, w: 8.376417} - 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 &1328482322 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1328482319} - m_CullTransparentMesh: 1 --- !u!1 &1404834014 GameObject: m_ObjectHideFlags: 0 @@ -2405,9 +1904,11 @@ MonoBehaviour: blueprintsLevelUpCost: {fileID: 246556281} suppliesAfkRewardRate: {fileID: 2015372940} dungeonSettlementLevel: {fileID: 1874272259} - confirmPopUp: {fileID: 514234978} + afkRewardsPopUp: {fileID: 0} insufficientCurrencyPopup: {fileID: 1915293362} levelUpButton: {fileID: 1279880158} + afkRewardDetailUI: {fileID: 8994119409624720458, guid: 3b9fbe7b7c41c42d3a2ae19ce5c15654, type: 3} + afkRewardsContainer: {fileID: 0} --- !u!4 &1404834016 Transform: m_ObjectHideFlags: 0 @@ -3072,378 +2573,3 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &2117596307 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2117596308} - - component: {fileID: 2117596310} - - component: {fileID: 2117596309} - m_Layer: 0 - m_Name: ImageSlot - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2117596308 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2117596307} - 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: 934873601} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.3} - m_AnchorMax: {x: 1, y: 0.9} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 1} ---- !u!114 &2117596309 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2117596307} - 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: 0051cf6193c6749e7ab7cef8a48fcf3b, type: 3} - m_Type: 0 - m_PreserveAspect: 1 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &2117596310 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2117596307} - m_CullTransparentMesh: 1 ---- !u!82 &2935167801136218972 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2992152924088262038} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: 99d914c35a138408d9ddad4994b1646a, type: 3} - m_PlayOnAwake: 0 - m_Volume: 0.2 - m_Pitch: 1 - Loop: 0 - Mute: 0 - Spatialize: 0 - SpatializePostEffects: 0 - Priority: 128 - DopplerLevel: 1 - MinDistance: 1 - MaxDistance: 500 - Pan2D: 0 - rolloffMode: 0 - BypassEffects: 0 - BypassListenerEffects: 0 - BypassReverbZones: 0 - rolloffCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - panLevelCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - spreadCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - reverbZoneMixCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 ---- !u!1 &2992152924088262038 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7187338879178450150} - - component: {fileID: 2935167801136218972} - m_Layer: 0 - m_Name: ClickSFX - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &5680396890376068739 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7414010532761426477} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 0 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 0} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 514234978} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 1 - m_CallState: 2 ---- !u!4 &7187338879178450150 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2992152924088262038} - 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: 1 - m_Children: [] - m_Father: {fileID: 7414010532761426478} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &7414010531655454000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7414010531655454014} - 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: 1912824793, guid: a304a4d492f1e9b4cae12eeddfa6dad8, type: 3} - m_Type: 0 - m_PreserveAspect: 1 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &7414010531655454001 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7414010531655454014} - m_CullTransparentMesh: 1 ---- !u!1 &7414010531655454014 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7414010531655454015} - - component: {fileID: 7414010531655454001} - - component: {fileID: 7414010531655454000} - m_Layer: 5 - m_Name: Icon - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7414010531655454015 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7414010531655454014} - 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: 7414010532761426478} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 200, y: 200} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &7414010532761426477 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7414010532761426478} - - component: {fileID: 5680396890376068739} - m_Layer: 5 - m_Name: ClaimButton - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7414010532761426478 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7414010532761426477} - 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: 7414010531655454015} - - {fileID: 7187338879178450150} - m_Father: {fileID: 442142762} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.175} - m_AnchorMax: {x: 0.5, y: 0.275} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 250, y: 0} - m_Pivot: {x: 0.5, y: 1} diff --git a/client/Assets/Scripts/AfkRewards/KalineTreeManager.cs b/client/Assets/Scripts/AfkRewards/KalineTreeManager.cs index 4967c308..213b373a 100644 --- a/client/Assets/Scripts/AfkRewards/KalineTreeManager.cs +++ b/client/Assets/Scripts/AfkRewards/KalineTreeManager.cs @@ -31,7 +31,7 @@ void Start() public void ShowRewards() { GlobalUserData user = GlobalUserData.Instance; - SocketConnection.Instance.GetAfkRewards(user.User.id, (afkRewards) => + SocketConnection.Instance.GetKalineAfkRewards(user.User.id, (afkRewards) => { foreach (Transform child in afkRewardsContainer.transform) { @@ -51,7 +51,7 @@ public void ShowRewards() public void ClaimRewards() { - SocketConnection.Instance.ClaimAfkRewards(GlobalUserData.Instance.User.id, (userReceived) => + SocketConnection.Instance.ClaimKalineAfkRewards(GlobalUserData.Instance.User.id, (userReceived) => { GlobalUserData userToUpdate = GlobalUserData.Instance; Dictionary currenciesToAdd = new Dictionary(); diff --git a/client/Assets/Scripts/BackendConnection/SocketConnection.cs b/client/Assets/Scripts/BackendConnection/SocketConnection.cs index 29f6283f..ed53de83 100644 --- a/client/Assets/Scripts/BackendConnection/SocketConnection.cs +++ b/client/Assets/Scripts/BackendConnection/SocketConnection.cs @@ -841,15 +841,15 @@ private Dictionary GetLevelCurrencyRewards(Level level) return rewards; } - public void GetAfkRewards(string userId, Action> onAfkRewardsReceived) + public void GetKalineAfkRewards(string userId, Action> onAfkRewardsReceived) { - GetAfkRewards getAfkRewardsRequest = new GetAfkRewards + GetKalineAfkRewards getKalineAfkRewardsRequest = new GetKalineAfkRewards { UserId = userId }; WebSocketRequest request = new WebSocketRequest { - GetAfkRewards = getAfkRewardsRequest + GetKalineAfkRewards = getKalineAfkRewardsRequest }; currentMessageHandler = (data) => AwaitGetAfkRewardsResponse(data, onAfkRewardsReceived); ws.OnMessage += currentMessageHandler; @@ -857,6 +857,23 @@ public void GetAfkRewards(string userId, Action> onAfkRewardsRec SendWebSocketMessage(request); } + public void GetDungeonAfkRewards(string userId, Action> onAfkRewardsReceived) + { + GetDungeonAfkRewards getDungeonAfkRewardsRequest = new GetDungeonAfkRewards + { + UserId = userId + }; + WebSocketRequest request = new WebSocketRequest + { + GetDungeonAfkRewards = getDungeonAfkRewardsRequest + }; + currentMessageHandler = (data) => AwaitGetAfkRewardsResponse(data, onAfkRewardsReceived); + ws.OnMessage += currentMessageHandler; + ws.OnMessage -= OnWebSocketMessage; + SendWebSocketMessage(request); + } + + private void AwaitGetAfkRewardsResponse(byte[] data, Action> onAfkRewardsReceived, Action onError = null) { try @@ -885,15 +902,31 @@ private void AwaitGetAfkRewardsResponse(byte[] data, Action> onA } } - public void ClaimAfkRewards(string userId, Action onAfkRewardsReceived) + public void ClaimKalineAfkRewards(string userId, Action onAfkRewardsReceived) + { + ClaimKalineAfkRewards claimKalineAfkRewardsRequest = new ClaimKalineAfkRewards + { + UserId = userId + }; + WebSocketRequest request = new WebSocketRequest + { + ClaimKalineAfkRewards = claimKalineAfkRewardsRequest + }; + currentMessageHandler = (data) => AwaitClaimAfkRewardsResponse(data, onAfkRewardsReceived); + ws.OnMessage += currentMessageHandler; + ws.OnMessage -= OnWebSocketMessage; + SendWebSocketMessage(request); + } + + public void ClaimDungeonAfkRewards(string userId, Action onAfkRewardsReceived) { - ClaimAfkRewards claimAfkRewardsRequest = new ClaimAfkRewards + ClaimDungeonAfkRewards claimDungeonAfkRewardsRequest = new ClaimDungeonAfkRewards { UserId = userId }; WebSocketRequest request = new WebSocketRequest { - ClaimAfkRewards = claimAfkRewardsRequest + ClaimDungeonAfkRewards = claimDungeonAfkRewardsRequest }; currentMessageHandler = (data) => AwaitClaimAfkRewardsResponse(data, onAfkRewardsReceived); ws.OnMessage += currentMessageHandler; diff --git a/client/Assets/Scripts/Dungeon/DungeonManager.cs b/client/Assets/Scripts/Dungeon/DungeonManager.cs new file mode 100644 index 00000000..b61da4bf --- /dev/null +++ b/client/Assets/Scripts/Dungeon/DungeonManager.cs @@ -0,0 +1,39 @@ +using System.Collections.Generic; +using System.Linq; +using UnityEngine; + +public class DungeonManager : MonoBehaviour +{ + void Start() + { + ClaimRewards(); + } + + private void ClaimRewards() + { + SocketConnection.Instance.ClaimDungeonAfkRewards(GlobalUserData.Instance.User.id, (userReceived) => + { + GlobalUserData userToUpdate = GlobalUserData.Instance; + Dictionary currenciesToAdd = new Dictionary(); + + userReceived.currencies.Select(c => c.Key).ToList().ForEach(c => + { + if (!currenciesToAdd.ContainsKey(c)) + { + currenciesToAdd.Add(c, userReceived.currencies[c] - userToUpdate.GetCurrency(c).Value); + } + }); + userToUpdate.AddCurrencies(currenciesToAdd); + }); + } +} + + + + + + + + + + diff --git a/client/Assets/Scripts/Dungeon/DungeonManager.cs.meta b/client/Assets/Scripts/Dungeon/DungeonManager.cs.meta new file mode 100644 index 00000000..b434f3e3 --- /dev/null +++ b/client/Assets/Scripts/Dungeon/DungeonManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a54eae7bcc7b1478087ea0ca47ab66aa +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/client/Assets/Scripts/Dungeon/DungeonSettlementManager.cs b/client/Assets/Scripts/Dungeon/DungeonSettlementManager.cs index 701b786d..b39ae8c0 100644 --- a/client/Assets/Scripts/Dungeon/DungeonSettlementManager.cs +++ b/client/Assets/Scripts/Dungeon/DungeonSettlementManager.cs @@ -9,7 +9,6 @@ public class DungeonSettlementManager : MonoBehaviour [SerializeField] TMP_Text blueprintsLevelUpCost; [SerializeField] TMP_Text suppliesAfkRewardRate; [SerializeField] TMP_Text dungeonSettlementLevel; - [SerializeField] GameObject confirmPopUp; [SerializeField] GameObject insufficientCurrencyPopup; [SerializeField] GameObject levelUpButton; diff --git a/client/Assets/Scripts/Protobuf/Gateway.pb.cs b/client/Assets/Scripts/Protobuf/Gateway.pb.cs index 3bb07408..a0f50b3e 100644 --- a/client/Assets/Scripts/Protobuf/Gateway.pb.cs +++ b/client/Assets/Scripts/Protobuf/Gateway.pb.cs @@ -24,7 +24,7 @@ public static partial class GatewayReflection { static GatewayReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "Cg1nYXRld2F5LnByb3RvIpUJChBXZWJTb2NrZXRSZXF1ZXN0EhwKCGdldF91", + "Cg1nYXRld2F5LnByb3RvIq8JChBXZWJTb2NrZXRSZXF1ZXN0EhwKCGdldF91", "c2VyGAEgASgLMgguR2V0VXNlckgAEjIKFGdldF91c2VyX2J5X3VzZXJuYW1l", "GAIgASgLMhIuR2V0VXNlckJ5VXNlcm5hbWVIABIiCgtjcmVhdGVfdXNlchgD", "IAEoCzILLkNyZWF0ZVVzZXJIABImCg1nZXRfY2FtcGFpZ25zGAQgASgLMg0u", @@ -39,157 +39,158 @@ static GatewayReflection() { "MgwuVW5lcXVpcEl0ZW1IABIcCghnZXRfaXRlbRgQIAEoCzIILkdldEl0ZW1I", "ABIlCg1sZXZlbF91cF9pdGVtGBEgASgLMgwuTGV2ZWxVcEl0ZW1IABIeCgln", "ZXRfYm94ZXMYEiABKAsyCS5HZXRCb3hlc0gAEhoKB2dldF9ib3gYEyABKAsy", - "By5HZXRCb3hIABIZCgZzdW1tb24YFCABKAsyBy5TdW1tb25IABIpCg9nZXRf", - "YWZrX3Jld2FyZHMYFSABKAsyDi5HZXRBZmtSZXdhcmRzSAASLQoRY2xhaW1f", - "YWZrX3Jld2FyZHMYFiABKAsyEC5DbGFpbUFma1Jld2FyZHNIABJNCiJnZXRf", - "dXNlcl9zdXBlcl9jYW1wYWlnbl9wcm9ncmVzc2VzGBcgASgLMh8uR2V0VXNl", - "clN1cGVyQ2FtcGFpZ25Qcm9ncmVzc2VzSAASMgoUbGV2ZWxfdXBfa2FsaW5l", - "X3RyZWUYGCABKAsyEi5MZXZlbFVwS2FsaW5lVHJlZUgAEjwKGWNsYWltX2R1", - "bmdlb25fYWZrX3Jld2FyZHMYGSABKAsyFy5DbGFpbUR1bmdlb25BZmtSZXdh", - "cmRzSAASQAobbGV2ZWxfdXBfZHVuZ2Vvbl9zZXR0bGVtZW50GBogASgLMhku", - "TGV2ZWxVcER1bmdlb25TZXR0bGVtZW50SAASOwoYcHVyY2hhc2VfZHVuZ2Vv", - "bl91cGdyYWRlGBsgASgLMhcuUHVyY2hhc2VEdW5nZW9uVXBncmFkZUgAEjMK", - "FGdldF9kdW5nZW9uX3VwZ3JhZGVzGBwgASgLMhMuR2V0RHVuZ2VvblVwZ3Jh", - "ZGVzSABCDgoMcmVxdWVzdF90eXBlIhoKB0dldFVzZXISDwoHdXNlcl9pZBgB", - "IAEoCSIlChFHZXRVc2VyQnlVc2VybmFtZRIQCgh1c2VybmFtZRgBIAEoCSIe", - "CgpDcmVhdGVVc2VyEhAKCHVzZXJuYW1lGAEgASgJIh8KDEdldENhbXBhaWdu", - "cxIPCgd1c2VyX2lkGAEgASgJIjMKC0dldENhbXBhaWduEg8KB3VzZXJfaWQY", - "ASABKAkSEwoLY2FtcGFpZ25faWQYAiABKAkiLQoIR2V0TGV2ZWwSDwoHdXNl", - "cl9pZBgBIAEoCRIQCghsZXZlbF9pZBgCIAEoCSIvCgpGaWdodExldmVsEg8K", - "B3VzZXJfaWQYASABKAkSEAoIbGV2ZWxfaWQYAiABKAkiPAoKU2VsZWN0VW5p", - "dBIPCgd1c2VyX2lkGAEgASgJEg8KB3VuaXRfaWQYAiABKAkSDAoEc2xvdBgD", - "IAEoDSIwCgxVbnNlbGVjdFVuaXQSDwoHdXNlcl9pZBgBIAEoCRIPCgd1bml0", - "X2lkGAIgASgJIi8KC0xldmVsVXBVbml0Eg8KB3VzZXJfaWQYASABKAkSDwoH", - "dW5pdF9pZBgCIAEoCSIuCgpUaWVyVXBVbml0Eg8KB3VzZXJfaWQYASABKAkS", - "DwoHdW5pdF9pZBgCIAEoCSJICghGdXNlVW5pdBIPCgd1c2VyX2lkGAEgASgJ", - "Eg8KB3VuaXRfaWQYAiABKAkSGgoSY29uc3VtZWRfdW5pdHNfaWRzGAMgAygJ", - "Ij4KCUVxdWlwSXRlbRIPCgd1c2VyX2lkGAEgASgJEg8KB2l0ZW1faWQYAiAB", - "KAkSDwoHdW5pdF9pZBgDIAEoCSIvCgtVbmVxdWlwSXRlbRIPCgd1c2VyX2lk", - "GAEgASgJEg8KB2l0ZW1faWQYAiABKAkiKwoHR2V0SXRlbRIPCgd1c2VyX2lk", - "GAEgASgJEg8KB2l0ZW1faWQYAiABKAkiLwoLTGV2ZWxVcEl0ZW0SDwoHdXNl", - "cl9pZBgBIAEoCRIPCgdpdGVtX2lkGAIgASgJIiAKDUdldEFma1Jld2FyZHMS", - "DwoHdXNlcl9pZBgBIAEoCSIiCg9DbGFpbUFma1Jld2FyZHMSDwoHdXNlcl9p", - "ZBgBIAEoCSIbCghHZXRCb3hlcxIPCgd1c2VyX2lkGAEgASgJIhgKBkdldEJv", - "eBIOCgZib3hfaWQYASABKAkiKQoGU3VtbW9uEg8KB3VzZXJfaWQYASABKAkS", - "DgoGYm94X2lkGAIgASgJIjEKHkdldFVzZXJTdXBlckNhbXBhaWduUHJvZ3Jl", - "c3NlcxIPCgd1c2VyX2lkGAEgASgJIiQKEUxldmVsVXBLYWxpbmVUcmVlEg8K", - "B3VzZXJfaWQYASABKAkiKQoWQ2xhaW1EdW5nZW9uQWZrUmV3YXJkcxIPCgd1", - "c2VyX2lkGAEgASgJIisKGExldmVsVXBEdW5nZW9uU2V0dGxlbWVudBIPCgd1", - "c2VyX2lkGAEgASgJIj0KFlB1cmNoYXNlRHVuZ2VvblVwZ3JhZGUSDwoHdXNl", - "cl9pZBgBIAEoCRISCgp1cGdyYWRlX2lkGAIgASgJIiUKEkdldER1bmdlb25V", - "cGdyYWRlcxIPCgd1c2VyX2lkGAEgASgJIqYEChFXZWJTb2NrZXRSZXNwb25z", - "ZRIVCgR1c2VyGAEgASgLMgUuVXNlckgAEhUKBHVuaXQYAiABKAsyBS5Vbml0", - "SAASFwoFdW5pdHMYAyABKAsyBi5Vbml0c0gAEjEKE3VuaXRfYW5kX2N1cnJl", - "bmNpZXMYBCABKAsyEi5Vbml0QW5kQ3VycmVuY2llc0gAEhUKBGl0ZW0YBSAB", - "KAsyBS5JdGVtSAASHwoJY2FtcGFpZ25zGAYgASgLMgouQ2FtcGFpZ25zSAAS", - "HQoIY2FtcGFpZ24YByABKAsyCS5DYW1wYWlnbkgAEhcKBWxldmVsGAggASgL", - "MgYuTGV2ZWxIABImCg1iYXR0bGVfcmVzdWx0GAkgASgLMg0uQmF0dGxlUmVz", - "dWx0SAASFwoFZXJyb3IYCiABKAsyBi5FcnJvckgAEhcKBWJveGVzGAsgASgL", - "MgYuQm94ZXNIABITCgNib3gYDCABKAsyBC5Cb3hIABIlCg11c2VyX2FuZF91", - "bml0GA0gASgLMgwuVXNlckFuZFVuaXRIABIiCgthZmtfcmV3YXJkcxgOIAEo", - "CzILLkFma1Jld2FyZHNIABI9ChlzdXBlcl9jYW1wYWlnbl9wcm9ncmVzc2Vz", - "GA8gASgLMhguU3VwZXJDYW1wYWlnblByb2dyZXNzZXNIABIdCgh1cGdyYWRl", - "cxgQIAEoCzIJLlVwZ3JhZGVzSABCDwoNcmVzcG9uc2VfdHlwZSL+AQoEVXNl", - "chIKCgJpZBgBIAEoCRIQCgh1c2VybmFtZRgCIAEoCRINCgVsZXZlbBgDIAEo", - "BBISCgpleHBlcmllbmNlGAQgASgEEiEKCmN1cnJlbmNpZXMYByADKAsyDS5V", - "c2VyQ3VycmVuY3kSFAoFdW5pdHMYCCADKAsyBS5Vbml0EhQKBWl0ZW1zGAkg", - "AygLMgUuSXRlbRIrChFrYWxpbmVfdHJlZV9sZXZlbBgKIAEoCzIQLkthbGlu", - "ZVRyZWVMZXZlbBI5ChhkdW5nZW9uX3NldHRsZW1lbnRfbGV2ZWwYCyABKAsy", - "Fy5EdW5nZW9uU2V0dGxlbWVudExldmVsIq0BCg9LYWxpbmVUcmVlTGV2ZWwS", - "CgoCaWQYASABKAkSDQoFbGV2ZWwYAiABKAQSIAoYZmVydGlsaXplcl9sZXZl", - "bF91cF9jb3N0GAMgASgEEhoKEmdvbGRfbGV2ZWxfdXBfY29zdBgEIAEoBBIX", - "Cg91bmxvY2tfZmVhdHVyZXMYBSADKAkSKAoQYWZrX3Jld2FyZF9yYXRlcxgG", - "IAMoCzIOLkFma1Jld2FyZFJhdGUixgEKFkR1bmdlb25TZXR0bGVtZW50TGV2", - "ZWwSCgoCaWQYASABKAkSDQoFbGV2ZWwYAiABKAQSJQoObGV2ZWxfdXBfY29z", - "dHMYAyADKAsyDS5DdXJyZW5jeUNvc3QSEwoLbWF4X2R1bmdlb24YBCABKAQS", - "FQoNbWF4X2ZhY3Rpb25hbBgFIAEoBBIUCgxzdXBwbHlfbGltaXQYBiABKAQS", - "KAoQYWZrX3Jld2FyZF9yYXRlcxgHIAMoCzIOLkFma1Jld2FyZFJhdGUiVAoX", - "U3VwZXJDYW1wYWlnblByb2dyZXNzZXMSOQoZc3VwZXJfY2FtcGFpZ25fcHJv", - "Z3Jlc3NlcxgBIAMoCzIWLlN1cGVyQ2FtcGFpZ25Qcm9ncmVzcyJsChVTdXBl", - "ckNhbXBhaWduUHJvZ3Jlc3MSDwoHdXNlcl9pZBgBIAEoCRITCgtjYW1wYWln", - "bl9pZBgCIAEoCRIQCghsZXZlbF9pZBgDIAEoCRIbChNzdXBlcl9jYW1wYWln", - "bl9uYW1lGAQgASgJIl4KDUFma1Jld2FyZFJhdGUSHAoUa2FsaW5lX3RyZWVf", - "bGV2ZWxfaWQYASABKAkSGwoIY3VycmVuY3kYAiABKAsyCS5DdXJyZW5jeRIS", - "CgpkYWlseV9yYXRlGAMgASgCIjsKDFVzZXJDdXJyZW5jeRIbCghjdXJyZW5j", - "eRgBIAEoCzIJLkN1cnJlbmN5Eg4KBmFtb3VudBgCIAEoDSIYCghDdXJyZW5j", - "eRIMCgRuYW1lGAEgASgJIr4BCgRVbml0EgoKAmlkGAEgASgJEg0KBWxldmVs", - "GAIgASgNEgwKBHRpZXIYAyABKA0SDAoEcmFuaxgEIAEoDRIQCghzZWxlY3Rl", - "ZBgFIAEoCBIMCgRzbG90GAYgASgNEhkKEWNhbXBhaWduX2xldmVsX2lkGAcg", - "ASgJEg8KB3VzZXJfaWQYCCABKAkSHQoJY2hhcmFjdGVyGAkgASgLMgouQ2hh", - "cmFjdGVyEhQKBWl0ZW1zGAogAygLMgUuSXRlbSIdCgVVbml0cxIUCgV1bml0", - "cxgBIAMoCzIFLlVuaXQiTgoRVW5pdEFuZEN1cnJlbmNpZXMSEwoEdW5pdBgB", - "IAEoCzIFLlVuaXQSJAoNdXNlcl9jdXJyZW5jeRgCIAMoCzINLlVzZXJDdXJy", - "ZW5jeSJLCglDaGFyYWN0ZXISDgoGYWN0aXZlGAEgASgIEgwKBG5hbWUYAiAB", - "KAkSDwoHZmFjdGlvbhgDIAEoCRIPCgdxdWFsaXR5GAQgASgNImQKBEl0ZW0S", - "CgoCaWQYASABKAkSDQoFbGV2ZWwYAiABKA0SHwoIdGVtcGxhdGUYAyABKAsy", - "DS5JdGVtVGVtcGxhdGUSDwoHdXNlcl9pZBgEIAEoCRIPCgd1bml0X2lkGAUg", - "ASgJIjYKDEl0ZW1UZW1wbGF0ZRIKCgJpZBgBIAEoCRIMCgRuYW1lGAIgASgJ", - "EgwKBHR5cGUYAyABKAkiKQoJQ2FtcGFpZ25zEhwKCWNhbXBhaWducxgBIAMo", - "CzIJLkNhbXBhaWduImQKCENhbXBhaWduEgoKAmlkGAEgASgJEhsKE3N1cGVy", - "X2NhbXBhaWduX25hbWUYAiABKAkSFwoPY2FtcGFpZ25fbnVtYmVyGAMgASgN", - "EhYKBmxldmVscxgEIAMoCzIGLkxldmVsIpoBCgVMZXZlbBIKCgJpZBgBIAEo", - "CRITCgtjYW1wYWlnbl9pZBgCIAEoCRIUCgxsZXZlbF9udW1iZXIYAyABKA0S", - "FAoFdW5pdHMYBCADKAsyBS5Vbml0EikKEGN1cnJlbmN5X3Jld2FyZHMYBSAD", - "KAsyDy5DdXJyZW5jeVJld2FyZBIZChFleHBlcmllbmNlX3Jld2FyZBgGIAEo", - "DSI9Cg5DdXJyZW5jeVJld2FyZBIbCghjdXJyZW5jeRgBIAEoCzIJLkN1cnJl", - "bmN5Eg4KBmFtb3VudBgDIAEoBCItCgpBZmtSZXdhcmRzEh8KC2Fma19yZXdh", - "cmRzGAEgAygLMgouQWZrUmV3YXJkIjgKCUFma1Jld2FyZBIbCghjdXJyZW5j", - "eRgBIAEoCzIJLkN1cnJlbmN5Eg4KBmFtb3VudBgCIAEoBCIXCgVFcnJvchIO", - "CgZyZWFzb24YASABKAkiHAoFQm94ZXMSEwoFYm94ZXMYASADKAsyBC5Cb3gi", - "hwEKA0JveBIKCgJpZBgBIAEoCRIMCgRuYW1lGAIgASgJEhMKC2Rlc2NyaXB0", - "aW9uGAMgASgJEhAKCGZhY3Rpb25zGAQgAygJEiIKDHJhbmtfd2VpZ2h0cxgF", - "IAMoCzIMLlJhbmtXZWlnaHRzEhsKBGNvc3QYBiADKAsyDS5DdXJyZW5jeUNv", - "c3QiKwoLUmFua1dlaWdodHMSDAoEcmFuaxgBIAEoBRIOCgZ3ZWlnaHQYAiAB", - "KAUiOwoMQ3VycmVuY3lDb3N0EhsKCGN1cnJlbmN5GAEgASgLMgkuQ3VycmVu", - "Y3kSDgoGYW1vdW50GAIgASgFIjcKC1VzZXJBbmRVbml0EhMKBHVzZXIYASAB", - "KAsyBS5Vc2VyEhMKBHVuaXQYAiABKAsyBS5Vbml0IjEKBlVubG9jaxIMCgRu", - "YW1lGAEgASgJEhkKB3VwZ3JhZGUYAiABKAsyCC5VcGdyYWRlIm4KB1VwZ3Jh", - "ZGUSDAoEbmFtZRgBIAEoCRITCgtkZXNjcmlwdGlvbhgCIAEoCRINCgVncm91", - "cBgDIAEoBRIbCgRjb3N0GAQgAygLMg0uQ3VycmVuY3lDb3N0EhQKBWJ1ZmZz", - "GAUgAygLMgUuQnVmZiImCghVcGdyYWRlcxIaCgh1cGdyYWRlcxgBIAMoCzII", - "LlVwZ3JhZGUiOwoEQnVmZhIRCglhdHRyaWJ1dGUYASABKAkSDQoFdmFsdWUY", - "AiABKAISEQoJb3BlcmF0aW9uGAMgASgJIlMKDEJhdHRsZVJlc3VsdBIdCg1p", - "bml0aWFsX3N0YXRlGAEgASgLMgYuU3RhdGUSFAoFc3RlcHMYAiADKAsyBS5T", - "dGVwEg4KBnJlc3VsdBgDIAEoCSIjCgVTdGF0ZRIaCgV1bml0cxgBIAMoCzIL", - "LkJhdHRsZVVuaXQiagoKQmF0dGxlVW5pdBIKCgJpZBgBIAEoCRIOCgZoZWFs", - "dGgYAiABKAUSDgoGZW5lcmd5GAMgASgFEgwKBHNsb3QYBCABKAUSFAoMY2hh", - "cmFjdGVyX2lkGAUgASgJEgwKBHRlYW0YBiABKAUiNQoEU3RlcBITCgtzdGVw", - "X251bWJlchgBIAEoBRIYCgdhY3Rpb25zGAIgAygLMgcuQWN0aW9uIv4CCgZB", - "Y3Rpb24SJAoMc2tpbGxfYWN0aW9uGAEgASgLMgwuU2tpbGxBY3Rpb25IABIu", - "ChFtb2RpZmllcl9yZWNlaXZlZBgCIAEoCzIRLk1vZGlmaWVyUmVjZWl2ZWRI", - "ABIkCgx0YWdfcmVjZWl2ZWQYAyABKAsyDC5UYWdSZWNlaXZlZEgAEiwKEG1v", - "ZGlmaWVyX2V4cGlyZWQYBCABKAsyEC5Nb2RpZmllckV4cGlyZWRIABIiCgt0", - "YWdfZXhwaXJlZBgFIAEoCzILLlRhZ0V4cGlyZWRIABIXCgVkZWF0aBgGIAEo", - "CzIGLkRlYXRoSAASMAoSZXhlY3V0aW9uX3JlY2VpdmVkGAcgASgLMhIuRXhl", - "Y3V0aW9uUmVjZWl2ZWRIABIkCgxlbmVyZ3lfcmVnZW4YCCABKAsyDC5FbmVy", - "Z3lSZWdlbkgAEiYKDXN0YXRfb3ZlcnJpZGUYCSABKAsyDS5TdGF0T3ZlcnJp", - "ZGVIAEINCgthY3Rpb25fdHlwZSIzCgxTdGF0QWZmZWN0ZWQSEwoEc3RhdBgB", - "IAEoDjIFLlN0YXQSDgoGYW1vdW50GAIgASgCInMKC1NraWxsQWN0aW9uEhEK", - "CWNhc3Rlcl9pZBgBIAEoCRISCgp0YXJnZXRfaWRzGAIgAygJEhAKCHNraWxs", - "X2lkGAMgASgJEisKEXNraWxsX2FjdGlvbl90eXBlGAQgASgOMhAuU2tpbGxB", - "Y3Rpb25UeXBlIkwKEUV4ZWN1dGlvblJlY2VpdmVkEhEKCXRhcmdldF9pZBgB", - "IAEoCRIkCg1zdGF0X2FmZmVjdGVkGAIgASgLMg0uU3RhdEFmZmVjdGVkInAK", - "EE1vZGlmaWVyUmVjZWl2ZWQSEAoIc2tpbGxfaWQYASABKAkSEQoJdGFyZ2V0", - "X2lkGAIgASgJEiQKDXN0YXRfYWZmZWN0ZWQYAyABKAsyDS5TdGF0QWZmZWN0", - "ZWQSEQoJb3BlcmF0aW9uGAQgASgJIj8KC1RhZ1JlY2VpdmVkEhAKCHNraWxs", - "X2lkGAEgASgJEhEKCXRhcmdldF9pZBgCIAEoCRILCgN0YWcYAyABKAkibwoP", - "TW9kaWZpZXJFeHBpcmVkEhAKCHNraWxsX2lkGAEgASgJEhEKCXRhcmdldF9p", - "ZBgCIAEoCRIkCg1zdGF0X2FmZmVjdGVkGAMgASgLMg0uU3RhdEFmZmVjdGVk", - "EhEKCW9wZXJhdGlvbhgEIAEoCSI+CgpUYWdFeHBpcmVkEhAKCHNraWxsX2lk", - "GAEgASgJEhEKCXRhcmdldF9pZBgCIAEoCRILCgN0YWcYAyABKAkiGAoFRGVh", - "dGgSDwoHdW5pdF9pZBgBIAEoCSJCCgtFbmVyZ3lSZWdlbhIRCgl0YXJnZXRf", - "aWQYASABKAkSEAoIc2tpbGxfaWQYAiABKAkSDgoGYW1vdW50GAMgASgCIkcK", - "DFN0YXRPdmVycmlkZRIRCgl0YXJnZXRfaWQYASABKAkSJAoNc3RhdF9hZmZl", - "Y3RlZBgCIAEoCzINLlN0YXRBZmZlY3RlZCpbCg9Ta2lsbEFjdGlvblR5cGUS", - "EwoPQU5JTUFUSU9OX1NUQVJUEAASEgoORUZGRUNUX1RSSUdHRVIQARIOCgpF", - "RkZFQ1RfSElUEAISDwoLRUZGRUNUX01JU1MQAypYCgRTdGF0EgoKBkhFQUxU", - "SBAAEgoKBkVORVJHWRABEgoKBkFUVEFDSxACEgsKB0RFRkVOU0UQAxIUChBE", - "QU1BR0VfUkVEVUNUSU9OEAQSCQoFU1BFRUQQBUIUqgIRUHJvdG9idWYuTWVz", - "c2FnZXNiBnByb3RvMw==")); + "By5HZXRCb3hIABIZCgZzdW1tb24YFCABKAsyBy5TdW1tb25IABI2ChZnZXRf", + "a2FsaW5lX2Fma19yZXdhcmRzGBUgASgLMhQuR2V0S2FsaW5lQWZrUmV3YXJk", + "c0gAEjoKGGNsYWltX2thbGluZV9hZmtfcmV3YXJkcxgWIAEoCzIWLkNsYWlt", + "S2FsaW5lQWZrUmV3YXJkc0gAEk0KImdldF91c2VyX3N1cGVyX2NhbXBhaWdu", + "X3Byb2dyZXNzZXMYFyABKAsyHy5HZXRVc2VyU3VwZXJDYW1wYWlnblByb2dy", + "ZXNzZXNIABIyChRsZXZlbF91cF9rYWxpbmVfdHJlZRgYIAEoCzISLkxldmVs", + "VXBLYWxpbmVUcmVlSAASPAoZY2xhaW1fZHVuZ2Vvbl9hZmtfcmV3YXJkcxgZ", + "IAEoCzIXLkNsYWltRHVuZ2VvbkFma1Jld2FyZHNIABJAChtsZXZlbF91cF9k", + "dW5nZW9uX3NldHRsZW1lbnQYGiABKAsyGS5MZXZlbFVwRHVuZ2VvblNldHRs", + "ZW1lbnRIABI7ChhwdXJjaGFzZV9kdW5nZW9uX3VwZ3JhZGUYGyABKAsyFy5Q", + "dXJjaGFzZUR1bmdlb25VcGdyYWRlSAASMwoUZ2V0X2R1bmdlb25fdXBncmFk", + "ZXMYHCABKAsyEy5HZXREdW5nZW9uVXBncmFkZXNIAEIOCgxyZXF1ZXN0X3R5", + "cGUiGgoHR2V0VXNlchIPCgd1c2VyX2lkGAEgASgJIiUKEUdldFVzZXJCeVVz", + "ZXJuYW1lEhAKCHVzZXJuYW1lGAEgASgJIh4KCkNyZWF0ZVVzZXISEAoIdXNl", + "cm5hbWUYASABKAkiHwoMR2V0Q2FtcGFpZ25zEg8KB3VzZXJfaWQYASABKAki", + "MwoLR2V0Q2FtcGFpZ24SDwoHdXNlcl9pZBgBIAEoCRITCgtjYW1wYWlnbl9p", + "ZBgCIAEoCSItCghHZXRMZXZlbBIPCgd1c2VyX2lkGAEgASgJEhAKCGxldmVs", + "X2lkGAIgASgJIi8KCkZpZ2h0TGV2ZWwSDwoHdXNlcl9pZBgBIAEoCRIQCghs", + "ZXZlbF9pZBgCIAEoCSI8CgpTZWxlY3RVbml0Eg8KB3VzZXJfaWQYASABKAkS", + "DwoHdW5pdF9pZBgCIAEoCRIMCgRzbG90GAMgASgNIjAKDFVuc2VsZWN0VW5p", + "dBIPCgd1c2VyX2lkGAEgASgJEg8KB3VuaXRfaWQYAiABKAkiLwoLTGV2ZWxV", + "cFVuaXQSDwoHdXNlcl9pZBgBIAEoCRIPCgd1bml0X2lkGAIgASgJIi4KClRp", + "ZXJVcFVuaXQSDwoHdXNlcl9pZBgBIAEoCRIPCgd1bml0X2lkGAIgASgJIkgK", + "CEZ1c2VVbml0Eg8KB3VzZXJfaWQYASABKAkSDwoHdW5pdF9pZBgCIAEoCRIa", + "ChJjb25zdW1lZF91bml0c19pZHMYAyADKAkiPgoJRXF1aXBJdGVtEg8KB3Vz", + "ZXJfaWQYASABKAkSDwoHaXRlbV9pZBgCIAEoCRIPCgd1bml0X2lkGAMgASgJ", + "Ii8KC1VuZXF1aXBJdGVtEg8KB3VzZXJfaWQYASABKAkSDwoHaXRlbV9pZBgC", + "IAEoCSIrCgdHZXRJdGVtEg8KB3VzZXJfaWQYASABKAkSDwoHaXRlbV9pZBgC", + "IAEoCSIvCgtMZXZlbFVwSXRlbRIPCgd1c2VyX2lkGAEgASgJEg8KB2l0ZW1f", + "aWQYAiABKAkiJgoTR2V0S2FsaW5lQWZrUmV3YXJkcxIPCgd1c2VyX2lkGAEg", + "ASgJIigKFUNsYWltS2FsaW5lQWZrUmV3YXJkcxIPCgd1c2VyX2lkGAEgASgJ", + "IhsKCEdldEJveGVzEg8KB3VzZXJfaWQYASABKAkiGAoGR2V0Qm94Eg4KBmJv", + "eF9pZBgBIAEoCSIpCgZTdW1tb24SDwoHdXNlcl9pZBgBIAEoCRIOCgZib3hf", + "aWQYAiABKAkiMQoeR2V0VXNlclN1cGVyQ2FtcGFpZ25Qcm9ncmVzc2VzEg8K", + "B3VzZXJfaWQYASABKAkiJAoRTGV2ZWxVcEthbGluZVRyZWUSDwoHdXNlcl9p", + "ZBgBIAEoCSIpChZDbGFpbUR1bmdlb25BZmtSZXdhcmRzEg8KB3VzZXJfaWQY", + "ASABKAkiKwoYTGV2ZWxVcER1bmdlb25TZXR0bGVtZW50Eg8KB3VzZXJfaWQY", + "ASABKAkiPQoWUHVyY2hhc2VEdW5nZW9uVXBncmFkZRIPCgd1c2VyX2lkGAEg", + "ASgJEhIKCnVwZ3JhZGVfaWQYAiABKAkiJQoSR2V0RHVuZ2VvblVwZ3JhZGVz", + "Eg8KB3VzZXJfaWQYASABKAkipgQKEVdlYlNvY2tldFJlc3BvbnNlEhUKBHVz", + "ZXIYASABKAsyBS5Vc2VySAASFQoEdW5pdBgCIAEoCzIFLlVuaXRIABIXCgV1", + "bml0cxgDIAEoCzIGLlVuaXRzSAASMQoTdW5pdF9hbmRfY3VycmVuY2llcxgE", + "IAEoCzISLlVuaXRBbmRDdXJyZW5jaWVzSAASFQoEaXRlbRgFIAEoCzIFLkl0", + "ZW1IABIfCgljYW1wYWlnbnMYBiABKAsyCi5DYW1wYWlnbnNIABIdCghjYW1w", + "YWlnbhgHIAEoCzIJLkNhbXBhaWduSAASFwoFbGV2ZWwYCCABKAsyBi5MZXZl", + "bEgAEiYKDWJhdHRsZV9yZXN1bHQYCSABKAsyDS5CYXR0bGVSZXN1bHRIABIX", + "CgVlcnJvchgKIAEoCzIGLkVycm9ySAASFwoFYm94ZXMYCyABKAsyBi5Cb3hl", + "c0gAEhMKA2JveBgMIAEoCzIELkJveEgAEiUKDXVzZXJfYW5kX3VuaXQYDSAB", + "KAsyDC5Vc2VyQW5kVW5pdEgAEiIKC2Fma19yZXdhcmRzGA4gASgLMgsuQWZr", + "UmV3YXJkc0gAEj0KGXN1cGVyX2NhbXBhaWduX3Byb2dyZXNzZXMYDyABKAsy", + "GC5TdXBlckNhbXBhaWduUHJvZ3Jlc3Nlc0gAEh0KCHVwZ3JhZGVzGBAgASgL", + "MgkuVXBncmFkZXNIAEIPCg1yZXNwb25zZV90eXBlIv4BCgRVc2VyEgoKAmlk", + "GAEgASgJEhAKCHVzZXJuYW1lGAIgASgJEg0KBWxldmVsGAMgASgEEhIKCmV4", + "cGVyaWVuY2UYBCABKAQSIQoKY3VycmVuY2llcxgHIAMoCzINLlVzZXJDdXJy", + "ZW5jeRIUCgV1bml0cxgIIAMoCzIFLlVuaXQSFAoFaXRlbXMYCSADKAsyBS5J", + "dGVtEisKEWthbGluZV90cmVlX2xldmVsGAogASgLMhAuS2FsaW5lVHJlZUxl", + "dmVsEjkKGGR1bmdlb25fc2V0dGxlbWVudF9sZXZlbBgLIAEoCzIXLkR1bmdl", + "b25TZXR0bGVtZW50TGV2ZWwirQEKD0thbGluZVRyZWVMZXZlbBIKCgJpZBgB", + "IAEoCRINCgVsZXZlbBgCIAEoBBIgChhmZXJ0aWxpemVyX2xldmVsX3VwX2Nv", + "c3QYAyABKAQSGgoSZ29sZF9sZXZlbF91cF9jb3N0GAQgASgEEhcKD3VubG9j", + "a19mZWF0dXJlcxgFIAMoCRIoChBhZmtfcmV3YXJkX3JhdGVzGAYgAygLMg4u", + "QWZrUmV3YXJkUmF0ZSLGAQoWRHVuZ2VvblNldHRsZW1lbnRMZXZlbBIKCgJp", + "ZBgBIAEoCRINCgVsZXZlbBgCIAEoBBIlCg5sZXZlbF91cF9jb3N0cxgDIAMo", + "CzINLkN1cnJlbmN5Q29zdBITCgttYXhfZHVuZ2VvbhgEIAEoBBIVCg1tYXhf", + "ZmFjdGlvbmFsGAUgASgEEhQKDHN1cHBseV9saW1pdBgGIAEoBBIoChBhZmtf", + "cmV3YXJkX3JhdGVzGAcgAygLMg4uQWZrUmV3YXJkUmF0ZSJUChdTdXBlckNh", + "bXBhaWduUHJvZ3Jlc3NlcxI5ChlzdXBlcl9jYW1wYWlnbl9wcm9ncmVzc2Vz", + "GAEgAygLMhYuU3VwZXJDYW1wYWlnblByb2dyZXNzImwKFVN1cGVyQ2FtcGFp", + "Z25Qcm9ncmVzcxIPCgd1c2VyX2lkGAEgASgJEhMKC2NhbXBhaWduX2lkGAIg", + "ASgJEhAKCGxldmVsX2lkGAMgASgJEhsKE3N1cGVyX2NhbXBhaWduX25hbWUY", + "BCABKAkiXgoNQWZrUmV3YXJkUmF0ZRIcChRrYWxpbmVfdHJlZV9sZXZlbF9p", + "ZBgBIAEoCRIbCghjdXJyZW5jeRgCIAEoCzIJLkN1cnJlbmN5EhIKCmRhaWx5", + "X3JhdGUYAyABKAIiOwoMVXNlckN1cnJlbmN5EhsKCGN1cnJlbmN5GAEgASgL", + "MgkuQ3VycmVuY3kSDgoGYW1vdW50GAIgASgNIhgKCEN1cnJlbmN5EgwKBG5h", + "bWUYASABKAkivgEKBFVuaXQSCgoCaWQYASABKAkSDQoFbGV2ZWwYAiABKA0S", + "DAoEdGllchgDIAEoDRIMCgRyYW5rGAQgASgNEhAKCHNlbGVjdGVkGAUgASgI", + "EgwKBHNsb3QYBiABKA0SGQoRY2FtcGFpZ25fbGV2ZWxfaWQYByABKAkSDwoH", + "dXNlcl9pZBgIIAEoCRIdCgljaGFyYWN0ZXIYCSABKAsyCi5DaGFyYWN0ZXIS", + "FAoFaXRlbXMYCiADKAsyBS5JdGVtIh0KBVVuaXRzEhQKBXVuaXRzGAEgAygL", + "MgUuVW5pdCJOChFVbml0QW5kQ3VycmVuY2llcxITCgR1bml0GAEgASgLMgUu", + "VW5pdBIkCg11c2VyX2N1cnJlbmN5GAIgAygLMg0uVXNlckN1cnJlbmN5IksK", + "CUNoYXJhY3RlchIOCgZhY3RpdmUYASABKAgSDAoEbmFtZRgCIAEoCRIPCgdm", + "YWN0aW9uGAMgASgJEg8KB3F1YWxpdHkYBCABKA0iZAoESXRlbRIKCgJpZBgB", + "IAEoCRINCgVsZXZlbBgCIAEoDRIfCgh0ZW1wbGF0ZRgDIAEoCzINLkl0ZW1U", + "ZW1wbGF0ZRIPCgd1c2VyX2lkGAQgASgJEg8KB3VuaXRfaWQYBSABKAkiNgoM", + "SXRlbVRlbXBsYXRlEgoKAmlkGAEgASgJEgwKBG5hbWUYAiABKAkSDAoEdHlw", + "ZRgDIAEoCSIpCglDYW1wYWlnbnMSHAoJY2FtcGFpZ25zGAEgAygLMgkuQ2Ft", + "cGFpZ24iZAoIQ2FtcGFpZ24SCgoCaWQYASABKAkSGwoTc3VwZXJfY2FtcGFp", + "Z25fbmFtZRgCIAEoCRIXCg9jYW1wYWlnbl9udW1iZXIYAyABKA0SFgoGbGV2", + "ZWxzGAQgAygLMgYuTGV2ZWwimgEKBUxldmVsEgoKAmlkGAEgASgJEhMKC2Nh", + "bXBhaWduX2lkGAIgASgJEhQKDGxldmVsX251bWJlchgDIAEoDRIUCgV1bml0", + "cxgEIAMoCzIFLlVuaXQSKQoQY3VycmVuY3lfcmV3YXJkcxgFIAMoCzIPLkN1", + "cnJlbmN5UmV3YXJkEhkKEWV4cGVyaWVuY2VfcmV3YXJkGAYgASgNIj0KDkN1", + "cnJlbmN5UmV3YXJkEhsKCGN1cnJlbmN5GAEgASgLMgkuQ3VycmVuY3kSDgoG", + "YW1vdW50GAMgASgEIi0KCkFma1Jld2FyZHMSHwoLYWZrX3Jld2FyZHMYASAD", + "KAsyCi5BZmtSZXdhcmQiOAoJQWZrUmV3YXJkEhsKCGN1cnJlbmN5GAEgASgL", + "MgkuQ3VycmVuY3kSDgoGYW1vdW50GAIgASgEIhcKBUVycm9yEg4KBnJlYXNv", + "bhgBIAEoCSIcCgVCb3hlcxITCgVib3hlcxgBIAMoCzIELkJveCKHAQoDQm94", + "EgoKAmlkGAEgASgJEgwKBG5hbWUYAiABKAkSEwoLZGVzY3JpcHRpb24YAyAB", + "KAkSEAoIZmFjdGlvbnMYBCADKAkSIgoMcmFua193ZWlnaHRzGAUgAygLMgwu", + "UmFua1dlaWdodHMSGwoEY29zdBgGIAMoCzINLkN1cnJlbmN5Q29zdCIrCgtS", + "YW5rV2VpZ2h0cxIMCgRyYW5rGAEgASgFEg4KBndlaWdodBgCIAEoBSI7CgxD", + "dXJyZW5jeUNvc3QSGwoIY3VycmVuY3kYASABKAsyCS5DdXJyZW5jeRIOCgZh", + "bW91bnQYAiABKAUiNwoLVXNlckFuZFVuaXQSEwoEdXNlchgBIAEoCzIFLlVz", + "ZXISEwoEdW5pdBgCIAEoCzIFLlVuaXQiMQoGVW5sb2NrEgwKBG5hbWUYASAB", + "KAkSGQoHdXBncmFkZRgCIAEoCzIILlVwZ3JhZGUibgoHVXBncmFkZRIMCgRu", + "YW1lGAEgASgJEhMKC2Rlc2NyaXB0aW9uGAIgASgJEg0KBWdyb3VwGAMgASgF", + "EhsKBGNvc3QYBCADKAsyDS5DdXJyZW5jeUNvc3QSFAoFYnVmZnMYBSADKAsy", + "BS5CdWZmIiYKCFVwZ3JhZGVzEhoKCHVwZ3JhZGVzGAEgAygLMgguVXBncmFk", + "ZSI7CgRCdWZmEhEKCWF0dHJpYnV0ZRgBIAEoCRINCgV2YWx1ZRgCIAEoAhIR", + "CglvcGVyYXRpb24YAyABKAkiUwoMQmF0dGxlUmVzdWx0Eh0KDWluaXRpYWxf", + "c3RhdGUYASABKAsyBi5TdGF0ZRIUCgVzdGVwcxgCIAMoCzIFLlN0ZXASDgoG", + "cmVzdWx0GAMgASgJIiMKBVN0YXRlEhoKBXVuaXRzGAEgAygLMgsuQmF0dGxl", + "VW5pdCJqCgpCYXR0bGVVbml0EgoKAmlkGAEgASgJEg4KBmhlYWx0aBgCIAEo", + "BRIOCgZlbmVyZ3kYAyABKAUSDAoEc2xvdBgEIAEoBRIUCgxjaGFyYWN0ZXJf", + "aWQYBSABKAkSDAoEdGVhbRgGIAEoBSI1CgRTdGVwEhMKC3N0ZXBfbnVtYmVy", + "GAEgASgFEhgKB2FjdGlvbnMYAiADKAsyBy5BY3Rpb24i/gIKBkFjdGlvbhIk", + "Cgxza2lsbF9hY3Rpb24YASABKAsyDC5Ta2lsbEFjdGlvbkgAEi4KEW1vZGlm", + "aWVyX3JlY2VpdmVkGAIgASgLMhEuTW9kaWZpZXJSZWNlaXZlZEgAEiQKDHRh", + "Z19yZWNlaXZlZBgDIAEoCzIMLlRhZ1JlY2VpdmVkSAASLAoQbW9kaWZpZXJf", + "ZXhwaXJlZBgEIAEoCzIQLk1vZGlmaWVyRXhwaXJlZEgAEiIKC3RhZ19leHBp", + "cmVkGAUgASgLMgsuVGFnRXhwaXJlZEgAEhcKBWRlYXRoGAYgASgLMgYuRGVh", + "dGhIABIwChJleGVjdXRpb25fcmVjZWl2ZWQYByABKAsyEi5FeGVjdXRpb25S", + "ZWNlaXZlZEgAEiQKDGVuZXJneV9yZWdlbhgIIAEoCzIMLkVuZXJneVJlZ2Vu", + "SAASJgoNc3RhdF9vdmVycmlkZRgJIAEoCzINLlN0YXRPdmVycmlkZUgAQg0K", + "C2FjdGlvbl90eXBlIjMKDFN0YXRBZmZlY3RlZBITCgRzdGF0GAEgASgOMgUu", + "U3RhdBIOCgZhbW91bnQYAiABKAIicwoLU2tpbGxBY3Rpb24SEQoJY2FzdGVy", + "X2lkGAEgASgJEhIKCnRhcmdldF9pZHMYAiADKAkSEAoIc2tpbGxfaWQYAyAB", + "KAkSKwoRc2tpbGxfYWN0aW9uX3R5cGUYBCABKA4yEC5Ta2lsbEFjdGlvblR5", + "cGUiTAoRRXhlY3V0aW9uUmVjZWl2ZWQSEQoJdGFyZ2V0X2lkGAEgASgJEiQK", + "DXN0YXRfYWZmZWN0ZWQYAiABKAsyDS5TdGF0QWZmZWN0ZWQicAoQTW9kaWZp", + "ZXJSZWNlaXZlZBIQCghza2lsbF9pZBgBIAEoCRIRCgl0YXJnZXRfaWQYAiAB", + "KAkSJAoNc3RhdF9hZmZlY3RlZBgDIAEoCzINLlN0YXRBZmZlY3RlZBIRCglv", + "cGVyYXRpb24YBCABKAkiPwoLVGFnUmVjZWl2ZWQSEAoIc2tpbGxfaWQYASAB", + "KAkSEQoJdGFyZ2V0X2lkGAIgASgJEgsKA3RhZxgDIAEoCSJvCg9Nb2RpZmll", + "ckV4cGlyZWQSEAoIc2tpbGxfaWQYASABKAkSEQoJdGFyZ2V0X2lkGAIgASgJ", + "EiQKDXN0YXRfYWZmZWN0ZWQYAyABKAsyDS5TdGF0QWZmZWN0ZWQSEQoJb3Bl", + "cmF0aW9uGAQgASgJIj4KClRhZ0V4cGlyZWQSEAoIc2tpbGxfaWQYASABKAkS", + "EQoJdGFyZ2V0X2lkGAIgASgJEgsKA3RhZxgDIAEoCSIYCgVEZWF0aBIPCgd1", + "bml0X2lkGAEgASgJIkIKC0VuZXJneVJlZ2VuEhEKCXRhcmdldF9pZBgBIAEo", + "CRIQCghza2lsbF9pZBgCIAEoCRIOCgZhbW91bnQYAyABKAIiRwoMU3RhdE92", + "ZXJyaWRlEhEKCXRhcmdldF9pZBgBIAEoCRIkCg1zdGF0X2FmZmVjdGVkGAIg", + "ASgLMg0uU3RhdEFmZmVjdGVkKlsKD1NraWxsQWN0aW9uVHlwZRITCg9BTklN", + "QVRJT05fU1RBUlQQABISCg5FRkZFQ1RfVFJJR0dFUhABEg4KCkVGRkVDVF9I", + "SVQQAhIPCgtFRkZFQ1RfTUlTUxADKlgKBFN0YXQSCgoGSEVBTFRIEAASCgoG", + "RU5FUkdZEAESCgoGQVRUQUNLEAISCwoHREVGRU5TRRADEhQKEERBTUFHRV9S", + "RURVQ1RJT04QBBIJCgVTUEVFRBAFQhSqAhFQcm90b2J1Zi5NZXNzYWdlc2IG", + "cHJvdG8z")); 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[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.Messages.WebSocketRequest), global::Protobuf.Messages.WebSocketRequest.Parser, new[]{ "GetUser", "GetUserByUsername", "CreateUser", "GetCampaigns", "GetCampaign", "GetLevel", "FightLevel", "SelectUnit", "UnselectUnit", "LevelUpUnit", "TierUpUnit", "FuseUnit", "EquipItem", "UnequipItem", "GetItem", "LevelUpItem", "GetBoxes", "GetBox", "Summon", "GetAfkRewards", "ClaimAfkRewards", "GetUserSuperCampaignProgresses", "LevelUpKalineTree", "ClaimDungeonAfkRewards", "LevelUpDungeonSettlement", "PurchaseDungeonUpgrade", "GetDungeonUpgrades" }, new[]{ "RequestType" }, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.Messages.WebSocketRequest), global::Protobuf.Messages.WebSocketRequest.Parser, new[]{ "GetUser", "GetUserByUsername", "CreateUser", "GetCampaigns", "GetCampaign", "GetLevel", "FightLevel", "SelectUnit", "UnselectUnit", "LevelUpUnit", "TierUpUnit", "FuseUnit", "EquipItem", "UnequipItem", "GetItem", "LevelUpItem", "GetBoxes", "GetBox", "Summon", "GetKalineAfkRewards", "ClaimKalineAfkRewards", "GetUserSuperCampaignProgresses", "LevelUpKalineTree", "ClaimDungeonAfkRewards", "LevelUpDungeonSettlement", "PurchaseDungeonUpgrade", "GetDungeonUpgrades" }, new[]{ "RequestType" }, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.Messages.GetUser), global::Protobuf.Messages.GetUser.Parser, new[]{ "UserId" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.Messages.GetUserByUsername), global::Protobuf.Messages.GetUserByUsername.Parser, new[]{ "Username" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.Messages.CreateUser), global::Protobuf.Messages.CreateUser.Parser, new[]{ "Username" }, null, null, null, null), @@ -206,8 +207,8 @@ static GatewayReflection() { new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.Messages.UnequipItem), global::Protobuf.Messages.UnequipItem.Parser, new[]{ "UserId", "ItemId" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.Messages.GetItem), global::Protobuf.Messages.GetItem.Parser, new[]{ "UserId", "ItemId" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.Messages.LevelUpItem), global::Protobuf.Messages.LevelUpItem.Parser, new[]{ "UserId", "ItemId" }, null, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.Messages.GetAfkRewards), global::Protobuf.Messages.GetAfkRewards.Parser, new[]{ "UserId" }, null, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.Messages.ClaimAfkRewards), global::Protobuf.Messages.ClaimAfkRewards.Parser, new[]{ "UserId" }, null, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.Messages.GetKalineAfkRewards), global::Protobuf.Messages.GetKalineAfkRewards.Parser, new[]{ "UserId" }, null, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.Messages.ClaimKalineAfkRewards), global::Protobuf.Messages.ClaimKalineAfkRewards.Parser, new[]{ "UserId" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.Messages.GetBoxes), global::Protobuf.Messages.GetBoxes.Parser, new[]{ "UserId" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.Messages.GetBox), global::Protobuf.Messages.GetBox.Parser, new[]{ "BoxId" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.Messages.Summon), global::Protobuf.Messages.Summon.Parser, new[]{ "UserId", "BoxId" }, null, null, null, null), @@ -381,11 +382,11 @@ public WebSocketRequest(WebSocketRequest other) : this() { case RequestTypeOneofCase.Summon: Summon = other.Summon.Clone(); break; - case RequestTypeOneofCase.GetAfkRewards: - GetAfkRewards = other.GetAfkRewards.Clone(); + case RequestTypeOneofCase.GetKalineAfkRewards: + GetKalineAfkRewards = other.GetKalineAfkRewards.Clone(); break; - case RequestTypeOneofCase.ClaimAfkRewards: - ClaimAfkRewards = other.ClaimAfkRewards.Clone(); + case RequestTypeOneofCase.ClaimKalineAfkRewards: + ClaimKalineAfkRewards = other.ClaimKalineAfkRewards.Clone(); break; case RequestTypeOneofCase.GetUserSuperCampaignProgresses: GetUserSuperCampaignProgresses = other.GetUserSuperCampaignProgresses.Clone(); @@ -644,27 +645,27 @@ public WebSocketRequest Clone() { } } - /// Field number for the "get_afk_rewards" field. - public const int GetAfkRewardsFieldNumber = 21; + /// Field number for the "get_kaline_afk_rewards" field. + public const int GetKalineAfkRewardsFieldNumber = 21; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public global::Protobuf.Messages.GetAfkRewards GetAfkRewards { - get { return requestTypeCase_ == RequestTypeOneofCase.GetAfkRewards ? (global::Protobuf.Messages.GetAfkRewards) requestType_ : null; } + public global::Protobuf.Messages.GetKalineAfkRewards GetKalineAfkRewards { + get { return requestTypeCase_ == RequestTypeOneofCase.GetKalineAfkRewards ? (global::Protobuf.Messages.GetKalineAfkRewards) requestType_ : null; } set { requestType_ = value; - requestTypeCase_ = value == null ? RequestTypeOneofCase.None : RequestTypeOneofCase.GetAfkRewards; + requestTypeCase_ = value == null ? RequestTypeOneofCase.None : RequestTypeOneofCase.GetKalineAfkRewards; } } - /// Field number for the "claim_afk_rewards" field. - public const int ClaimAfkRewardsFieldNumber = 22; + /// Field number for the "claim_kaline_afk_rewards" field. + public const int ClaimKalineAfkRewardsFieldNumber = 22; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public global::Protobuf.Messages.ClaimAfkRewards ClaimAfkRewards { - get { return requestTypeCase_ == RequestTypeOneofCase.ClaimAfkRewards ? (global::Protobuf.Messages.ClaimAfkRewards) requestType_ : null; } + public global::Protobuf.Messages.ClaimKalineAfkRewards ClaimKalineAfkRewards { + get { return requestTypeCase_ == RequestTypeOneofCase.ClaimKalineAfkRewards ? (global::Protobuf.Messages.ClaimKalineAfkRewards) requestType_ : null; } set { requestType_ = value; - requestTypeCase_ = value == null ? RequestTypeOneofCase.None : RequestTypeOneofCase.ClaimAfkRewards; + requestTypeCase_ = value == null ? RequestTypeOneofCase.None : RequestTypeOneofCase.ClaimKalineAfkRewards; } } @@ -763,8 +764,8 @@ public enum RequestTypeOneofCase { GetBoxes = 18, GetBox = 19, Summon = 20, - GetAfkRewards = 21, - ClaimAfkRewards = 22, + GetKalineAfkRewards = 21, + ClaimKalineAfkRewards = 22, GetUserSuperCampaignProgresses = 23, LevelUpKalineTree = 24, ClaimDungeonAfkRewards = 25, @@ -820,8 +821,8 @@ public bool Equals(WebSocketRequest other) { if (!object.Equals(GetBoxes, other.GetBoxes)) return false; if (!object.Equals(GetBox, other.GetBox)) return false; if (!object.Equals(Summon, other.Summon)) return false; - if (!object.Equals(GetAfkRewards, other.GetAfkRewards)) return false; - if (!object.Equals(ClaimAfkRewards, other.ClaimAfkRewards)) return false; + if (!object.Equals(GetKalineAfkRewards, other.GetKalineAfkRewards)) return false; + if (!object.Equals(ClaimKalineAfkRewards, other.ClaimKalineAfkRewards)) return false; if (!object.Equals(GetUserSuperCampaignProgresses, other.GetUserSuperCampaignProgresses)) return false; if (!object.Equals(LevelUpKalineTree, other.LevelUpKalineTree)) return false; if (!object.Equals(ClaimDungeonAfkRewards, other.ClaimDungeonAfkRewards)) return false; @@ -855,8 +856,8 @@ public override int GetHashCode() { if (requestTypeCase_ == RequestTypeOneofCase.GetBoxes) hash ^= GetBoxes.GetHashCode(); if (requestTypeCase_ == RequestTypeOneofCase.GetBox) hash ^= GetBox.GetHashCode(); if (requestTypeCase_ == RequestTypeOneofCase.Summon) hash ^= Summon.GetHashCode(); - if (requestTypeCase_ == RequestTypeOneofCase.GetAfkRewards) hash ^= GetAfkRewards.GetHashCode(); - if (requestTypeCase_ == RequestTypeOneofCase.ClaimAfkRewards) hash ^= ClaimAfkRewards.GetHashCode(); + if (requestTypeCase_ == RequestTypeOneofCase.GetKalineAfkRewards) hash ^= GetKalineAfkRewards.GetHashCode(); + if (requestTypeCase_ == RequestTypeOneofCase.ClaimKalineAfkRewards) hash ^= ClaimKalineAfkRewards.GetHashCode(); if (requestTypeCase_ == RequestTypeOneofCase.GetUserSuperCampaignProgresses) hash ^= GetUserSuperCampaignProgresses.GetHashCode(); if (requestTypeCase_ == RequestTypeOneofCase.LevelUpKalineTree) hash ^= LevelUpKalineTree.GetHashCode(); if (requestTypeCase_ == RequestTypeOneofCase.ClaimDungeonAfkRewards) hash ^= ClaimDungeonAfkRewards.GetHashCode(); @@ -958,13 +959,13 @@ public void WriteTo(pb::CodedOutputStream output) { output.WriteRawTag(162, 1); output.WriteMessage(Summon); } - if (requestTypeCase_ == RequestTypeOneofCase.GetAfkRewards) { + if (requestTypeCase_ == RequestTypeOneofCase.GetKalineAfkRewards) { output.WriteRawTag(170, 1); - output.WriteMessage(GetAfkRewards); + output.WriteMessage(GetKalineAfkRewards); } - if (requestTypeCase_ == RequestTypeOneofCase.ClaimAfkRewards) { + if (requestTypeCase_ == RequestTypeOneofCase.ClaimKalineAfkRewards) { output.WriteRawTag(178, 1); - output.WriteMessage(ClaimAfkRewards); + output.WriteMessage(ClaimKalineAfkRewards); } if (requestTypeCase_ == RequestTypeOneofCase.GetUserSuperCampaignProgresses) { output.WriteRawTag(186, 1); @@ -1076,13 +1077,13 @@ public void WriteTo(pb::CodedOutputStream output) { output.WriteRawTag(162, 1); output.WriteMessage(Summon); } - if (requestTypeCase_ == RequestTypeOneofCase.GetAfkRewards) { + if (requestTypeCase_ == RequestTypeOneofCase.GetKalineAfkRewards) { output.WriteRawTag(170, 1); - output.WriteMessage(GetAfkRewards); + output.WriteMessage(GetKalineAfkRewards); } - if (requestTypeCase_ == RequestTypeOneofCase.ClaimAfkRewards) { + if (requestTypeCase_ == RequestTypeOneofCase.ClaimKalineAfkRewards) { output.WriteRawTag(178, 1); - output.WriteMessage(ClaimAfkRewards); + output.WriteMessage(ClaimKalineAfkRewards); } if (requestTypeCase_ == RequestTypeOneofCase.GetUserSuperCampaignProgresses) { output.WriteRawTag(186, 1); @@ -1175,11 +1176,11 @@ public int CalculateSize() { if (requestTypeCase_ == RequestTypeOneofCase.Summon) { size += 2 + pb::CodedOutputStream.ComputeMessageSize(Summon); } - if (requestTypeCase_ == RequestTypeOneofCase.GetAfkRewards) { - size += 2 + pb::CodedOutputStream.ComputeMessageSize(GetAfkRewards); + if (requestTypeCase_ == RequestTypeOneofCase.GetKalineAfkRewards) { + size += 2 + pb::CodedOutputStream.ComputeMessageSize(GetKalineAfkRewards); } - if (requestTypeCase_ == RequestTypeOneofCase.ClaimAfkRewards) { - size += 2 + pb::CodedOutputStream.ComputeMessageSize(ClaimAfkRewards); + if (requestTypeCase_ == RequestTypeOneofCase.ClaimKalineAfkRewards) { + size += 2 + pb::CodedOutputStream.ComputeMessageSize(ClaimKalineAfkRewards); } if (requestTypeCase_ == RequestTypeOneofCase.GetUserSuperCampaignProgresses) { size += 2 + pb::CodedOutputStream.ComputeMessageSize(GetUserSuperCampaignProgresses); @@ -1326,17 +1327,17 @@ public void MergeFrom(WebSocketRequest other) { } Summon.MergeFrom(other.Summon); break; - case RequestTypeOneofCase.GetAfkRewards: - if (GetAfkRewards == null) { - GetAfkRewards = new global::Protobuf.Messages.GetAfkRewards(); + case RequestTypeOneofCase.GetKalineAfkRewards: + if (GetKalineAfkRewards == null) { + GetKalineAfkRewards = new global::Protobuf.Messages.GetKalineAfkRewards(); } - GetAfkRewards.MergeFrom(other.GetAfkRewards); + GetKalineAfkRewards.MergeFrom(other.GetKalineAfkRewards); break; - case RequestTypeOneofCase.ClaimAfkRewards: - if (ClaimAfkRewards == null) { - ClaimAfkRewards = new global::Protobuf.Messages.ClaimAfkRewards(); + case RequestTypeOneofCase.ClaimKalineAfkRewards: + if (ClaimKalineAfkRewards == null) { + ClaimKalineAfkRewards = new global::Protobuf.Messages.ClaimKalineAfkRewards(); } - ClaimAfkRewards.MergeFrom(other.ClaimAfkRewards); + ClaimKalineAfkRewards.MergeFrom(other.ClaimKalineAfkRewards); break; case RequestTypeOneofCase.GetUserSuperCampaignProgresses: if (GetUserSuperCampaignProgresses == null) { @@ -1563,21 +1564,21 @@ public void MergeFrom(pb::CodedInputStream input) { break; } case 170: { - global::Protobuf.Messages.GetAfkRewards subBuilder = new global::Protobuf.Messages.GetAfkRewards(); - if (requestTypeCase_ == RequestTypeOneofCase.GetAfkRewards) { - subBuilder.MergeFrom(GetAfkRewards); + global::Protobuf.Messages.GetKalineAfkRewards subBuilder = new global::Protobuf.Messages.GetKalineAfkRewards(); + if (requestTypeCase_ == RequestTypeOneofCase.GetKalineAfkRewards) { + subBuilder.MergeFrom(GetKalineAfkRewards); } input.ReadMessage(subBuilder); - GetAfkRewards = subBuilder; + GetKalineAfkRewards = subBuilder; break; } case 178: { - global::Protobuf.Messages.ClaimAfkRewards subBuilder = new global::Protobuf.Messages.ClaimAfkRewards(); - if (requestTypeCase_ == RequestTypeOneofCase.ClaimAfkRewards) { - subBuilder.MergeFrom(ClaimAfkRewards); + global::Protobuf.Messages.ClaimKalineAfkRewards subBuilder = new global::Protobuf.Messages.ClaimKalineAfkRewards(); + if (requestTypeCase_ == RequestTypeOneofCase.ClaimKalineAfkRewards) { + subBuilder.MergeFrom(ClaimKalineAfkRewards); } input.ReadMessage(subBuilder); - ClaimAfkRewards = subBuilder; + ClaimKalineAfkRewards = subBuilder; break; } case 186: { @@ -1821,21 +1822,21 @@ public void MergeFrom(pb::CodedInputStream input) { break; } case 170: { - global::Protobuf.Messages.GetAfkRewards subBuilder = new global::Protobuf.Messages.GetAfkRewards(); - if (requestTypeCase_ == RequestTypeOneofCase.GetAfkRewards) { - subBuilder.MergeFrom(GetAfkRewards); + global::Protobuf.Messages.GetKalineAfkRewards subBuilder = new global::Protobuf.Messages.GetKalineAfkRewards(); + if (requestTypeCase_ == RequestTypeOneofCase.GetKalineAfkRewards) { + subBuilder.MergeFrom(GetKalineAfkRewards); } input.ReadMessage(subBuilder); - GetAfkRewards = subBuilder; + GetKalineAfkRewards = subBuilder; break; } case 178: { - global::Protobuf.Messages.ClaimAfkRewards subBuilder = new global::Protobuf.Messages.ClaimAfkRewards(); - if (requestTypeCase_ == RequestTypeOneofCase.ClaimAfkRewards) { - subBuilder.MergeFrom(ClaimAfkRewards); + global::Protobuf.Messages.ClaimKalineAfkRewards subBuilder = new global::Protobuf.Messages.ClaimKalineAfkRewards(); + if (requestTypeCase_ == RequestTypeOneofCase.ClaimKalineAfkRewards) { + subBuilder.MergeFrom(ClaimKalineAfkRewards); } input.ReadMessage(subBuilder); - ClaimAfkRewards = subBuilder; + ClaimKalineAfkRewards = subBuilder; break; } case 186: { @@ -5484,16 +5485,16 @@ public void MergeFrom(pb::CodedInputStream input) { } [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] - public sealed partial class GetAfkRewards : pb::IMessage + public sealed partial class GetKalineAfkRewards : pb::IMessage #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE , pb::IBufferMessage #endif { - private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new GetAfkRewards()); + private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new GetKalineAfkRewards()); private pb::UnknownFieldSet _unknownFields; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public static pb::MessageParser Parser { get { return _parser; } } + public static pb::MessageParser Parser { get { return _parser; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] @@ -5509,7 +5510,7 @@ public sealed partial class GetAfkRewards : pb::IMessage [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public GetAfkRewards() { + public GetKalineAfkRewards() { OnConstruction(); } @@ -5517,15 +5518,15 @@ public GetAfkRewards() { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public GetAfkRewards(GetAfkRewards other) : this() { + public GetKalineAfkRewards(GetKalineAfkRewards other) : this() { userId_ = other.userId_; _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public GetAfkRewards Clone() { - return new GetAfkRewards(this); + public GetKalineAfkRewards Clone() { + return new GetKalineAfkRewards(this); } /// Field number for the "user_id" field. @@ -5543,12 +5544,12 @@ public string UserId { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override bool Equals(object other) { - return Equals(other as GetAfkRewards); + return Equals(other as GetKalineAfkRewards); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public bool Equals(GetAfkRewards other) { + public bool Equals(GetKalineAfkRewards other) { if (ReferenceEquals(other, null)) { return false; } @@ -5621,7 +5622,7 @@ public int CalculateSize() { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public void MergeFrom(GetAfkRewards other) { + public void MergeFrom(GetKalineAfkRewards other) { if (other == null) { return; } @@ -5674,16 +5675,16 @@ public void MergeFrom(pb::CodedInputStream input) { } [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] - public sealed partial class ClaimAfkRewards : pb::IMessage + public sealed partial class ClaimKalineAfkRewards : pb::IMessage #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE , pb::IBufferMessage #endif { - private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new ClaimAfkRewards()); + private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new ClaimKalineAfkRewards()); private pb::UnknownFieldSet _unknownFields; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public static pb::MessageParser Parser { get { return _parser; } } + public static pb::MessageParser Parser { get { return _parser; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] @@ -5699,7 +5700,7 @@ public sealed partial class ClaimAfkRewards : pb::IMessage [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public ClaimAfkRewards() { + public ClaimKalineAfkRewards() { OnConstruction(); } @@ -5707,15 +5708,15 @@ public ClaimAfkRewards() { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public ClaimAfkRewards(ClaimAfkRewards other) : this() { + public ClaimKalineAfkRewards(ClaimKalineAfkRewards other) : this() { userId_ = other.userId_; _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public ClaimAfkRewards Clone() { - return new ClaimAfkRewards(this); + public ClaimKalineAfkRewards Clone() { + return new ClaimKalineAfkRewards(this); } /// Field number for the "user_id" field. @@ -5733,12 +5734,12 @@ public string UserId { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override bool Equals(object other) { - return Equals(other as ClaimAfkRewards); + return Equals(other as ClaimKalineAfkRewards); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public bool Equals(ClaimAfkRewards other) { + public bool Equals(ClaimKalineAfkRewards other) { if (ReferenceEquals(other, null)) { return false; } @@ -5811,7 +5812,7 @@ public int CalculateSize() { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public void MergeFrom(ClaimAfkRewards other) { + public void MergeFrom(ClaimKalineAfkRewards other) { if (other == null) { return; } diff --git a/client/Assets/Scripts/Shared/HeaderManager.cs b/client/Assets/Scripts/Shared/HeaderManager.cs index 0db687e8..9294cec4 100644 --- a/client/Assets/Scripts/Shared/HeaderManager.cs +++ b/client/Assets/Scripts/Shared/HeaderManager.cs @@ -31,6 +31,9 @@ public class HeaderManager : MonoBehaviour [SerializeField] TextMeshProUGUI blueprints; + [SerializeField] + TextMeshProUGUI supplies; + static GlobalUserData user; // static bool infoHasBeenSet = false; @@ -70,6 +73,7 @@ void UpdateCurrencyValues() scrolls.text = user.GetCurrency("Summon Scrolls").ToString(); fertilizer.text = user.GetCurrency("Fertilizer").ToString(); blueprints.text = user.GetCurrency("Blueprints").ToString(); + supplies.text = user.GetCurrency("Supplies").ToString(); } void UpdateLevelValues() diff --git a/gateway.proto b/gateway.proto index 938fcb80..3e9acb20 100644 --- a/gateway.proto +++ b/gateway.proto @@ -23,8 +23,8 @@ option csharp_namespace = "Protobuf.Messages"; GetBoxes get_boxes = 18; GetBox get_box = 19; Summon summon = 20; - GetAfkRewards get_afk_rewards = 21; - ClaimAfkRewards claim_afk_rewards = 22; + GetKalineAfkRewards get_kaline_afk_rewards = 21; + ClaimKalineAfkRewards claim_kaline_afk_rewards = 22; GetUserSuperCampaignProgresses get_user_super_campaign_progresses = 23; LevelUpKalineTree level_up_kaline_tree = 24; ClaimDungeonAfkRewards claim_dungeon_afk_rewards = 25; @@ -113,11 +113,11 @@ option csharp_namespace = "Protobuf.Messages"; string item_id = 2; } - message GetAfkRewards { + message GetKalineAfkRewards { string user_id = 1; } - message ClaimAfkRewards { + message ClaimKalineAfkRewards { string user_id = 1; }