From 116227e448b8ba375fb4aef80db6dafa33232909 Mon Sep 17 00:00:00 2001 From: Nicolas Continanza Date: Wed, 12 Jun 2024 17:54:50 -0300 Subject: [PATCH] [GH-437] Claim dungeon AFK Rewards (#487) * Show and Claim dungeon AFK rewards * Remove logs * Restore changes in font file * Claim AFK rewards when entering Dungeon Settlement * Move supplies claim to dungeon scene * Format --- client/Assets/AddressableAssetsData/OSX.meta | 8 + client/Assets/Prefabs/Shared/Header.prefab | 293 ++++- client/Assets/Scenes/Dungeon.unity | 60 +- client/Assets/Scenes/DungeonSettlement.unity | 934 +-------------- .../Scripts/AfkRewards/KalineTreeManager.cs | 4 +- .../BackendConnection/SocketConnection.cs | 45 +- .../Assets/Scripts/Dungeon/DungeonManager.cs | 39 + .../Scripts/Dungeon/DungeonManager.cs.meta | 11 + .../Dungeon/DungeonSettlementManager.cs | 1 - client/Assets/Scripts/Protobuf/Gateway.pb.cs | 1045 +++++++++++++---- client/Assets/Scripts/Shared/HeaderManager.cs | 4 + gateway.proto | 18 +- 12 files changed, 1283 insertions(+), 1179 deletions(-) create mode 100644 client/Assets/AddressableAssetsData/OSX.meta create mode 100644 client/Assets/Scripts/Dungeon/DungeonManager.cs create mode 100644 client/Assets/Scripts/Dungeon/DungeonManager.cs.meta diff --git a/client/Assets/AddressableAssetsData/OSX.meta b/client/Assets/AddressableAssetsData/OSX.meta new file mode 100644 index 00000000..d1a66ce8 --- /dev/null +++ b/client/Assets/AddressableAssetsData/OSX.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 58847661d284d4a10b0d6308bcd46a96 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: 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 41fabdbe..d354d716 100644 --- a/client/Assets/Scenes/Dungeon.unity +++ b/client/Assets/Scenes/Dungeon.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.3708708, g: 0.37838137, b: 0.35725543, a: 1} + m_IndirectSpecularColor: {r: 0.37311947, g: 0.38074014, b: 0.3587274, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -302,7 +302,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7414010533079904352, guid: c36f69f305d3c4336a02acc5a4050f98, type: 3} propertyPath: m_RootOrder - value: 5 + value: 4 objectReference: {fileID: 0} - target: {fileID: 7414010533079904352, guid: c36f69f305d3c4336a02acc5a4050f98, type: 3} propertyPath: m_AnchorMax.x @@ -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 @@ -511,7 +555,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 224799658048824814, guid: f24057f0865f940aea63ebd760a46fb6, type: 3} propertyPath: m_RootOrder - value: 3 + value: 2 objectReference: {fileID: 0} - target: {fileID: 224799658048824814, guid: f24057f0865f940aea63ebd760a46fb6, type: 3} propertyPath: m_AnchorMax.x @@ -656,7 +700,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7414010533079904352, guid: c36f69f305d3c4336a02acc5a4050f98, type: 3} propertyPath: m_RootOrder - value: 4 + value: 3 objectReference: {fileID: 0} - target: {fileID: 7414010533079904352, guid: c36f69f305d3c4336a02acc5a4050f98, type: 3} propertyPath: m_AnchorMax.x @@ -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 bf10f3f3..789261c4 100644 --- a/client/Assets/Scripts/BackendConnection/SocketConnection.cs +++ b/client/Assets/Scripts/BackendConnection/SocketConnection.cs @@ -840,15 +840,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; @@ -856,6 +856,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 @@ -884,15 +901,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 cb0025f4..7c5f917a 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( - "Cg1nYXRld2F5LnByb3RvIqMIChBXZWJTb2NrZXRSZXF1ZXN0EhwKCGdldF91", + "Cg1nYXRld2F5LnByb3RvIrQJChBXZWJTb2NrZXRSZXF1ZXN0EhwKCGdldF91", "c2VyGAEgASgLMgguR2V0VXNlckgAEjIKFGdldF91c2VyX2J5X3VzZXJuYW1l", "GAIgASgLMhIuR2V0VXNlckJ5VXNlcm5hbWVIABIiCgtjcmVhdGVfdXNlchgD", "IAEoCzILLkNyZWF0ZVVzZXJIABImCg1nZXRfY2FtcGFpZ25zGAQgASgLMg0u", @@ -39,145 +39,151 @@ static GatewayReflection() { "MgwuVW5lcXVpcEl0ZW1IABIcCghnZXRfaXRlbRgQIAEoCzIILkdldEl0ZW1I", "ABIlCg1sZXZlbF91cF9pdGVtGBEgASgLMgwuTGV2ZWxVcEl0ZW1IABIeCgln", "ZXRfYm94ZXMYEiABKAsyCS5HZXRCb3hlc0gAEhoKB2dldF9ib3gYEyABKAsy", - "By5HZXRCb3hIABIZCgZzdW1tb24YFCABKAsyBy5TdW1tb25IABIpCg9nZXRf", - "YWZrX3Jld2FyZHMYFSABKAsyDi5HZXRBZmtSZXdhcmRzSAASLQoRY2xhaW1f", - "YWZrX3Jld2FyZHMYFiABKAsyEC5DbGFpbUFma1Jld2FyZHNIABJNCiJnZXRf", - "dXNlcl9zdXBlcl9jYW1wYWlnbl9wcm9ncmVzc2VzGBcgASgLMh8uR2V0VXNl", - "clN1cGVyQ2FtcGFpZ25Qcm9ncmVzc2VzSAASMgoUbGV2ZWxfdXBfa2FsaW5l", - "X3RyZWUYGCABKAsyEi5MZXZlbFVwS2FsaW5lVHJlZUgAEjwKGWNsYWltX2R1", - "bmdlb25fYWZrX3Jld2FyZHMYGSABKAsyFy5DbGFpbUR1bmdlb25BZmtSZXdh", - "cmRzSAASQAobbGV2ZWxfdXBfZHVuZ2Vvbl9zZXR0bGVtZW50GBogASgLMhku", - "TGV2ZWxVcER1bmdlb25TZXR0bGVtZW50SABCDgoMcmVxdWVzdF90eXBlIhoK", - "B0dldFVzZXISDwoHdXNlcl9pZBgBIAEoCSIlChFHZXRVc2VyQnlVc2VybmFt", - "ZRIQCgh1c2VybmFtZRgBIAEoCSIeCgpDcmVhdGVVc2VyEhAKCHVzZXJuYW1l", - "GAEgASgJIh8KDEdldENhbXBhaWducxIPCgd1c2VyX2lkGAEgASgJIjMKC0dl", - "dENhbXBhaWduEg8KB3VzZXJfaWQYASABKAkSEwoLY2FtcGFpZ25faWQYAiAB", - "KAkiLQoIR2V0TGV2ZWwSDwoHdXNlcl9pZBgBIAEoCRIQCghsZXZlbF9pZBgC", - "IAEoCSIvCgpGaWdodExldmVsEg8KB3VzZXJfaWQYASABKAkSEAoIbGV2ZWxf", - "aWQYAiABKAkiPAoKU2VsZWN0VW5pdBIPCgd1c2VyX2lkGAEgASgJEg8KB3Vu", - "aXRfaWQYAiABKAkSDAoEc2xvdBgDIAEoDSIwCgxVbnNlbGVjdFVuaXQSDwoH", - "dXNlcl9pZBgBIAEoCRIPCgd1bml0X2lkGAIgASgJIi8KC0xldmVsVXBVbml0", - "Eg8KB3VzZXJfaWQYASABKAkSDwoHdW5pdF9pZBgCIAEoCSIuCgpUaWVyVXBV", - "bml0Eg8KB3VzZXJfaWQYASABKAkSDwoHdW5pdF9pZBgCIAEoCSJICghGdXNl", - "VW5pdBIPCgd1c2VyX2lkGAEgASgJEg8KB3VuaXRfaWQYAiABKAkSGgoSY29u", - "c3VtZWRfdW5pdHNfaWRzGAMgAygJIj4KCUVxdWlwSXRlbRIPCgd1c2VyX2lk", - "GAEgASgJEg8KB2l0ZW1faWQYAiABKAkSDwoHdW5pdF9pZBgDIAEoCSIvCgtV", - "bmVxdWlwSXRlbRIPCgd1c2VyX2lkGAEgASgJEg8KB2l0ZW1faWQYAiABKAki", - "KwoHR2V0SXRlbRIPCgd1c2VyX2lkGAEgASgJEg8KB2l0ZW1faWQYAiABKAki", - "LwoLTGV2ZWxVcEl0ZW0SDwoHdXNlcl9pZBgBIAEoCRIPCgdpdGVtX2lkGAIg", - "ASgJIiAKDUdldEFma1Jld2FyZHMSDwoHdXNlcl9pZBgBIAEoCSIiCg9DbGFp", - "bUFma1Jld2FyZHMSDwoHdXNlcl9pZBgBIAEoCSIbCghHZXRCb3hlcxIPCgd1", - "c2VyX2lkGAEgASgJIhgKBkdldEJveBIOCgZib3hfaWQYASABKAkiKQoGU3Vt", - "bW9uEg8KB3VzZXJfaWQYASABKAkSDgoGYm94X2lkGAIgASgJIjEKHkdldFVz", - "ZXJTdXBlckNhbXBhaWduUHJvZ3Jlc3NlcxIPCgd1c2VyX2lkGAEgASgJIiQK", - "EUxldmVsVXBLYWxpbmVUcmVlEg8KB3VzZXJfaWQYASABKAkiKQoWQ2xhaW1E", - "dW5nZW9uQWZrUmV3YXJkcxIPCgd1c2VyX2lkGAEgASgJIisKGExldmVsVXBE", - "dW5nZW9uU2V0dGxlbWVudBIPCgd1c2VyX2lkGAEgASgJIocEChFXZWJTb2Nr", - "ZXRSZXNwb25zZRIVCgR1c2VyGAEgASgLMgUuVXNlckgAEhUKBHVuaXQYAiAB", - "KAsyBS5Vbml0SAASFwoFdW5pdHMYAyABKAsyBi5Vbml0c0gAEjEKE3VuaXRf", - "YW5kX2N1cnJlbmNpZXMYBCABKAsyEi5Vbml0QW5kQ3VycmVuY2llc0gAEhUK", - "BGl0ZW0YBSABKAsyBS5JdGVtSAASHwoJY2FtcGFpZ25zGAYgASgLMgouQ2Ft", - "cGFpZ25zSAASHQoIY2FtcGFpZ24YByABKAsyCS5DYW1wYWlnbkgAEhcKBWxl", - "dmVsGAggASgLMgYuTGV2ZWxIABImCg1iYXR0bGVfcmVzdWx0GAkgASgLMg0u", - "QmF0dGxlUmVzdWx0SAASFwoFZXJyb3IYCiABKAsyBi5FcnJvckgAEhcKBWJv", - "eGVzGAsgASgLMgYuQm94ZXNIABITCgNib3gYDCABKAsyBC5Cb3hIABIlCg11", - "c2VyX2FuZF91bml0GA0gASgLMgwuVXNlckFuZFVuaXRIABIiCgthZmtfcmV3", - "YXJkcxgOIAEoCzILLkFma1Jld2FyZHNIABI9ChlzdXBlcl9jYW1wYWlnbl9w", - "cm9ncmVzc2VzGA8gASgLMhguU3VwZXJDYW1wYWlnblByb2dyZXNzZXNIAEIP", - "Cg1yZXNwb25zZV90eXBlIv4BCgRVc2VyEgoKAmlkGAEgASgJEhAKCHVzZXJu", - "YW1lGAIgASgJEg0KBWxldmVsGAMgASgEEhIKCmV4cGVyaWVuY2UYBCABKAQS", - "IQoKY3VycmVuY2llcxgHIAMoCzINLlVzZXJDdXJyZW5jeRIUCgV1bml0cxgI", - "IAMoCzIFLlVuaXQSFAoFaXRlbXMYCSADKAsyBS5JdGVtEisKEWthbGluZV90", - "cmVlX2xldmVsGAogASgLMhAuS2FsaW5lVHJlZUxldmVsEjkKGGR1bmdlb25f", - "c2V0dGxlbWVudF9sZXZlbBgLIAEoCzIXLkR1bmdlb25TZXR0bGVtZW50TGV2", - "ZWwirQEKD0thbGluZVRyZWVMZXZlbBIKCgJpZBgBIAEoCRINCgVsZXZlbBgC", - "IAEoBBIgChhmZXJ0aWxpemVyX2xldmVsX3VwX2Nvc3QYAyABKAQSGgoSZ29s", - "ZF9sZXZlbF91cF9jb3N0GAQgASgEEhcKD3VubG9ja19mZWF0dXJlcxgFIAMo", - "CRIoChBhZmtfcmV3YXJkX3JhdGVzGAYgAygLMg4uQWZrUmV3YXJkUmF0ZSLG", - "AQoWRHVuZ2VvblNldHRsZW1lbnRMZXZlbBIKCgJpZBgBIAEoCRINCgVsZXZl", - "bBgCIAEoBBIlCg5sZXZlbF91cF9jb3N0cxgDIAMoCzINLkN1cnJlbmN5Q29z", - "dBITCgttYXhfZHVuZ2VvbhgEIAEoBBIVCg1tYXhfZmFjdGlvbmFsGAUgASgE", - "EhQKDHN1cHBseV9saW1pdBgGIAEoBBIoChBhZmtfcmV3YXJkX3JhdGVzGAcg", - "AygLMg4uQWZrUmV3YXJkUmF0ZSJUChdTdXBlckNhbXBhaWduUHJvZ3Jlc3Nl", - "cxI5ChlzdXBlcl9jYW1wYWlnbl9wcm9ncmVzc2VzGAEgAygLMhYuU3VwZXJD", - "YW1wYWlnblByb2dyZXNzImwKFVN1cGVyQ2FtcGFpZ25Qcm9ncmVzcxIPCgd1", - "c2VyX2lkGAEgASgJEhMKC2NhbXBhaWduX2lkGAIgASgJEhAKCGxldmVsX2lk", - "GAMgASgJEhsKE3N1cGVyX2NhbXBhaWduX25hbWUYBCABKAkiXgoNQWZrUmV3", - "YXJkUmF0ZRIcChRrYWxpbmVfdHJlZV9sZXZlbF9pZBgBIAEoCRIbCghjdXJy", - "ZW5jeRgCIAEoCzIJLkN1cnJlbmN5EhIKCmRhaWx5X3JhdGUYAyABKAIiOwoM", - "VXNlckN1cnJlbmN5EhsKCGN1cnJlbmN5GAEgASgLMgkuQ3VycmVuY3kSDgoG", - "YW1vdW50GAIgASgNIhgKCEN1cnJlbmN5EgwKBG5hbWUYASABKAkivgEKBFVu", - "aXQSCgoCaWQYASABKAkSDQoFbGV2ZWwYAiABKA0SDAoEdGllchgDIAEoDRIM", - "CgRyYW5rGAQgASgNEhAKCHNlbGVjdGVkGAUgASgIEgwKBHNsb3QYBiABKA0S", - "GQoRY2FtcGFpZ25fbGV2ZWxfaWQYByABKAkSDwoHdXNlcl9pZBgIIAEoCRId", - "CgljaGFyYWN0ZXIYCSABKAsyCi5DaGFyYWN0ZXISFAoFaXRlbXMYCiADKAsy", - "BS5JdGVtIh0KBVVuaXRzEhQKBXVuaXRzGAEgAygLMgUuVW5pdCJOChFVbml0", - "QW5kQ3VycmVuY2llcxITCgR1bml0GAEgASgLMgUuVW5pdBIkCg11c2VyX2N1", - "cnJlbmN5GAIgAygLMg0uVXNlckN1cnJlbmN5IksKCUNoYXJhY3RlchIOCgZh", - "Y3RpdmUYASABKAgSDAoEbmFtZRgCIAEoCRIPCgdmYWN0aW9uGAMgASgJEg8K", - "B3F1YWxpdHkYBCABKA0iZAoESXRlbRIKCgJpZBgBIAEoCRINCgVsZXZlbBgC", - "IAEoDRIfCgh0ZW1wbGF0ZRgDIAEoCzINLkl0ZW1UZW1wbGF0ZRIPCgd1c2Vy", - "X2lkGAQgASgJEg8KB3VuaXRfaWQYBSABKAkiNgoMSXRlbVRlbXBsYXRlEgoK", - "AmlkGAEgASgJEgwKBG5hbWUYAiABKAkSDAoEdHlwZRgDIAEoCSIpCglDYW1w", - "YWlnbnMSHAoJY2FtcGFpZ25zGAEgAygLMgkuQ2FtcGFpZ24iZAoIQ2FtcGFp", - "Z24SCgoCaWQYASABKAkSGwoTc3VwZXJfY2FtcGFpZ25fbmFtZRgCIAEoCRIX", - "Cg9jYW1wYWlnbl9udW1iZXIYAyABKA0SFgoGbGV2ZWxzGAQgAygLMgYuTGV2", - "ZWwimgEKBUxldmVsEgoKAmlkGAEgASgJEhMKC2NhbXBhaWduX2lkGAIgASgJ", - "EhQKDGxldmVsX251bWJlchgDIAEoDRIUCgV1bml0cxgEIAMoCzIFLlVuaXQS", - "KQoQY3VycmVuY3lfcmV3YXJkcxgFIAMoCzIPLkN1cnJlbmN5UmV3YXJkEhkK", - "EWV4cGVyaWVuY2VfcmV3YXJkGAYgASgNIj0KDkN1cnJlbmN5UmV3YXJkEhsK", - "CGN1cnJlbmN5GAEgASgLMgkuQ3VycmVuY3kSDgoGYW1vdW50GAMgASgEIi0K", - "CkFma1Jld2FyZHMSHwoLYWZrX3Jld2FyZHMYASADKAsyCi5BZmtSZXdhcmQi", - "OAoJQWZrUmV3YXJkEhsKCGN1cnJlbmN5GAEgASgLMgkuQ3VycmVuY3kSDgoG", - "YW1vdW50GAIgASgEIhcKBUVycm9yEg4KBnJlYXNvbhgBIAEoCSIcCgVCb3hl", - "cxITCgVib3hlcxgBIAMoCzIELkJveCKHAQoDQm94EgoKAmlkGAEgASgJEgwK", - "BG5hbWUYAiABKAkSEwoLZGVzY3JpcHRpb24YAyABKAkSEAoIZmFjdGlvbnMY", - "BCADKAkSIgoMcmFua193ZWlnaHRzGAUgAygLMgwuUmFua1dlaWdodHMSGwoE", - "Y29zdBgGIAMoCzINLkN1cnJlbmN5Q29zdCIrCgtSYW5rV2VpZ2h0cxIMCgRy", - "YW5rGAEgASgFEg4KBndlaWdodBgCIAEoBSI7CgxDdXJyZW5jeUNvc3QSGwoI", - "Y3VycmVuY3kYASABKAsyCS5DdXJyZW5jeRIOCgZhbW91bnQYAiABKAUiNwoL", - "VXNlckFuZFVuaXQSEwoEdXNlchgBIAEoCzIFLlVzZXISEwoEdW5pdBgCIAEo", - "CzIFLlVuaXQiUwoMQmF0dGxlUmVzdWx0Eh0KDWluaXRpYWxfc3RhdGUYASAB", - "KAsyBi5TdGF0ZRIUCgVzdGVwcxgCIAMoCzIFLlN0ZXASDgoGcmVzdWx0GAMg", - "ASgJIiMKBVN0YXRlEhoKBXVuaXRzGAEgAygLMgsuQmF0dGxlVW5pdCJqCgpC", - "YXR0bGVVbml0EgoKAmlkGAEgASgJEg4KBmhlYWx0aBgCIAEoBRIOCgZlbmVy", - "Z3kYAyABKAUSDAoEc2xvdBgEIAEoBRIUCgxjaGFyYWN0ZXJfaWQYBSABKAkS", - "DAoEdGVhbRgGIAEoBSI1CgRTdGVwEhMKC3N0ZXBfbnVtYmVyGAEgASgFEhgK", - "B2FjdGlvbnMYAiADKAsyBy5BY3Rpb24i/gIKBkFjdGlvbhIkCgxza2lsbF9h", - "Y3Rpb24YASABKAsyDC5Ta2lsbEFjdGlvbkgAEi4KEW1vZGlmaWVyX3JlY2Vp", - "dmVkGAIgASgLMhEuTW9kaWZpZXJSZWNlaXZlZEgAEiQKDHRhZ19yZWNlaXZl", - "ZBgDIAEoCzIMLlRhZ1JlY2VpdmVkSAASLAoQbW9kaWZpZXJfZXhwaXJlZBgE", - "IAEoCzIQLk1vZGlmaWVyRXhwaXJlZEgAEiIKC3RhZ19leHBpcmVkGAUgASgL", - "MgsuVGFnRXhwaXJlZEgAEhcKBWRlYXRoGAYgASgLMgYuRGVhdGhIABIwChJl", - "eGVjdXRpb25fcmVjZWl2ZWQYByABKAsyEi5FeGVjdXRpb25SZWNlaXZlZEgA", - "EiQKDGVuZXJneV9yZWdlbhgIIAEoCzIMLkVuZXJneVJlZ2VuSAASJgoNc3Rh", - "dF9vdmVycmlkZRgJIAEoCzINLlN0YXRPdmVycmlkZUgAQg0KC2FjdGlvbl90", - "eXBlIjMKDFN0YXRBZmZlY3RlZBITCgRzdGF0GAEgASgOMgUuU3RhdBIOCgZh", - "bW91bnQYAiABKAIicwoLU2tpbGxBY3Rpb24SEQoJY2FzdGVyX2lkGAEgASgJ", - "EhIKCnRhcmdldF9pZHMYAiADKAkSEAoIc2tpbGxfaWQYAyABKAkSKwoRc2tp", - "bGxfYWN0aW9uX3R5cGUYBCABKA4yEC5Ta2lsbEFjdGlvblR5cGUiTAoRRXhl", - "Y3V0aW9uUmVjZWl2ZWQSEQoJdGFyZ2V0X2lkGAEgASgJEiQKDXN0YXRfYWZm", - "ZWN0ZWQYAiABKAsyDS5TdGF0QWZmZWN0ZWQicAoQTW9kaWZpZXJSZWNlaXZl", - "ZBIQCghza2lsbF9pZBgBIAEoCRIRCgl0YXJnZXRfaWQYAiABKAkSJAoNc3Rh", - "dF9hZmZlY3RlZBgDIAEoCzINLlN0YXRBZmZlY3RlZBIRCglvcGVyYXRpb24Y", - "BCABKAkiPwoLVGFnUmVjZWl2ZWQSEAoIc2tpbGxfaWQYASABKAkSEQoJdGFy", - "Z2V0X2lkGAIgASgJEgsKA3RhZxgDIAEoCSJvCg9Nb2RpZmllckV4cGlyZWQS", - "EAoIc2tpbGxfaWQYASABKAkSEQoJdGFyZ2V0X2lkGAIgASgJEiQKDXN0YXRf", - "YWZmZWN0ZWQYAyABKAsyDS5TdGF0QWZmZWN0ZWQSEQoJb3BlcmF0aW9uGAQg", - "ASgJIj4KClRhZ0V4cGlyZWQSEAoIc2tpbGxfaWQYASABKAkSEQoJdGFyZ2V0", - "X2lkGAIgASgJEgsKA3RhZxgDIAEoCSIYCgVEZWF0aBIPCgd1bml0X2lkGAEg", - "ASgJIkIKC0VuZXJneVJlZ2VuEhEKCXRhcmdldF9pZBgBIAEoCRIQCghza2ls", - "bF9pZBgCIAEoCRIOCgZhbW91bnQYAyABKAIiRwoMU3RhdE92ZXJyaWRlEhEK", - "CXRhcmdldF9pZBgBIAEoCRIkCg1zdGF0X2FmZmVjdGVkGAIgASgLMg0uU3Rh", - "dEFmZmVjdGVkKlsKD1NraWxsQWN0aW9uVHlwZRITCg9BTklNQVRJT05fU1RB", - "UlQQABISCg5FRkZFQ1RfVFJJR0dFUhABEg4KCkVGRkVDVF9ISVQQAhIPCgtF", - "RkZFQ1RfTUlTUxADKlgKBFN0YXQSCgoGSEVBTFRIEAASCgoGRU5FUkdZEAES", - "CgoGQVRUQUNLEAISCwoHREVGRU5TRRADEhQKEERBTUFHRV9SRURVQ1RJT04Q", - "BBIJCgVTUEVFRBAFQhSqAhFQcm90b2J1Zi5NZXNzYWdlc2IGcHJvdG8z")); + "By5HZXRCb3hIABIZCgZzdW1tb24YFCABKAsyBy5TdW1tb25IABI2ChZnZXRf", + "a2FsaW5lX2Fma19yZXdhcmRzGBUgASgLMhQuR2V0S2FsaW5lQWZrUmV3YXJk", + "c0gAEjoKGGNsYWltX2thbGluZV9hZmtfcmV3YXJkcxgWIAEoCzIWLkNsYWlt", + "S2FsaW5lQWZrUmV3YXJkc0gAEk0KImdldF91c2VyX3N1cGVyX2NhbXBhaWdu", + "X3Byb2dyZXNzZXMYFyABKAsyHy5HZXRVc2VyU3VwZXJDYW1wYWlnblByb2dy", + "ZXNzZXNIABIyChRsZXZlbF91cF9rYWxpbmVfdHJlZRgYIAEoCzISLkxldmVs", + "VXBLYWxpbmVUcmVlSAASPAoZY2xhaW1fZHVuZ2Vvbl9hZmtfcmV3YXJkcxgZ", + "IAEoCzIXLkNsYWltRHVuZ2VvbkFma1Jld2FyZHNIABJAChtsZXZlbF91cF9k", + "dW5nZW9uX3NldHRsZW1lbnQYGiABKAsyGS5MZXZlbFVwRHVuZ2VvblNldHRs", + "ZW1lbnRIABI7ChhwdXJjaGFzZV9kdW5nZW9uX3VwZ3JhZGUYGyABKAsyFy5Q", + "dXJjaGFzZUR1bmdlb25VcGdyYWRlSAASOAoXZ2V0X2R1bmdlb25fYWZrX3Jl", + "d2FyZHMYHCABKAsyFS5HZXREdW5nZW9uQWZrUmV3YXJkc0gAQg4KDHJlcXVl", + "c3RfdHlwZSIaCgdHZXRVc2VyEg8KB3VzZXJfaWQYASABKAkiJQoRR2V0VXNl", + "ckJ5VXNlcm5hbWUSEAoIdXNlcm5hbWUYASABKAkiHgoKQ3JlYXRlVXNlchIQ", + "Cgh1c2VybmFtZRgBIAEoCSIfCgxHZXRDYW1wYWlnbnMSDwoHdXNlcl9pZBgB", + "IAEoCSIzCgtHZXRDYW1wYWlnbhIPCgd1c2VyX2lkGAEgASgJEhMKC2NhbXBh", + "aWduX2lkGAIgASgJIi0KCEdldExldmVsEg8KB3VzZXJfaWQYASABKAkSEAoI", + "bGV2ZWxfaWQYAiABKAkiLwoKRmlnaHRMZXZlbBIPCgd1c2VyX2lkGAEgASgJ", + "EhAKCGxldmVsX2lkGAIgASgJIjwKClNlbGVjdFVuaXQSDwoHdXNlcl9pZBgB", + "IAEoCRIPCgd1bml0X2lkGAIgASgJEgwKBHNsb3QYAyABKA0iMAoMVW5zZWxl", + "Y3RVbml0Eg8KB3VzZXJfaWQYASABKAkSDwoHdW5pdF9pZBgCIAEoCSIvCgtM", + "ZXZlbFVwVW5pdBIPCgd1c2VyX2lkGAEgASgJEg8KB3VuaXRfaWQYAiABKAki", + "LgoKVGllclVwVW5pdBIPCgd1c2VyX2lkGAEgASgJEg8KB3VuaXRfaWQYAiAB", + "KAkiSAoIRnVzZVVuaXQSDwoHdXNlcl9pZBgBIAEoCRIPCgd1bml0X2lkGAIg", + "ASgJEhoKEmNvbnN1bWVkX3VuaXRzX2lkcxgDIAMoCSI+CglFcXVpcEl0ZW0S", + "DwoHdXNlcl9pZBgBIAEoCRIPCgdpdGVtX2lkGAIgASgJEg8KB3VuaXRfaWQY", + "AyABKAkiLwoLVW5lcXVpcEl0ZW0SDwoHdXNlcl9pZBgBIAEoCRIPCgdpdGVt", + "X2lkGAIgASgJIisKB0dldEl0ZW0SDwoHdXNlcl9pZBgBIAEoCRIPCgdpdGVt", + "X2lkGAIgASgJIi8KC0xldmVsVXBJdGVtEg8KB3VzZXJfaWQYASABKAkSDwoH", + "aXRlbV9pZBgCIAEoCSImChNHZXRLYWxpbmVBZmtSZXdhcmRzEg8KB3VzZXJf", + "aWQYASABKAkiKAoVQ2xhaW1LYWxpbmVBZmtSZXdhcmRzEg8KB3VzZXJfaWQY", + "ASABKAkiGwoIR2V0Qm94ZXMSDwoHdXNlcl9pZBgBIAEoCSIYCgZHZXRCb3gS", + "DgoGYm94X2lkGAEgASgJIikKBlN1bW1vbhIPCgd1c2VyX2lkGAEgASgJEg4K", + "BmJveF9pZBgCIAEoCSIxCh5HZXRVc2VyU3VwZXJDYW1wYWlnblByb2dyZXNz", + "ZXMSDwoHdXNlcl9pZBgBIAEoCSIkChFMZXZlbFVwS2FsaW5lVHJlZRIPCgd1", + "c2VyX2lkGAEgASgJIikKFkNsYWltRHVuZ2VvbkFma1Jld2FyZHMSDwoHdXNl", + "cl9pZBgBIAEoCSIrChhMZXZlbFVwRHVuZ2VvblNldHRsZW1lbnQSDwoHdXNl", + "cl9pZBgBIAEoCSI9ChZQdXJjaGFzZUR1bmdlb25VcGdyYWRlEg8KB3VzZXJf", + "aWQYASABKAkSEgoKdXBncmFkZV9pZBgCIAEoCSInChRHZXREdW5nZW9uQWZr", + "UmV3YXJkcxIPCgd1c2VyX2lkGAEgASgJIocEChFXZWJTb2NrZXRSZXNwb25z", + "ZRIVCgR1c2VyGAEgASgLMgUuVXNlckgAEhUKBHVuaXQYAiABKAsyBS5Vbml0", + "SAASFwoFdW5pdHMYAyABKAsyBi5Vbml0c0gAEjEKE3VuaXRfYW5kX2N1cnJl", + "bmNpZXMYBCABKAsyEi5Vbml0QW5kQ3VycmVuY2llc0gAEhUKBGl0ZW0YBSAB", + "KAsyBS5JdGVtSAASHwoJY2FtcGFpZ25zGAYgASgLMgouQ2FtcGFpZ25zSAAS", + "HQoIY2FtcGFpZ24YByABKAsyCS5DYW1wYWlnbkgAEhcKBWxldmVsGAggASgL", + "MgYuTGV2ZWxIABImCg1iYXR0bGVfcmVzdWx0GAkgASgLMg0uQmF0dGxlUmVz", + "dWx0SAASFwoFZXJyb3IYCiABKAsyBi5FcnJvckgAEhcKBWJveGVzGAsgASgL", + "MgYuQm94ZXNIABITCgNib3gYDCABKAsyBC5Cb3hIABIlCg11c2VyX2FuZF91", + "bml0GA0gASgLMgwuVXNlckFuZFVuaXRIABIiCgthZmtfcmV3YXJkcxgOIAEo", + "CzILLkFma1Jld2FyZHNIABI9ChlzdXBlcl9jYW1wYWlnbl9wcm9ncmVzc2Vz", + "GA8gASgLMhguU3VwZXJDYW1wYWlnblByb2dyZXNzZXNIAEIPCg1yZXNwb25z", + "ZV90eXBlIv4BCgRVc2VyEgoKAmlkGAEgASgJEhAKCHVzZXJuYW1lGAIgASgJ", + "Eg0KBWxldmVsGAMgASgEEhIKCmV4cGVyaWVuY2UYBCABKAQSIQoKY3VycmVu", + "Y2llcxgHIAMoCzINLlVzZXJDdXJyZW5jeRIUCgV1bml0cxgIIAMoCzIFLlVu", + "aXQSFAoFaXRlbXMYCSADKAsyBS5JdGVtEisKEWthbGluZV90cmVlX2xldmVs", + "GAogASgLMhAuS2FsaW5lVHJlZUxldmVsEjkKGGR1bmdlb25fc2V0dGxlbWVu", + "dF9sZXZlbBgLIAEoCzIXLkR1bmdlb25TZXR0bGVtZW50TGV2ZWwirQEKD0th", + "bGluZVRyZWVMZXZlbBIKCgJpZBgBIAEoCRINCgVsZXZlbBgCIAEoBBIgChhm", + "ZXJ0aWxpemVyX2xldmVsX3VwX2Nvc3QYAyABKAQSGgoSZ29sZF9sZXZlbF91", + "cF9jb3N0GAQgASgEEhcKD3VubG9ja19mZWF0dXJlcxgFIAMoCRIoChBhZmtf", + "cmV3YXJkX3JhdGVzGAYgAygLMg4uQWZrUmV3YXJkUmF0ZSLGAQoWRHVuZ2Vv", + "blNldHRsZW1lbnRMZXZlbBIKCgJpZBgBIAEoCRINCgVsZXZlbBgCIAEoBBIl", + "Cg5sZXZlbF91cF9jb3N0cxgDIAMoCzINLkN1cnJlbmN5Q29zdBITCgttYXhf", + "ZHVuZ2VvbhgEIAEoBBIVCg1tYXhfZmFjdGlvbmFsGAUgASgEEhQKDHN1cHBs", + "eV9saW1pdBgGIAEoBBIoChBhZmtfcmV3YXJkX3JhdGVzGAcgAygLMg4uQWZr", + "UmV3YXJkUmF0ZSJUChdTdXBlckNhbXBhaWduUHJvZ3Jlc3NlcxI5ChlzdXBl", + "cl9jYW1wYWlnbl9wcm9ncmVzc2VzGAEgAygLMhYuU3VwZXJDYW1wYWlnblBy", + "b2dyZXNzImwKFVN1cGVyQ2FtcGFpZ25Qcm9ncmVzcxIPCgd1c2VyX2lkGAEg", + "ASgJEhMKC2NhbXBhaWduX2lkGAIgASgJEhAKCGxldmVsX2lkGAMgASgJEhsK", + "E3N1cGVyX2NhbXBhaWduX25hbWUYBCABKAkiXgoNQWZrUmV3YXJkUmF0ZRIc", + "ChRrYWxpbmVfdHJlZV9sZXZlbF9pZBgBIAEoCRIbCghjdXJyZW5jeRgCIAEo", + "CzIJLkN1cnJlbmN5EhIKCmRhaWx5X3JhdGUYAyABKAIiOwoMVXNlckN1cnJl", + "bmN5EhsKCGN1cnJlbmN5GAEgASgLMgkuQ3VycmVuY3kSDgoGYW1vdW50GAIg", + "ASgNIhgKCEN1cnJlbmN5EgwKBG5hbWUYASABKAkivgEKBFVuaXQSCgoCaWQY", + "ASABKAkSDQoFbGV2ZWwYAiABKA0SDAoEdGllchgDIAEoDRIMCgRyYW5rGAQg", + "ASgNEhAKCHNlbGVjdGVkGAUgASgIEgwKBHNsb3QYBiABKA0SGQoRY2FtcGFp", + "Z25fbGV2ZWxfaWQYByABKAkSDwoHdXNlcl9pZBgIIAEoCRIdCgljaGFyYWN0", + "ZXIYCSABKAsyCi5DaGFyYWN0ZXISFAoFaXRlbXMYCiADKAsyBS5JdGVtIh0K", + "BVVuaXRzEhQKBXVuaXRzGAEgAygLMgUuVW5pdCJOChFVbml0QW5kQ3VycmVu", + "Y2llcxITCgR1bml0GAEgASgLMgUuVW5pdBIkCg11c2VyX2N1cnJlbmN5GAIg", + "AygLMg0uVXNlckN1cnJlbmN5IksKCUNoYXJhY3RlchIOCgZhY3RpdmUYASAB", + "KAgSDAoEbmFtZRgCIAEoCRIPCgdmYWN0aW9uGAMgASgJEg8KB3F1YWxpdHkY", + "BCABKA0iZAoESXRlbRIKCgJpZBgBIAEoCRINCgVsZXZlbBgCIAEoDRIfCgh0", + "ZW1wbGF0ZRgDIAEoCzINLkl0ZW1UZW1wbGF0ZRIPCgd1c2VyX2lkGAQgASgJ", + "Eg8KB3VuaXRfaWQYBSABKAkiNgoMSXRlbVRlbXBsYXRlEgoKAmlkGAEgASgJ", + "EgwKBG5hbWUYAiABKAkSDAoEdHlwZRgDIAEoCSIpCglDYW1wYWlnbnMSHAoJ", + "Y2FtcGFpZ25zGAEgAygLMgkuQ2FtcGFpZ24iZAoIQ2FtcGFpZ24SCgoCaWQY", + "ASABKAkSGwoTc3VwZXJfY2FtcGFpZ25fbmFtZRgCIAEoCRIXCg9jYW1wYWln", + "bl9udW1iZXIYAyABKA0SFgoGbGV2ZWxzGAQgAygLMgYuTGV2ZWwimgEKBUxl", + "dmVsEgoKAmlkGAEgASgJEhMKC2NhbXBhaWduX2lkGAIgASgJEhQKDGxldmVs", + "X251bWJlchgDIAEoDRIUCgV1bml0cxgEIAMoCzIFLlVuaXQSKQoQY3VycmVu", + "Y3lfcmV3YXJkcxgFIAMoCzIPLkN1cnJlbmN5UmV3YXJkEhkKEWV4cGVyaWVu", + "Y2VfcmV3YXJkGAYgASgNIj0KDkN1cnJlbmN5UmV3YXJkEhsKCGN1cnJlbmN5", + "GAEgASgLMgkuQ3VycmVuY3kSDgoGYW1vdW50GAMgASgEIi0KCkFma1Jld2Fy", + "ZHMSHwoLYWZrX3Jld2FyZHMYASADKAsyCi5BZmtSZXdhcmQiOAoJQWZrUmV3", + "YXJkEhsKCGN1cnJlbmN5GAEgASgLMgkuQ3VycmVuY3kSDgoGYW1vdW50GAIg", + "ASgEIhcKBUVycm9yEg4KBnJlYXNvbhgBIAEoCSIcCgVCb3hlcxITCgVib3hl", + "cxgBIAMoCzIELkJveCKHAQoDQm94EgoKAmlkGAEgASgJEgwKBG5hbWUYAiAB", + "KAkSEwoLZGVzY3JpcHRpb24YAyABKAkSEAoIZmFjdGlvbnMYBCADKAkSIgoM", + "cmFua193ZWlnaHRzGAUgAygLMgwuUmFua1dlaWdodHMSGwoEY29zdBgGIAMo", + "CzINLkN1cnJlbmN5Q29zdCIrCgtSYW5rV2VpZ2h0cxIMCgRyYW5rGAEgASgF", + "Eg4KBndlaWdodBgCIAEoBSI7CgxDdXJyZW5jeUNvc3QSGwoIY3VycmVuY3kY", + "ASABKAsyCS5DdXJyZW5jeRIOCgZhbW91bnQYAiABKAUiNwoLVXNlckFuZFVu", + "aXQSEwoEdXNlchgBIAEoCzIFLlVzZXISEwoEdW5pdBgCIAEoCzIFLlVuaXQi", + "UwoMQmF0dGxlUmVzdWx0Eh0KDWluaXRpYWxfc3RhdGUYASABKAsyBi5TdGF0", + "ZRIUCgVzdGVwcxgCIAMoCzIFLlN0ZXASDgoGcmVzdWx0GAMgASgJIiMKBVN0", + "YXRlEhoKBXVuaXRzGAEgAygLMgsuQmF0dGxlVW5pdCJqCgpCYXR0bGVVbml0", + "EgoKAmlkGAEgASgJEg4KBmhlYWx0aBgCIAEoBRIOCgZlbmVyZ3kYAyABKAUS", + "DAoEc2xvdBgEIAEoBRIUCgxjaGFyYWN0ZXJfaWQYBSABKAkSDAoEdGVhbRgG", + "IAEoBSI1CgRTdGVwEhMKC3N0ZXBfbnVtYmVyGAEgASgFEhgKB2FjdGlvbnMY", + "AiADKAsyBy5BY3Rpb24i/gIKBkFjdGlvbhIkCgxza2lsbF9hY3Rpb24YASAB", + "KAsyDC5Ta2lsbEFjdGlvbkgAEi4KEW1vZGlmaWVyX3JlY2VpdmVkGAIgASgL", + "MhEuTW9kaWZpZXJSZWNlaXZlZEgAEiQKDHRhZ19yZWNlaXZlZBgDIAEoCzIM", + "LlRhZ1JlY2VpdmVkSAASLAoQbW9kaWZpZXJfZXhwaXJlZBgEIAEoCzIQLk1v", + "ZGlmaWVyRXhwaXJlZEgAEiIKC3RhZ19leHBpcmVkGAUgASgLMgsuVGFnRXhw", + "aXJlZEgAEhcKBWRlYXRoGAYgASgLMgYuRGVhdGhIABIwChJleGVjdXRpb25f", + "cmVjZWl2ZWQYByABKAsyEi5FeGVjdXRpb25SZWNlaXZlZEgAEiQKDGVuZXJn", + "eV9yZWdlbhgIIAEoCzIMLkVuZXJneVJlZ2VuSAASJgoNc3RhdF9vdmVycmlk", + "ZRgJIAEoCzINLlN0YXRPdmVycmlkZUgAQg0KC2FjdGlvbl90eXBlIjMKDFN0", + "YXRBZmZlY3RlZBITCgRzdGF0GAEgASgOMgUuU3RhdBIOCgZhbW91bnQYAiAB", + "KAIicwoLU2tpbGxBY3Rpb24SEQoJY2FzdGVyX2lkGAEgASgJEhIKCnRhcmdl", + "dF9pZHMYAiADKAkSEAoIc2tpbGxfaWQYAyABKAkSKwoRc2tpbGxfYWN0aW9u", + "X3R5cGUYBCABKA4yEC5Ta2lsbEFjdGlvblR5cGUiTAoRRXhlY3V0aW9uUmVj", + "ZWl2ZWQSEQoJdGFyZ2V0X2lkGAEgASgJEiQKDXN0YXRfYWZmZWN0ZWQYAiAB", + "KAsyDS5TdGF0QWZmZWN0ZWQicAoQTW9kaWZpZXJSZWNlaXZlZBIQCghza2ls", + "bF9pZBgBIAEoCRIRCgl0YXJnZXRfaWQYAiABKAkSJAoNc3RhdF9hZmZlY3Rl", + "ZBgDIAEoCzINLlN0YXRBZmZlY3RlZBIRCglvcGVyYXRpb24YBCABKAkiPwoL", + "VGFnUmVjZWl2ZWQSEAoIc2tpbGxfaWQYASABKAkSEQoJdGFyZ2V0X2lkGAIg", + "ASgJEgsKA3RhZxgDIAEoCSJvCg9Nb2RpZmllckV4cGlyZWQSEAoIc2tpbGxf", + "aWQYASABKAkSEQoJdGFyZ2V0X2lkGAIgASgJEiQKDXN0YXRfYWZmZWN0ZWQY", + "AyABKAsyDS5TdGF0QWZmZWN0ZWQSEQoJb3BlcmF0aW9uGAQgASgJIj4KClRh", + "Z0V4cGlyZWQSEAoIc2tpbGxfaWQYASABKAkSEQoJdGFyZ2V0X2lkGAIgASgJ", + "EgsKA3RhZxgDIAEoCSIYCgVEZWF0aBIPCgd1bml0X2lkGAEgASgJIkIKC0Vu", + "ZXJneVJlZ2VuEhEKCXRhcmdldF9pZBgBIAEoCRIQCghza2lsbF9pZBgCIAEo", + "CRIOCgZhbW91bnQYAyABKAIiRwoMU3RhdE92ZXJyaWRlEhEKCXRhcmdldF9p", + "ZBgBIAEoCRIkCg1zdGF0X2FmZmVjdGVkGAIgASgLMg0uU3RhdEFmZmVjdGVk", + "KlsKD1NraWxsQWN0aW9uVHlwZRITCg9BTklNQVRJT05fU1RBUlQQABISCg5F", + "RkZFQ1RfVFJJR0dFUhABEg4KCkVGRkVDVF9ISVQQAhIPCgtFRkZFQ1RfTUlT", + "UxADKlgKBFN0YXQSCgoGSEVBTFRIEAASCgoGRU5FUkdZEAESCgoGQVRUQUNL", + "EAISCwoHREVGRU5TRRADEhQKEERBTUFHRV9SRURVQ1RJT04QBBIJCgVTUEVF", + "RBAFQhSqAhFQcm90b2J1Zi5NZXNzYWdlc2IGcHJvdG8z")); 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" }, 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", "GetDungeonAfkRewards" }, 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), @@ -194,8 +200,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), @@ -203,6 +209,8 @@ static GatewayReflection() { new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.Messages.LevelUpKalineTree), global::Protobuf.Messages.LevelUpKalineTree.Parser, new[]{ "UserId" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.Messages.ClaimDungeonAfkRewards), global::Protobuf.Messages.ClaimDungeonAfkRewards.Parser, new[]{ "UserId" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.Messages.LevelUpDungeonSettlement), global::Protobuf.Messages.LevelUpDungeonSettlement.Parser, new[]{ "UserId" }, null, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.Messages.PurchaseDungeonUpgrade), global::Protobuf.Messages.PurchaseDungeonUpgrade.Parser, new[]{ "UserId", "UpgradeId" }, null, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.Messages.GetDungeonAfkRewards), global::Protobuf.Messages.GetDungeonAfkRewards.Parser, new[]{ "UserId" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.Messages.WebSocketResponse), global::Protobuf.Messages.WebSocketResponse.Parser, new[]{ "User", "Unit", "Units", "UnitAndCurrencies", "Item", "Campaigns", "Campaign", "Level", "BattleResult", "Error", "Boxes", "Box", "UserAndUnit", "AfkRewards", "SuperCampaignProgresses" }, new[]{ "ResponseType" }, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.Messages.User), global::Protobuf.Messages.User.Parser, new[]{ "Id", "Username", "Level", "Experience", "Currencies", "Units", "Items", "KalineTreeLevel", "DungeonSettlementLevel" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.Messages.KalineTreeLevel), global::Protobuf.Messages.KalineTreeLevel.Parser, new[]{ "Id", "Level", "FertilizerLevelUpCost", "GoldLevelUpCost", "UnlockFeatures", "AfkRewardRates" }, null, null, null, null), @@ -363,11 +371,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(); @@ -381,6 +389,12 @@ public WebSocketRequest(WebSocketRequest other) : this() { case RequestTypeOneofCase.LevelUpDungeonSettlement: LevelUpDungeonSettlement = other.LevelUpDungeonSettlement.Clone(); break; + case RequestTypeOneofCase.PurchaseDungeonUpgrade: + PurchaseDungeonUpgrade = other.PurchaseDungeonUpgrade.Clone(); + break; + case RequestTypeOneofCase.GetDungeonAfkRewards: + GetDungeonAfkRewards = other.GetDungeonAfkRewards.Clone(); + break; } _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); @@ -620,27 +634,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; } } @@ -692,6 +706,30 @@ public WebSocketRequest Clone() { } } + /// Field number for the "purchase_dungeon_upgrade" field. + public const int PurchaseDungeonUpgradeFieldNumber = 27; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public global::Protobuf.Messages.PurchaseDungeonUpgrade PurchaseDungeonUpgrade { + get { return requestTypeCase_ == RequestTypeOneofCase.PurchaseDungeonUpgrade ? (global::Protobuf.Messages.PurchaseDungeonUpgrade) requestType_ : null; } + set { + requestType_ = value; + requestTypeCase_ = value == null ? RequestTypeOneofCase.None : RequestTypeOneofCase.PurchaseDungeonUpgrade; + } + } + + /// Field number for the "get_dungeon_afk_rewards" field. + public const int GetDungeonAfkRewardsFieldNumber = 28; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public global::Protobuf.Messages.GetDungeonAfkRewards GetDungeonAfkRewards { + get { return requestTypeCase_ == RequestTypeOneofCase.GetDungeonAfkRewards ? (global::Protobuf.Messages.GetDungeonAfkRewards) requestType_ : null; } + set { + requestType_ = value; + requestTypeCase_ = value == null ? RequestTypeOneofCase.None : RequestTypeOneofCase.GetDungeonAfkRewards; + } + } + private object requestType_; /// Enum of possible cases for the "request_type" oneof. public enum RequestTypeOneofCase { @@ -715,12 +753,14 @@ public enum RequestTypeOneofCase { GetBoxes = 18, GetBox = 19, Summon = 20, - GetAfkRewards = 21, - ClaimAfkRewards = 22, + GetKalineAfkRewards = 21, + ClaimKalineAfkRewards = 22, GetUserSuperCampaignProgresses = 23, LevelUpKalineTree = 24, ClaimDungeonAfkRewards = 25, LevelUpDungeonSettlement = 26, + PurchaseDungeonUpgrade = 27, + GetDungeonAfkRewards = 28, } private RequestTypeOneofCase requestTypeCase_ = RequestTypeOneofCase.None; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -770,12 +810,14 @@ 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; if (!object.Equals(LevelUpDungeonSettlement, other.LevelUpDungeonSettlement)) return false; + if (!object.Equals(PurchaseDungeonUpgrade, other.PurchaseDungeonUpgrade)) return false; + if (!object.Equals(GetDungeonAfkRewards, other.GetDungeonAfkRewards)) return false; if (RequestTypeCase != other.RequestTypeCase) return false; return Equals(_unknownFields, other._unknownFields); } @@ -803,12 +845,14 @@ 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(); if (requestTypeCase_ == RequestTypeOneofCase.LevelUpDungeonSettlement) hash ^= LevelUpDungeonSettlement.GetHashCode(); + if (requestTypeCase_ == RequestTypeOneofCase.PurchaseDungeonUpgrade) hash ^= PurchaseDungeonUpgrade.GetHashCode(); + if (requestTypeCase_ == RequestTypeOneofCase.GetDungeonAfkRewards) hash ^= GetDungeonAfkRewards.GetHashCode(); hash ^= (int) requestTypeCase_; if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); @@ -904,13 +948,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); @@ -928,6 +972,14 @@ public void WriteTo(pb::CodedOutputStream output) { output.WriteRawTag(210, 1); output.WriteMessage(LevelUpDungeonSettlement); } + if (requestTypeCase_ == RequestTypeOneofCase.PurchaseDungeonUpgrade) { + output.WriteRawTag(218, 1); + output.WriteMessage(PurchaseDungeonUpgrade); + } + if (requestTypeCase_ == RequestTypeOneofCase.GetDungeonAfkRewards) { + output.WriteRawTag(226, 1); + output.WriteMessage(GetDungeonAfkRewards); + } if (_unknownFields != null) { _unknownFields.WriteTo(output); } @@ -1014,13 +1066,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); @@ -1038,6 +1090,14 @@ public void WriteTo(pb::CodedOutputStream output) { output.WriteRawTag(210, 1); output.WriteMessage(LevelUpDungeonSettlement); } + if (requestTypeCase_ == RequestTypeOneofCase.PurchaseDungeonUpgrade) { + output.WriteRawTag(218, 1); + output.WriteMessage(PurchaseDungeonUpgrade); + } + if (requestTypeCase_ == RequestTypeOneofCase.GetDungeonAfkRewards) { + output.WriteRawTag(226, 1); + output.WriteMessage(GetDungeonAfkRewards); + } if (_unknownFields != null) { _unknownFields.WriteTo(ref output); } @@ -1105,11 +1165,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); @@ -1123,6 +1183,12 @@ public int CalculateSize() { if (requestTypeCase_ == RequestTypeOneofCase.LevelUpDungeonSettlement) { size += 2 + pb::CodedOutputStream.ComputeMessageSize(LevelUpDungeonSettlement); } + if (requestTypeCase_ == RequestTypeOneofCase.PurchaseDungeonUpgrade) { + size += 2 + pb::CodedOutputStream.ComputeMessageSize(PurchaseDungeonUpgrade); + } + if (requestTypeCase_ == RequestTypeOneofCase.GetDungeonAfkRewards) { + size += 2 + pb::CodedOutputStream.ComputeMessageSize(GetDungeonAfkRewards); + } if (_unknownFields != null) { size += _unknownFields.CalculateSize(); } @@ -1250,17 +1316,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) { @@ -1286,6 +1352,18 @@ public void MergeFrom(WebSocketRequest other) { } LevelUpDungeonSettlement.MergeFrom(other.LevelUpDungeonSettlement); break; + case RequestTypeOneofCase.PurchaseDungeonUpgrade: + if (PurchaseDungeonUpgrade == null) { + PurchaseDungeonUpgrade = new global::Protobuf.Messages.PurchaseDungeonUpgrade(); + } + PurchaseDungeonUpgrade.MergeFrom(other.PurchaseDungeonUpgrade); + break; + case RequestTypeOneofCase.GetDungeonAfkRewards: + if (GetDungeonAfkRewards == null) { + GetDungeonAfkRewards = new global::Protobuf.Messages.GetDungeonAfkRewards(); + } + GetDungeonAfkRewards.MergeFrom(other.GetDungeonAfkRewards); + break; } _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); @@ -1475,21 +1553,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: { @@ -1528,6 +1606,24 @@ public void MergeFrom(pb::CodedInputStream input) { LevelUpDungeonSettlement = subBuilder; break; } + case 218: { + global::Protobuf.Messages.PurchaseDungeonUpgrade subBuilder = new global::Protobuf.Messages.PurchaseDungeonUpgrade(); + if (requestTypeCase_ == RequestTypeOneofCase.PurchaseDungeonUpgrade) { + subBuilder.MergeFrom(PurchaseDungeonUpgrade); + } + input.ReadMessage(subBuilder); + PurchaseDungeonUpgrade = subBuilder; + break; + } + case 226: { + global::Protobuf.Messages.GetDungeonAfkRewards subBuilder = new global::Protobuf.Messages.GetDungeonAfkRewards(); + if (requestTypeCase_ == RequestTypeOneofCase.GetDungeonAfkRewards) { + subBuilder.MergeFrom(GetDungeonAfkRewards); + } + input.ReadMessage(subBuilder); + GetDungeonAfkRewards = subBuilder; + break; + } } } #endif @@ -1715,21 +1811,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: { @@ -1768,6 +1864,24 @@ public void MergeFrom(pb::CodedInputStream input) { LevelUpDungeonSettlement = subBuilder; break; } + case 218: { + global::Protobuf.Messages.PurchaseDungeonUpgrade subBuilder = new global::Protobuf.Messages.PurchaseDungeonUpgrade(); + if (requestTypeCase_ == RequestTypeOneofCase.PurchaseDungeonUpgrade) { + subBuilder.MergeFrom(PurchaseDungeonUpgrade); + } + input.ReadMessage(subBuilder); + PurchaseDungeonUpgrade = subBuilder; + break; + } + case 226: { + global::Protobuf.Messages.GetDungeonAfkRewards subBuilder = new global::Protobuf.Messages.GetDungeonAfkRewards(); + if (requestTypeCase_ == RequestTypeOneofCase.GetDungeonAfkRewards) { + subBuilder.MergeFrom(GetDungeonAfkRewards); + } + input.ReadMessage(subBuilder); + GetDungeonAfkRewards = subBuilder; + break; + } } } } @@ -5360,16 +5474,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)] @@ -5385,7 +5499,7 @@ public sealed partial class GetAfkRewards : pb::IMessage [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public GetAfkRewards() { + public GetKalineAfkRewards() { OnConstruction(); } @@ -5393,15 +5507,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. @@ -5419,12 +5533,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; } @@ -5497,7 +5611,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; } @@ -5550,16 +5664,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)] @@ -5575,7 +5689,7 @@ public sealed partial class ClaimAfkRewards : pb::IMessage [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public ClaimAfkRewards() { + public ClaimKalineAfkRewards() { OnConstruction(); } @@ -5583,15 +5697,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. @@ -5609,12 +5723,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; } @@ -5687,7 +5801,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; } @@ -7106,6 +7220,423 @@ public void MergeFrom(pb::CodedInputStream input) { } + [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] + public sealed partial class PurchaseDungeonUpgrade : pb::IMessage + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + , pb::IBufferMessage + #endif + { + private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new PurchaseDungeonUpgrade()); + private pb::UnknownFieldSet _unknownFields; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public static pb::MessageParser Parser { get { return _parser; } } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public static pbr::MessageDescriptor Descriptor { + get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[26]; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public PurchaseDungeonUpgrade() { + OnConstruction(); + } + + partial void OnConstruction(); + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public PurchaseDungeonUpgrade(PurchaseDungeonUpgrade other) : this() { + userId_ = other.userId_; + upgradeId_ = other.upgradeId_; + _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public PurchaseDungeonUpgrade Clone() { + return new PurchaseDungeonUpgrade(this); + } + + /// Field number for the "user_id" field. + public const int UserIdFieldNumber = 1; + private string userId_ = ""; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public string UserId { + get { return userId_; } + set { + userId_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); + } + } + + /// Field number for the "upgrade_id" field. + public const int UpgradeIdFieldNumber = 2; + private string upgradeId_ = ""; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public string UpgradeId { + get { return upgradeId_; } + set { + upgradeId_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public override bool Equals(object other) { + return Equals(other as PurchaseDungeonUpgrade); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public bool Equals(PurchaseDungeonUpgrade other) { + if (ReferenceEquals(other, null)) { + return false; + } + if (ReferenceEquals(other, this)) { + return true; + } + if (UserId != other.UserId) return false; + if (UpgradeId != other.UpgradeId) return false; + return Equals(_unknownFields, other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public override int GetHashCode() { + int hash = 1; + if (UserId.Length != 0) hash ^= UserId.GetHashCode(); + if (UpgradeId.Length != 0) hash ^= UpgradeId.GetHashCode(); + if (_unknownFields != null) { + hash ^= _unknownFields.GetHashCode(); + } + return hash; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public override string ToString() { + return pb::JsonFormatter.ToDiagnosticString(this); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public void WriteTo(pb::CodedOutputStream output) { + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + output.WriteRawMessage(this); + #else + if (UserId.Length != 0) { + output.WriteRawTag(10); + output.WriteString(UserId); + } + if (UpgradeId.Length != 0) { + output.WriteRawTag(18); + output.WriteString(UpgradeId); + } + if (_unknownFields != null) { + _unknownFields.WriteTo(output); + } + #endif + } + + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { + if (UserId.Length != 0) { + output.WriteRawTag(10); + output.WriteString(UserId); + } + if (UpgradeId.Length != 0) { + output.WriteRawTag(18); + output.WriteString(UpgradeId); + } + if (_unknownFields != null) { + _unknownFields.WriteTo(ref output); + } + } + #endif + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public int CalculateSize() { + int size = 0; + if (UserId.Length != 0) { + size += 1 + pb::CodedOutputStream.ComputeStringSize(UserId); + } + if (UpgradeId.Length != 0) { + size += 1 + pb::CodedOutputStream.ComputeStringSize(UpgradeId); + } + if (_unknownFields != null) { + size += _unknownFields.CalculateSize(); + } + return size; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public void MergeFrom(PurchaseDungeonUpgrade other) { + if (other == null) { + return; + } + if (other.UserId.Length != 0) { + UserId = other.UserId; + } + if (other.UpgradeId.Length != 0) { + UpgradeId = other.UpgradeId; + } + _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public void MergeFrom(pb::CodedInputStream input) { + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + input.ReadRawMessage(this); + #else + uint tag; + while ((tag = input.ReadTag()) != 0) { + switch(tag) { + default: + _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); + break; + case 10: { + UserId = input.ReadString(); + break; + } + case 18: { + UpgradeId = input.ReadString(); + break; + } + } + } + #endif + } + + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { + uint tag; + while ((tag = input.ReadTag()) != 0) { + switch(tag) { + default: + _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); + break; + case 10: { + UserId = input.ReadString(); + break; + } + case 18: { + UpgradeId = input.ReadString(); + break; + } + } + } + } + #endif + + } + + [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] + public sealed partial class GetDungeonAfkRewards : pb::IMessage + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + , pb::IBufferMessage + #endif + { + private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new GetDungeonAfkRewards()); + private pb::UnknownFieldSet _unknownFields; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public static pb::MessageParser Parser { get { return _parser; } } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public static pbr::MessageDescriptor Descriptor { + get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[27]; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public GetDungeonAfkRewards() { + OnConstruction(); + } + + partial void OnConstruction(); + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public GetDungeonAfkRewards(GetDungeonAfkRewards other) : this() { + userId_ = other.userId_; + _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public GetDungeonAfkRewards Clone() { + return new GetDungeonAfkRewards(this); + } + + /// Field number for the "user_id" field. + public const int UserIdFieldNumber = 1; + private string userId_ = ""; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public string UserId { + get { return userId_; } + set { + userId_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public override bool Equals(object other) { + return Equals(other as GetDungeonAfkRewards); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public bool Equals(GetDungeonAfkRewards other) { + if (ReferenceEquals(other, null)) { + return false; + } + if (ReferenceEquals(other, this)) { + return true; + } + if (UserId != other.UserId) return false; + return Equals(_unknownFields, other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public override int GetHashCode() { + int hash = 1; + if (UserId.Length != 0) hash ^= UserId.GetHashCode(); + if (_unknownFields != null) { + hash ^= _unknownFields.GetHashCode(); + } + return hash; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public override string ToString() { + return pb::JsonFormatter.ToDiagnosticString(this); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public void WriteTo(pb::CodedOutputStream output) { + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + output.WriteRawMessage(this); + #else + if (UserId.Length != 0) { + output.WriteRawTag(10); + output.WriteString(UserId); + } + if (_unknownFields != null) { + _unknownFields.WriteTo(output); + } + #endif + } + + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { + if (UserId.Length != 0) { + output.WriteRawTag(10); + output.WriteString(UserId); + } + if (_unknownFields != null) { + _unknownFields.WriteTo(ref output); + } + } + #endif + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public int CalculateSize() { + int size = 0; + if (UserId.Length != 0) { + size += 1 + pb::CodedOutputStream.ComputeStringSize(UserId); + } + if (_unknownFields != null) { + size += _unknownFields.CalculateSize(); + } + return size; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public void MergeFrom(GetDungeonAfkRewards other) { + if (other == null) { + return; + } + if (other.UserId.Length != 0) { + UserId = other.UserId; + } + _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public void MergeFrom(pb::CodedInputStream input) { + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + input.ReadRawMessage(this); + #else + uint tag; + while ((tag = input.ReadTag()) != 0) { + switch(tag) { + default: + _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); + break; + case 10: { + UserId = input.ReadString(); + break; + } + } + } + #endif + } + + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { + uint tag; + while ((tag = input.ReadTag()) != 0) { + switch(tag) { + default: + _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); + break; + case 10: { + UserId = input.ReadString(); + break; + } + } + } + } + #endif + + } + [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] public sealed partial class WebSocketResponse : pb::IMessage #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE @@ -7121,7 +7652,7 @@ public sealed partial class WebSocketResponse : pb::IMessage [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { - get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[26]; } + get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[28]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -8096,7 +8627,7 @@ public sealed partial class User : pb::IMessage [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { - get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[27]; } + get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[29]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -8567,7 +9098,7 @@ public sealed partial class KalineTreeLevel : pb::IMessage [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { - get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[28]; } + get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[30]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -8920,7 +9451,7 @@ public sealed partial class DungeonSettlementLevel : pb::IMessage [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { - get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[32]; } + get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[34]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -10063,7 +10594,7 @@ public sealed partial class UserCurrency : pb::IMessage [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { - get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[33]; } + get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[35]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -10299,7 +10830,7 @@ public sealed partial class Currency : pb::IMessage [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { - get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[34]; } + get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[36]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -10489,7 +11020,7 @@ public sealed partial class Unit : pb::IMessage [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { - get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[35]; } + get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[37]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -11010,7 +11541,7 @@ public sealed partial class Units : pb::IMessage [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { - get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[36]; } + get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[38]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -11189,7 +11720,7 @@ public sealed partial class UnitAndCurrencies : pb::IMessage [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { - get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[37]; } + get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[39]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -11414,7 +11945,7 @@ public sealed partial class Character : pb::IMessage [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { - get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[38]; } + get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[40]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -11715,7 +12246,7 @@ public sealed partial class Item : pb::IMessage [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { - get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[39]; } + get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[41]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -12062,7 +12593,7 @@ public sealed partial class ItemTemplate : pb::IMessage [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { - get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[40]; } + get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[42]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -12326,7 +12857,7 @@ public sealed partial class Campaigns : pb::IMessage [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { - get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[41]; } + get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[43]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -12505,7 +13036,7 @@ public sealed partial class Campaign : pb::IMessage [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { - get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[42]; } + get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[44]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -12795,7 +13326,7 @@ public sealed partial class Level : pb::IMessage [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { - get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[43]; } + get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[45]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -13148,7 +13679,7 @@ public sealed partial class CurrencyReward : pb::IMessage [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { - get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[44]; } + get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[46]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -13384,7 +13915,7 @@ public sealed partial class AfkRewards : pb::IMessage [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { - get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[45]; } + get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[47]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -13563,7 +14094,7 @@ public sealed partial class AfkReward : pb::IMessage [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { - get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[46]; } + get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[48]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -13799,7 +14330,7 @@ public sealed partial class Error : pb::IMessage [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { - get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[47]; } + get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[49]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -13989,7 +14520,7 @@ public sealed partial class Boxes : pb::IMessage [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { - get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[48]; } + get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[50]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -14168,7 +14699,7 @@ public sealed partial class Box : pb::IMessage [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { - get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[49]; } + get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[51]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -14510,7 +15041,7 @@ public sealed partial class RankWeights : pb::IMessage [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { - get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[50]; } + get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[52]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -14737,7 +15268,7 @@ public sealed partial class CurrencyCost : pb::IMessage [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { - get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[51]; } + get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[53]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -14973,7 +15504,7 @@ public sealed partial class UserAndUnit : pb::IMessage [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { - get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[52]; } + get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[54]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -15218,7 +15749,7 @@ public sealed partial class BattleResult : pb::IMessage [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { - get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[53]; } + get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[55]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -15480,7 +16011,7 @@ public sealed partial class State : pb::IMessage [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { - get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[54]; } + get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[56]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -15659,7 +16190,7 @@ public sealed partial class BattleUnit : pb::IMessage [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { - get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[55]; } + get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[57]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -16034,7 +16565,7 @@ public sealed partial class Step : pb::IMessage [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { - get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[56]; } + get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[58]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -16250,7 +16781,7 @@ public sealed partial class Action : pb::IMessage [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { - get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[57]; } + get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[59]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -16907,7 +17438,7 @@ public sealed partial class StatAffected : pb::IMessage [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { - get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[58]; } + get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[60]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -17134,7 +17665,7 @@ public sealed partial class SkillAction : pb::IMessage [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { - get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[59]; } + get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[61]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -17424,7 +17955,7 @@ public sealed partial class ExecutionReceived : pb::IMessage [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { - get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[60]; } + get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[62]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -17660,7 +18191,7 @@ public sealed partial class ModifierReceived : pb::IMessage [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { - get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[61]; } + get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[63]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -17970,7 +18501,7 @@ public sealed partial class TagReceived : pb::IMessage [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { - get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[62]; } + get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[64]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -18234,7 +18765,7 @@ public sealed partial class ModifierExpired : pb::IMessage [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { - get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[63]; } + get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[65]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -18544,7 +19075,7 @@ public sealed partial class TagExpired : pb::IMessage [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { - get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[64]; } + get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[66]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -18808,7 +19339,7 @@ public sealed partial class Death : pb::IMessage [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { - get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[65]; } + get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[67]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -18998,7 +19529,7 @@ public sealed partial class EnergyRegen : pb::IMessage [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { - get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[66]; } + get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[68]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -19262,7 +19793,7 @@ public sealed partial class StatOverride : pb::IMessage [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { - get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[67]; } + get { return global::Protobuf.Messages.GatewayReflection.Descriptor.MessageTypes[69]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] 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 0496a457..2f9fc423 100644 --- a/gateway.proto +++ b/gateway.proto @@ -23,12 +23,14 @@ 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; LevelUpDungeonSettlement level_up_dungeon_settlement = 26; + PurchaseDungeonUpgrade purchase_dungeon_upgrade = 27; + GetDungeonAfkRewards get_dungeon_afk_rewards = 28; } } @@ -111,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; } @@ -148,6 +150,14 @@ option csharp_namespace = "Protobuf.Messages"; string user_id = 1; } + message PurchaseDungeonUpgrade { + string user_id = 1; + string upgrade_id = 2; + } + + message GetDungeonAfkRewards { + string user_id = 1; + } //////////////////////////////////////// message WebSocketResponse {