diff --git a/ProjectNLD/Assets/Art/UI/Prefab/PVP/Button_EnemyInfo.prefab b/ProjectNLD/Assets/Art/UI/Prefab/PVP/Button_EnemyInfo.prefab new file mode 100644 index 00000000000..4b9e8d6054a --- /dev/null +++ b/ProjectNLD/Assets/Art/UI/Prefab/PVP/Button_EnemyInfo.prefab @@ -0,0 +1,527 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2069764899403845850 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5835140293271896549} + - component: {fileID: 2135920436101798975} + - component: {fileID: 7642598946704164594} + - component: {fileID: 5479304157978386947} + m_Layer: 5 + m_Name: Button_EnemyInfo + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5835140293271896549 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2069764899403845850} + 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: 383488329624488265} + - {fileID: 4607305694007656492} + - {fileID: 2868838875754721542} + m_Father: {fileID: 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: -634, y: -2} + m_SizeDelta: {x: 400, y: 500} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2135920436101798975 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2069764899403845850} + m_CullTransparentMesh: 1 +--- !u!114 &7642598946704164594 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2069764899403845850} + 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: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &5479304157978386947 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2069764899403845850} + 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: 1 + 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: 7642598946704164594} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &6756444528644015989 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4607305694007656492} + - component: {fileID: 9133800067592841350} + - component: {fileID: 145117741026248925} + m_Layer: 5 + m_Name: order + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4607305694007656492 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6756444528644015989} + 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: 5835140293271896549} + 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: 74} + m_SizeDelta: {x: 400, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &9133800067592841350 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6756444528644015989} + m_CullTransparentMesh: 1 +--- !u!114 &145117741026248925 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6756444528644015989} + 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: Button + 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: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 24 + m_fontSizeBase: 24 + 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: 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 &8483874738764512115 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 383488329624488265} + - component: {fileID: 995533521791063772} + - component: {fileID: 4501640233567081398} + m_Layer: 5 + m_Name: score + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &383488329624488265 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8483874738764512115} + 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: 5835140293271896549} + 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: 200} + m_SizeDelta: {x: 400, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &995533521791063772 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8483874738764512115} + m_CullTransparentMesh: 1 +--- !u!114 &4501640233567081398 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8483874738764512115} + 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: Button + 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: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 24 + m_fontSizeBase: 24 + 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: 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 &9006381702233408561 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2868838875754721542} + - component: {fileID: 8041819834862508934} + - component: {fileID: 7679532313819433318} + m_Layer: 5 + m_Name: nickName + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2868838875754721542 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9006381702233408561} + 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: 5835140293271896549} + 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: -95} + m_SizeDelta: {x: 400, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8041819834862508934 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9006381702233408561} + m_CullTransparentMesh: 1 +--- !u!114 &7679532313819433318 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9006381702233408561} + 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: Button + 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: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 24 + m_fontSizeBase: 24 + 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: 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} diff --git a/ProjectNLD/Assets/Art/UI/Prefab/PVP/Button_EnemyInfo.prefab.meta b/ProjectNLD/Assets/Art/UI/Prefab/PVP/Button_EnemyInfo.prefab.meta new file mode 100644 index 00000000000..fc58bad099e --- /dev/null +++ b/ProjectNLD/Assets/Art/UI/Prefab/PVP/Button_EnemyInfo.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 86e19f81082a97e409f96943eeca75e2 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectNLD/Assets/Art/UI/Prefab/PVP/UI_PVPMain.prefab b/ProjectNLD/Assets/Art/UI/Prefab/PVP/UI_PVPMain.prefab new file mode 100644 index 00000000000..a3cbcdbe9fe --- /dev/null +++ b/ProjectNLD/Assets/Art/UI/Prefab/PVP/UI_PVPMain.prefab @@ -0,0 +1,883 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &217111404588154564 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3799944151810130361} + - component: {fileID: 3404946713641850956} + - component: {fileID: 2684532316511348851} + m_Layer: 5 + m_Name: Text_Order + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3799944151810130361 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 217111404588154564} + 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: 4976636920185614098} + 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: 405} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3404946713641850956 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 217111404588154564} + m_CullTransparentMesh: 1 +--- !u!114 &2684532316511348851 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 217111404588154564} + 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: New Text + 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: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, 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: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + 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: 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 &940135666646268060 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4976636920185614098} + m_Layer: 5 + m_Name: UI_PVPMain + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4976636920185614098 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 940135666646268060} + 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: 1527736702416603300} + - {fileID: 5819675090657058001} + - {fileID: 192808497333167116} + - {fileID: 6560666072739069428} + - {fileID: 6752672994832151256} + - {fileID: 3799944151810130361} + - {fileID: 417179245032235755} + m_Father: {fileID: 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: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &2307170424800068300 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6752672994832151256} + - component: {fileID: 4642326910791326169} + - component: {fileID: 6858722336054766511} + m_Layer: 5 + m_Name: Text_Score + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6752672994832151256 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2307170424800068300} + 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: 4976636920185614098} + 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: 475} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4642326910791326169 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2307170424800068300} + m_CullTransparentMesh: 1 +--- !u!114 &6858722336054766511 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2307170424800068300} + 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: New Text + 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: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, 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: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + 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: 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 &3919226011281377730 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1527736702416603300} + - component: {fileID: 7498100194951554428} + - component: {fileID: 1983487900946146048} + m_Layer: 5 + m_Name: bkg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1527736702416603300 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3919226011281377730} + 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: 4976636920185614098} + 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: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7498100194951554428 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3919226011281377730} + m_CullTransparentMesh: 1 +--- !u!114 &1983487900946146048 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3919226011281377730} + 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.61635214, g: 0.31205246, b: 0.31205246, 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: 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!1001 &16104029231242548 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4976636920185614098} + m_Modifications: + - target: {fileID: 2069764899403845850, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_Name + value: Button_EnemyInfo_0 + objectReference: {fileID: 0} + - target: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_SizeDelta.x + value: 400 + objectReference: {fileID: 0} + - target: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_SizeDelta.y + value: 500 + objectReference: {fileID: 0} + - target: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -634 + objectReference: {fileID: 0} + - target: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -2 + objectReference: {fileID: 0} + - target: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 86e19f81082a97e409f96943eeca75e2, type: 3} +--- !u!224 &5819675090657058001 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + m_PrefabInstance: {fileID: 16104029231242548} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &862085452471729169 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4976636920185614098} + m_Modifications: + - target: {fileID: 2069764899403845850, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_Name + value: Button_EnemyInfo_2 + objectReference: {fileID: 0} + - target: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_SizeDelta.x + value: 400 + objectReference: {fileID: 0} + - target: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_SizeDelta.y + value: 500 + objectReference: {fileID: 0} + - target: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 617 + objectReference: {fileID: 0} + - target: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -2 + objectReference: {fileID: 0} + - target: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 86e19f81082a97e409f96943eeca75e2, type: 3} +--- !u!224 &6560666072739069428 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + m_PrefabInstance: {fileID: 862085452471729169} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &4900039867698542505 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4976636920185614098} + m_Modifications: + - target: {fileID: 4740722626188776770, guid: 2ece976bb7b041640a969c074b3c7858, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4740722626188776770, guid: 2ece976bb7b041640a969c074b3c7858, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4740722626188776770, guid: 2ece976bb7b041640a969c074b3c7858, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4740722626188776770, guid: 2ece976bb7b041640a969c074b3c7858, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4740722626188776770, guid: 2ece976bb7b041640a969c074b3c7858, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4740722626188776770, guid: 2ece976bb7b041640a969c074b3c7858, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4740722626188776770, guid: 2ece976bb7b041640a969c074b3c7858, + type: 3} + propertyPath: m_SizeDelta.x + value: 455.93005 + objectReference: {fileID: 0} + - target: {fileID: 4740722626188776770, guid: 2ece976bb7b041640a969c074b3c7858, + type: 3} + propertyPath: m_SizeDelta.y + value: 127.100006 + objectReference: {fileID: 0} + - target: {fileID: 4740722626188776770, guid: 2ece976bb7b041640a969c074b3c7858, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4740722626188776770, guid: 2ece976bb7b041640a969c074b3c7858, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4740722626188776770, guid: 2ece976bb7b041640a969c074b3c7858, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4740722626188776770, guid: 2ece976bb7b041640a969c074b3c7858, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4740722626188776770, guid: 2ece976bb7b041640a969c074b3c7858, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4740722626188776770, guid: 2ece976bb7b041640a969c074b3c7858, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4740722626188776770, guid: 2ece976bb7b041640a969c074b3c7858, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4740722626188776770, guid: 2ece976bb7b041640a969c074b3c7858, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -688 + objectReference: {fileID: 0} + - target: {fileID: 4740722626188776770, guid: 2ece976bb7b041640a969c074b3c7858, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 446 + objectReference: {fileID: 0} + - target: {fileID: 4740722626188776770, guid: 2ece976bb7b041640a969c074b3c7858, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4740722626188776770, guid: 2ece976bb7b041640a969c074b3c7858, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4740722626188776770, guid: 2ece976bb7b041640a969c074b3c7858, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8687545733931836314, guid: 2ece976bb7b041640a969c074b3c7858, + type: 3} + propertyPath: m_Name + value: Button_Back + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2ece976bb7b041640a969c074b3c7858, type: 3} +--- !u!224 &417179245032235755 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4740722626188776770, guid: 2ece976bb7b041640a969c074b3c7858, + type: 3} + m_PrefabInstance: {fileID: 4900039867698542505} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &5933047622426306025 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4976636920185614098} + m_Modifications: + - target: {fileID: 2069764899403845850, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_Name + value: Button_EnemyInfo_1 + objectReference: {fileID: 0} + - target: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_SizeDelta.x + value: 400 + objectReference: {fileID: 0} + - target: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_SizeDelta.y + value: 500 + objectReference: {fileID: 0} + - target: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -2 + objectReference: {fileID: 0} + - target: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 86e19f81082a97e409f96943eeca75e2, type: 3} +--- !u!224 &192808497333167116 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5835140293271896549, guid: 86e19f81082a97e409f96943eeca75e2, + type: 3} + m_PrefabInstance: {fileID: 5933047622426306025} + m_PrefabAsset: {fileID: 0} diff --git a/ProjectNLD/Assets/Art/UI/Prefab/PVP/UI_PVPMain.prefab.meta b/ProjectNLD/Assets/Art/UI/Prefab/PVP/UI_PVPMain.prefab.meta new file mode 100644 index 00000000000..9352ccbff7f --- /dev/null +++ b/ProjectNLD/Assets/Art/UI/Prefab/PVP/UI_PVPMain.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 52cff7261e489cd4c8c5bfbfa81d20ae +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectNLD/Assets/Code/Scripts/Framework/Event/Events.cs b/ProjectNLD/Assets/Code/Scripts/Framework/Event/Events.cs index 3e15e6572c7..da5c4f1cdda 100644 --- a/ProjectNLD/Assets/Code/Scripts/Framework/Event/Events.cs +++ b/ProjectNLD/Assets/Code/Scripts/Framework/Event/Events.cs @@ -184,6 +184,7 @@ //PVP OnPVPFightStart, OnPVPFightFinish, + OnGetPVPInformationFromServer, OnGetPVPInformation, OnPVPFightDataSettlement, } diff --git a/ProjectNLD/Assets/Code/Scripts/Framework/UI/UIManager.Window.cs b/ProjectNLD/Assets/Code/Scripts/Framework/UI/UIManager.Window.cs index 00bcea6f4f6..933bddfe4f5 100644 --- a/ProjectNLD/Assets/Code/Scripts/Framework/UI/UIManager.Window.cs +++ b/ProjectNLD/Assets/Code/Scripts/Framework/UI/UIManager.Window.cs @@ -68,7 +68,7 @@ public partial class UIManager _WindowMeta(UINameConst.UI_Purchase, UIWindowLayer.Normal); _WindowMeta(UINameConst.UI_GetItemWindow, UIWindowLayer.Normal); _WindowMeta(UINameConst.UINoticeOne, UIWindowLayer.Max); - + _WindowMeta(UINameConst.UI_PVPMain,UIWindowLayer.Normal); } @@ -155,5 +155,5 @@ public static class UINameConst public static readonly string UI_Shop = "Interface/Shop/UI_Shop"; public static readonly string UI_Purchase = "Interface/Shop/UI_Purchase"; public static readonly string UI_GetItemWindow= "Interface/Shop/UI_GetItemWindow"; - + public static readonly string UI_PVPMain = "PVP/UI_PVPMain"; } \ No newline at end of file diff --git a/ProjectNLD/Assets/Code/Scripts/Gameplay/Debug/SROptions.Level.cs b/ProjectNLD/Assets/Code/Scripts/Gameplay/Debug/SROptions.Level.cs index b17a714230a..3c63e726b3f 100644 --- a/ProjectNLD/Assets/Code/Scripts/Gameplay/Debug/SROptions.Level.cs +++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/Debug/SROptions.Level.cs @@ -1 +1 @@ -using System.Collections.Generic; using System.ComponentModel; using Framework; using Framework.Wrapper; using Gameplay; using Gameplay.Area; using Gameplay.Character; using Gameplay.Level; using Gameplay.SubSystems; using UnityEngine; using CharacterInfo = Gameplay.Net.CharacterInfo; public partial class SROptions { [Category("Level")] public int LevelId { get { return _levelId; } set { _levelId = value; } } private int _levelId = 101; [Category("Level")] public void EnterLevel() { LevelManager.Instance.TryEnterLevel(LevelId); } [Category("Level")] public void EnterPVPLevel() { var pvpData = new PVPDefenderData(); List unitInfos = new(); unitInfos.Add(new() { unitID = 100001, cellIndex = 74, }); // unitInfos.Add(new() // { // unitID = 100002, // cellIndex = 75, // }); // unitInfos.Add(new() // { // unitID = 100003, // cellIndex = 76, // }); unitInfos.Add(new() { unitID = 300001, cellIndex = 77, type = Unit.UnitType.Vehicle, }); List characterInfos = new(); characterInfos.Add(new() { ID = 100001, AwakeLevel = 1, BreakLevel = 1, Level = 1, UltraSkillLevel = 1, }); Gameplay.Net.VehicleInfo vehicleInfo = new() { nID = 300001, UpgradeCount = new ushort[5] { 0, 0, 0, 0, 0 }, }; pvpData.Init(unitInfos, characterInfos, vehicleInfo); LevelManager.Instance.TryEnterLevel(TableManager.Instance.Tables.GlobalConfig.PVPLevelID, null, pvpData); } [Category("Level")] public void EnterPVPDefenderPrepare() { PVPManager.Instance.EnterDefendPrepare(); } [Category("Level")] public bool ShowCharacterID { get { return _showCharacterID; } set { _showCharacterID = value; if (_showCharacterID) { UIManager.Instance.OpenWindow(UINameConst.UIDebugShowID); } else { UIManager.Instance.CloseWindow(UINameConst.UIDebugShowID); } } } private bool _showCharacterID = false; [Category("Level")] public bool ShowPrepareRegion { get { return _showPrepareRegion; } set { _showPrepareRegion = value; if (_showPrepareRegion) { AreaManager.instance.readyAreaManager.ShowReadyArea(); } else { AreaManager.instance.readyAreaManager.HideReadyArea(); } } } private bool _showPrepareRegion = false; [Category("Level")] public bool ShowMapDebugInfo { get { return _showMapDebugInfo; } set { _showMapDebugInfo = value; LevelManager.Instance?.CurrentLevel?.Map?.ShowInfo(_showMapDebugInfo ? -1 : 0); } } private bool _showMapDebugInfo = false; // // [Category("Level")] // public bool Pause { // get { return _pause; } // set // { // _pause = value; // LevelManager.Instance.CurrentLevel.SetPause(_pause); // } // } // private bool _pause = false; // // [Category("Level")] // public float Speed { // get { return _speed; } // set // { // _speed = value; // LevelManager.Instance.CurrentLevel.SetSpeed(_speed); // } // } // private float _speed = ELevelSpeed.Normal; [Category("Level")] public void StageSuccess() { LevelManager.Instance.CurrentLevel?.EnterNextStage(); } [Category("Level")] public void LevelSuccess() { LevelManager.Instance.TryExitLevel(true); } [Category("Level")] public void LevelFail() { LevelManager.Instance.TryExitLevel(false); } } \ No newline at end of file +using System.Collections.Generic; using System.ComponentModel; using Framework; using Framework.Wrapper; using Gameplay; using Gameplay.Area; using Gameplay.Character; using Gameplay.Level; using Gameplay.SubSystems; using UnityEngine; using CharacterInfo = Gameplay.Net.CharacterInfo; public partial class SROptions { [Category("Level")] public int LevelId { get { return _levelId; } set { _levelId = value; } } private int _levelId = 101; [Category("Level")] public void EnterLevel() { LevelManager.Instance.TryEnterLevel(LevelId); } [Category("Level")] public void EnterPVPLevel() { // var pvpData = new PVPDefenderData(); // List unitInfos = new(); // unitInfos.Add(new() // { // unitID = 100001, // cellIndex = 74, // }); // // unitInfos.Add(new() // // { // // unitID = 100002, // // cellIndex = 75, // // }); // // unitInfos.Add(new() // // { // // unitID = 100003, // // cellIndex = 76, // // }); // unitInfos.Add(new() // { // unitID = 300001, // cellIndex = 77, // type = Unit.UnitType.Vehicle, // }); // List characterInfos = new(); // characterInfos.Add(new() // { // ID = 100001, // AwakeLevel = 1, // BreakLevel = 1, // Level = 1, // UltraSkillLevel = 1, // }); // Gameplay.Net.VehicleInfo vehicleInfo = new() // { // nID = 300001, // UpgradeCount = new ushort[5] { 0, 0, 0, 0, 0 }, // }; // pvpData.Init(unitInfos, characterInfos, vehicleInfo); // LevelManager.Instance.TryEnterLevel(TableManager.Instance.Tables.GlobalConfig.PVPLevelID, null, pvpData); UIManager.Instance.OpenWindow(UINameConst.UI_PVPMain); } [Category("Level")] public void EnterPVPDefenderPrepare() { PVPManager.Instance.EnterDefendPrepare(); } [Category("Level")] public bool ShowCharacterID { get { return _showCharacterID; } set { _showCharacterID = value; if (_showCharacterID) { UIManager.Instance.OpenWindow(UINameConst.UIDebugShowID); } else { UIManager.Instance.CloseWindow(UINameConst.UIDebugShowID); } } } private bool _showCharacterID = false; [Category("Level")] public bool ShowPrepareRegion { get { return _showPrepareRegion; } set { _showPrepareRegion = value; if (_showPrepareRegion) { AreaManager.instance.readyAreaManager.ShowReadyArea(); } else { AreaManager.instance.readyAreaManager.HideReadyArea(); } } } private bool _showPrepareRegion = false; [Category("Level")] public bool ShowMapDebugInfo { get { return _showMapDebugInfo; } set { _showMapDebugInfo = value; LevelManager.Instance?.CurrentLevel?.Map?.ShowInfo(_showMapDebugInfo ? -1 : 0); } } private bool _showMapDebugInfo = false; // // [Category("Level")] // public bool Pause { // get { return _pause; } // set // { // _pause = value; // LevelManager.Instance.CurrentLevel.SetPause(_pause); // } // } // private bool _pause = false; // // [Category("Level")] // public float Speed { // get { return _speed; } // set // { // _speed = value; // LevelManager.Instance.CurrentLevel.SetSpeed(_speed); // } // } // private float _speed = ELevelSpeed.Normal; [Category("Level")] public void StageSuccess() { LevelManager.Instance.CurrentLevel?.EnterNextStage(); } [Category("Level")] public void LevelSuccess() { LevelManager.Instance.TryExitLevel(true); } [Category("Level")] public void LevelFail() { LevelManager.Instance.TryExitLevel(false); } } \ No newline at end of file diff --git a/ProjectNLD/Assets/Code/Scripts/Gameplay/Level/LevelManager.Action.cs b/ProjectNLD/Assets/Code/Scripts/Gameplay/Level/LevelManager.Action.cs index 0e3103c115b..e9e56dba554 100644 --- a/ProjectNLD/Assets/Code/Scripts/Gameplay/Level/LevelManager.Action.cs +++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/Level/LevelManager.Action.cs @@ -190,7 +190,7 @@ namespace Gameplay.Level if (chapterInfo.CanGetReward(index)) { DebugUtil.Log($"[Level] 发送领取章节奖励!章节ID{levelGroupID} index:{index}"); - NetHelper.ChapterReward((uint)levelGroupID, (uint)index); + NetHelper.LevelGroupReward((uint)levelGroupID, (uint)index); return; } } diff --git a/ProjectNLD/Assets/Code/Scripts/Gameplay/Net/Actor/Part/PartPvp.cs b/ProjectNLD/Assets/Code/Scripts/Gameplay/Net/Actor/Part/PartPvp.cs index ed5a4b31976..8dffd299e60 100644 --- a/ProjectNLD/Assets/Code/Scripts/Gameplay/Net/Actor/Part/PartPvp.cs +++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/Net/Actor/Part/PartPvp.cs @@ -61,7 +61,7 @@ namespace Gameplay.Net public void OnPvpInformation(NLDPB.G_Clt_PvpInformation pb) { - EventManager.Instance.Send(EventManager.EventName.OnGetPVPInformation, pb); + EventManager.Instance.Send(EventManager.EventName.OnGetPVPInformationFromServer, pb); } //结算之前的PVP数据 diff --git a/ProjectNLD/Assets/Code/Scripts/Gameplay/Net/Client/NetHelper.cs b/ProjectNLD/Assets/Code/Scripts/Gameplay/Net/Client/NetHelper.cs index 5633008558d..cf774ebf7b5 100644 --- a/ProjectNLD/Assets/Code/Scripts/Gameplay/Net/Client/NetHelper.cs +++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/Net/Client/NetHelper.cs @@ -37,6 +37,7 @@ namespace Gameplay.Net msg.mPB.LevelId = nLevelID; msg.mPB.TeamIndex = nTeamIndex; NetManager.Instance.mClient.SendMessage(msg); + DebugUtil.Log($"C->S send message EnterLevel,levelID:{nLevelID} nTeamIndex:{nTeamIndex}"); } // 退出关卡，关卡结算 @@ -49,11 +50,11 @@ namespace Gameplay.Net } // 领取章节宝箱 - public static void ChapterReward(uint nChapterID, uint nIndex) + public static void LevelGroupReward(uint nGroupID, uint nIndex) { - MSG_Clt_G_ChapterReward msg = - NetManager.Instance.GetMessage(NLDMID.MSGID.CltGChapterReward) as MSG_Clt_G_ChapterReward; - msg.mPB.Chapter = nChapterID; + MSG_Clt_G_GroupReward msg = + NetManager.Instance.GetMessage(NLDMID.MSGID.CltGGroupReward) as MSG_Clt_G_GroupReward; + msg.mPB.GroupId = nGroupID; msg.mPB.Index = nIndex; NetManager.Instance.mClient.SendMessage(msg); } diff --git a/ProjectNLD/Assets/Code/Scripts/Gameplay/Net/Client/NetManager.cs b/ProjectNLD/Assets/Code/Scripts/Gameplay/Net/Client/NetManager.cs index dac698bd4e5..19b44ebaa53 100644 --- a/ProjectNLD/Assets/Code/Scripts/Gameplay/Net/Client/NetManager.cs +++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/Net/Client/NetManager.cs @@ -111,7 +111,7 @@ namespace Gameplay.Net m_MessagePool[(int)NLDMID.MSGID.GCltActorRaffle] = new MSG_G_Clt_ActorRaffle(); m_MessagePool[(int)NLDMID.MSGID.CltGRaffle] = new MSG_Clt_G_Raffle(); m_MessagePool[(int)NLDMID.MSGID.GCltItemList] = new MSG_G_Clt_ItemList(); - m_MessagePool[(int)NLDMID.MSGID.CltGChapterReward] = new MSG_Clt_G_ChapterReward(); + m_MessagePool[(int)NLDMID.MSGID.CltGGroupReward] = new MSG_Clt_G_GroupReward(); m_MessagePool[(int)NLDMID.MSGID.CltGVehicleUpgrade] = new MSG_Clt_G_VehicleUpgrade(); m_MessagePool[(int)NLDMID.MSGID.GCltActorTeam] = new MSG_G_Clt_ActorTeam(); m_MessagePool[(int)NLDMID.MSGID.CltGCreateTeam] = new MSG_Clt_G_CreateTeam(); @@ -140,6 +140,8 @@ namespace Gameplay.Net m_MessagePool[(int)NLDMID.MSGID.CltGPvpResult] = new MSG_Clt_G_PvpResult(); m_MessagePool[(int)NLDMID.MSGID.GCltActorPvp] = new MSG_G_Clt_ActorPvp(); m_MessagePool[(int)NLDMID.MSGID.GCltPvpDefenceData] = new MSG_G_Clt_PvpDefenceData(); + m_MessagePool[(int)NLDMID.MSGID.CltMgPvpOrderList] = new MSG_Clt_Mg_PvpOrderList(); + m_MessagePool[(int)NLDMID.MSGID.MgCltPvpOrderListData] = new MSG_Mg_Clt_PvpOrderListData(); // MESSAGE_END } diff --git a/ProjectNLD/Assets/Code/Scripts/Gameplay/Net/Messages/MSG_Clt_G_ChapterReward.cs b/ProjectNLD/Assets/Code/Scripts/Gameplay/Net/Messages/MSG_Clt_G_GroupReward.cs similarity index 67% rename from ProjectNLD/Assets/Code/Scripts/Gameplay/Net/Messages/MSG_Clt_G_ChapterReward.cs rename to ProjectNLD/Assets/Code/Scripts/Gameplay/Net/Messages/MSG_Clt_G_GroupReward.cs index d2226588261..58cb6a56fc5 100644 --- a/ProjectNLD/Assets/Code/Scripts/Gameplay/Net/Messages/MSG_Clt_G_ChapterReward.cs +++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/Net/Messages/MSG_Clt_G_GroupReward.cs @@ -1,8 +1,8 @@ ////////////////////////////////////////////////////////////////////////// // -// 文件：/Code/Scripts/Gameplay/Net/Messages/MSG_Clt_G_ChapterReward.cs +// 文件：/Code/Scripts/Gameplay/Net/Messages/MSG_Clt_G_GroupReward.cs // 作者：NLD Tools -// 时间：9/4/2023 +// 时间：2024/1/8 // 描述：client --> game 领取章节宝箱 // 说明： // @@ -14,17 +14,17 @@ using Framework; namespace Gameplay.Net { - public sealed class MSG_Clt_G_ChapterReward : IMessage + public sealed class MSG_Clt_G_GroupReward : IMessage { - public override MSGID ID { get { return MSGID.CltGChapterReward; } } + public override MSGID ID { get { return MSGID.CltGGroupReward; } } - private Clt_G_ChapterReward m_PB; - public Clt_G_ChapterReward mPB + private Clt_G_GroupReward m_PB; + public Clt_G_GroupReward mPB { get { if (m_PB == null) - m_PB = new Clt_G_ChapterReward(); + m_PB = new Clt_G_GroupReward(); return m_PB; } @@ -40,7 +40,7 @@ namespace Gameplay.Net public override void Import(byte[] data, int offset, int length) { - m_PB = Clt_G_ChapterReward.Parser.ParseFrom(data, offset, length); + m_PB = Clt_G_GroupReward.Parser.ParseFrom(data, offset, length); } // 消息处理接口 diff --git a/ProjectNLD/Assets/Code/Scripts/Gameplay/Net/Messages/MSG_Clt_G_ChapterReward.cs.meta b/ProjectNLD/Assets/Code/Scripts/Gameplay/Net/Messages/MSG_Clt_G_GroupReward.cs.meta similarity index 83% rename from ProjectNLD/Assets/Code/Scripts/Gameplay/Net/Messages/MSG_Clt_G_ChapterReward.cs.meta rename to ProjectNLD/Assets/Code/Scripts/Gameplay/Net/Messages/MSG_Clt_G_GroupReward.cs.meta index 0ba10eace0b..bbb484b7ee9 100644 --- a/ProjectNLD/Assets/Code/Scripts/Gameplay/Net/Messages/MSG_Clt_G_ChapterReward.cs.meta +++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/Net/Messages/MSG_Clt_G_GroupReward.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1a7815c8961604d51815d831e27f070b +guid: b527eeff74e9281438ebfd9d1c024b0f MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/ProjectNLD/Assets/Code/Scripts/Gameplay/Net/Messages/MSG_Clt_Mg_PvpOrderList.cs b/ProjectNLD/Assets/Code/Scripts/Gameplay/Net/Messages/MSG_Clt_Mg_PvpOrderList.cs new file mode 100644 index 00000000000..7a5974db7cf --- /dev/null +++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/Net/Messages/MSG_Clt_Mg_PvpOrderList.cs @@ -0,0 +1,54 @@ +////////////////////////////////////////////////////////////////////////// +// +// 文件：/Code/Scripts/Gameplay/Net/Messages/MSG_Clt_Mg_PvpOrderList.cs +// 作者：NLD Tools +// 时间：2024/1/8 +// 描述：client --> manager 请求pvp排行榜 +// 说明： +// +////////////////////////////////////////////////////////////////////////// + +using NLDMID; +using NLDPB; +using Framework; + +namespace Gameplay.Net +{ + public sealed class MSG_Clt_Mg_PvpOrderList : IMessage + { + public override MSGID ID { get { return MSGID.CltMgPvpOrderList; } } + + private Clt_Mg_PvpOrderList m_PB; + public Clt_Mg_PvpOrderList mPB + { + get + { + if (m_PB == null) + m_PB = new Clt_Mg_PvpOrderList(); + + return m_PB; + } + } + + public override byte[] Export() + { + // 写入PB数据 + byte[] bytes = new byte[mPB.CalculateSize()]; + mPB.WriteTo(new Google.Protobuf.CodedOutputStream(bytes)); + return bytes; + } + + public override void Import(byte[] data, int offset, int length) + { + m_PB = Clt_Mg_PvpOrderList.Parser.ParseFrom(data, offset, length); + } + + // 消息处理接口 + public override void Execute(NetClient client) + { + + + + } + } +} diff --git a/ProjectNLD/Assets/Code/Scripts/Gameplay/Net/Messages/MSG_Clt_Mg_PvpOrderList.cs.meta b/ProjectNLD/Assets/Code/Scripts/Gameplay/Net/Messages/MSG_Clt_Mg_PvpOrderList.cs.meta new file mode 100644 index 00000000000..00192ee4a20 --- /dev/null +++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/Net/Messages/MSG_Clt_Mg_PvpOrderList.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c33b839e879b28049bd66a68aaf66f46 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectNLD/Assets/Code/Scripts/Gameplay/Net/Messages/MSG_G_Clt_ActorLevel.cs b/ProjectNLD/Assets/Code/Scripts/Gameplay/Net/Messages/MSG_G_Clt_ActorLevel.cs index bc9a19433c6..99c301d97b6 100644 --- a/ProjectNLD/Assets/Code/Scripts/Gameplay/Net/Messages/MSG_G_Clt_ActorLevel.cs +++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/Net/Messages/MSG_G_Clt_ActorLevel.cs @@ -56,9 +56,9 @@ namespace Gameplay.Net Actor.Instance.Level.SetLevelInfo(m_PB.Infos[i].Id, m_PB.Infos[i].IsPassed, m_PB.Infos[i].Star); } - for(int i = 0; i < mPB.Chapters.Count; i ++) + for(int i = 0; i < mPB.Groups.Count; i ++) { - Actor.Instance.Level.SetChapterInfo(mPB.Chapters[i].Id, mPB.Chapters[i].RewardIndex); + Actor.Instance.Level.SetChapterInfo(mPB.Groups[i].Id, mPB.Groups[i].RewardIndex); } } } diff --git a/ProjectNLD/Assets/Code/Scripts/Gameplay/Net/Messages/MSG_G_Clt_OpResult.cs b/ProjectNLD/Assets/Code/Scripts/Gameplay/Net/Messages/MSG_G_Clt_OpResult.cs index c1dc7be63c6..3804c266d9c 100644 --- a/ProjectNLD/Assets/Code/Scripts/Gameplay/Net/Messages/MSG_G_Clt_OpResult.cs +++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/Net/Messages/MSG_G_Clt_OpResult.cs @@ -11,6 +11,7 @@ using NLDMID; using NLDPB; using Framework; +using UnityEngine; namespace Gameplay.Net { @@ -54,7 +55,7 @@ namespace Gameplay.Net return; } - + DebugUtil.Log($"Op Result:OK msgID:{((MSGID)m_PB.MsgId).ToString()} "); switch (m_PB.MsgId) { case (uint)MSGID.CltGCharacterUpgrade: @@ -138,10 +139,10 @@ namespace Gameplay.Net break; } case (uint)MSGID.CltGPvpResult: - { - EventManager.Instance.Send(EventManager.EventName.OnPVPFightFinish); - break; - } + { + EventManager.Instance.Send(EventManager.EventName.OnPVPFightFinish); + break; + } } } } diff --git a/ProjectNLD/Assets/Code/Scripts/Gameplay/Net/Messages/MSG_Mg_Clt_PvpOrderListData.cs b/ProjectNLD/Assets/Code/Scripts/Gameplay/Net/Messages/MSG_Mg_Clt_PvpOrderListData.cs new file mode 100644 index 00000000000..b1eb23a3369 --- /dev/null +++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/Net/Messages/MSG_Mg_Clt_PvpOrderListData.cs @@ -0,0 +1,54 @@ +////////////////////////////////////////////////////////////////////////// +// +// 文件：/Code/Scripts/Gameplay/Net/Messages/MSG_Mg_Clt_PvpOrderListData.cs +// 作者：NLD Tools +// 时间：2024/1/8 +// 描述：manager --> client pvp排行榜数据 +// 说明： +// +////////////////////////////////////////////////////////////////////////// + +using NLDMID; +using NLDPB; +using Framework; + +namespace Gameplay.Net +{ + public sealed class MSG_Mg_Clt_PvpOrderListData : IMessage + { + public override MSGID ID { get { return MSGID.MgCltPvpOrderListData; } } + + private Mg_Clt_PvpOrderListData m_PB; + public Mg_Clt_PvpOrderListData mPB + { + get + { + if (m_PB == null) + m_PB = new Mg_Clt_PvpOrderListData(); + + return m_PB; + } + } + + public override byte[] Export() + { + // 写入PB数据 + byte[] bytes = new byte[mPB.CalculateSize()]; + mPB.WriteTo(new Google.Protobuf.CodedOutputStream(bytes)); + return bytes; + } + + public override void Import(byte[] data, int offset, int length) + { + m_PB = Mg_Clt_PvpOrderListData.Parser.ParseFrom(data, offset, length); + } + + // 消息处理接口 + public override void Execute(NetClient client) + { + + + + } + } +} diff --git a/ProjectNLD/Assets/Code/Scripts/Gameplay/Net/Messages/MSG_Mg_Clt_PvpOrderListData.cs.meta b/ProjectNLD/Assets/Code/Scripts/Gameplay/Net/Messages/MSG_Mg_Clt_PvpOrderListData.cs.meta new file mode 100644 index 00000000000..e8bf26a95a4 --- /dev/null +++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/Net/Messages/MSG_Mg_Clt_PvpOrderListData.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 18d5b00acb45df249a729b35a85d2a89 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectNLD/Assets/Code/Scripts/Gameplay/Net/Proto/Client.cs b/ProjectNLD/Assets/Code/Scripts/Gameplay/Net/Proto/Client.cs index 4a6c686dd5b..dfff7d1e8f9 100644 --- a/ProjectNLD/Assets/Code/Scripts/Gameplay/Net/Proto/Client.cs +++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/Net/Proto/Client.cs @@ -59,82 +59,86 @@ namespace NLDPB { "YXNrSW5mbxIlCgZjb3VudHMYAyADKAsyFS5OTERfUEIuTVNHX1Rhc2tDb3Vu", "dCIlChFDbHRfR19TZXROaWNrbmFtZRIQCghuaWNrbmFtZRgBIAEoCSI8Cg1N", "U0dfTGV2ZWxJbmZvEgoKAmlkGAEgASgNEhEKCWlzX3Bhc3NlZBgCIAEoCBIM", - "CgRzdGFyGAMgASgNIjMKD01TR19DaGFwdGVySW5mbxIKCgJpZBgBIAEoDRIU", - "CgxyZXdhcmRfaW5kZXgYAiABKA0iowEKEEdfQ2x0X0FjdG9yTGV2ZWwSDgoG", - "aXNfYWxsGAEgASgIEhUKDWxhc3RfZW50ZXJfaWQYAiABKA0SFwoPbGFzdF9l", - "bnRlcl90aW1lGAMgASgNEiQKBWluZm9zGAQgAygLMhUuTkxEX1BCLk1TR19M", - "ZXZlbEluZm8SKQoIY2hhcHRlcnMYBSADKAsyFy5OTERfUEIuTVNHX0NoYXB0", - "ZXJJbmZvIjgKEENsdF9HX0VudGVyTGV2ZWwSEAoIbGV2ZWxfaWQYASABKA0S", - "EgoKdGVhbV9pbmRleBgCIAEoDSIzCg9DbHRfR19FeGl0TGV2ZWwSEgoKaXNf", - "c3VjY2VzcxgBIAEoCBIMCgRzdGFyGAIgASgNIl0KD01TR19SYWZmbGVDb3Vu", - "dBIQCghnYWNoYV9pZBgBIAEoDRISCgpmcmVlX2NvdW50GAIgASgNEhEKCWxp", - "bWl0X3RlbhgDIAEoDRIRCglsaW1pdF9vbmUYBCABKA0iSwoRR19DbHRfQWN0", - "b3JSYWZmbGUSDQoFY2xlYXIYASABKAgSJwoGY291bnRzGAIgAygLMhcuTkxE", - "X1BCLk1TR19SYWZmbGVDb3VudCJPCgxDbHRfR19SYWZmbGUSCgoCaWQYASAB", - "KA0SDAoEdHlwZRgCIAEoDRIPCgdpc19mcmVlGAMgASgIEhQKDHRpY2tldF9j", - "b3VudBgEIAEoDSJsCg5HX0NsdF9JdGVtTGlzdBITCgtpdGVtX3NvdXJjZRgB", - "IAEoDRIRCglzb3VyY2VfaWQYAiABKA0SDwoHaXRlbV9pZBgDIAMoDRISCgpp", - "dGVtX2NvdW50GAQgAygNEg0KBWluZGV4GAUgASgNIjUKE0NsdF9HX0NoYXB0", - "ZXJSZXdhcmQSDwoHY2hhcHRlchgBIAEoDRINCgVpbmRleBgCIAEoDSJXChRD", - "bHRfR19WZWhpY2xlVXBncmFkZRISCgp2ZWhpY2xlX2lkGAEgASgNEhQKDHVw", - "Z3JhZGVfdHlwZRgCIAMoDRIVCg11cGdyYWRlX2NvdW50GAMgAygNImMKDE1T", - "R19UZWFtSW5mbxINCgVpbmRleBgBIAEoDRIMCgRuYW1lGAIgASgJEgwKBGlj", - "b24YAyABKA0SFAoMY2hhcmFjdGVyX2lkGAQgAygNEhIKCnZlaGljbGVfaWQY", - "BSABKA0iRgoPR19DbHRfQWN0b3JUZWFtEg4KBmlzX2FsbBgBIAEoCBIjCgVp", - "bmZvcxgCIAMoCzIULk5MRF9QQi5NU0dfVGVhbUluZm8iZwoQQ2x0X0dfQ3Jl", - "YXRlVGVhbRINCgVpbmRleBgBIAEoDRIMCgRuYW1lGAIgASgJEgwKBGljb24Y", - "AyABKA0SFAoMY2hhcmFjdGVyX2lkGAQgAygNEhIKCnZlaGljbGVfaWQYBSAB", - "KA0iKgoNQ2x0X0dfVXNlSXRlbRIKCgJpZBgBIAEoDRINCgVjb3VudBgCIAEo", - "DSIQCg5DbHRfR19UZXN0SW5pdCIeCg5DbHRfR19HaWZ0Q29kZRIMCgRjb2Rl", - "GAEgASgJIiAKD01sX0NsdF9NYWlsSW5mbxINCgVjb3VudBgBIAEoDSImChJD", - "bHRfTWxfTWFpbFJlcXVlc3QSEAoIbmVlZF9hbGwYASABKAgiegoITVNHX01h", - "aWwSCgoCaWQYASABKAQSEQoJc2VuZF90aW1lGAIgASgNEg8KB21haWxfaWQY", - "AyABKA0SEQoJbWFpbF9kYXRhGAQgASgMEg0KBXRpdGxlGAUgASgJEgwKBGJv", - "ZHkYBiABKAkSDgoGc3RhdHVzGAcgASgNIkEKD01sX0NsdF9NYWlsRGF0YRIN", - "CgVjbGVhbhgBIAEoCBIfCgVtYWlscxgCIAMoCzIQLk5MRF9QQi5NU0dfTWFp", - "bCIdCg9DbHRfTWxfT3Blbk1haWwSCgoCaWQYASABKAQiKQoMTVNHX01haWxJ", - "dGVtEgoKAmlkGAEgASgNEg0KBWNvdW50GAIgASgNIkUKDE1TR19NYWlsRGF0", - "YRIjCgVpdGVtcxgBIAMoCzIULk5MRF9QQi5NU0dfTWFpbEl0ZW0SEAoIbWFp", - "bF9tc2cYAiADKAkiFgoUTWxfQ2x0X05ld0dsb2JhbE1haWwiNAoOR19DbHRf", - "TG9naW5LZXkSEQoJc2VydmVyX2lkGAIgASgNEg8KB2tleV9zdHIYASABKAki", - "NAoNQ2x0X0dfUmVsb2dpbhIQCghhY3Rvcl9pZBgBIAEoDRIRCglsb2dpbl9r", - "ZXkYAiABKAkiKAoVQ2x0X01sX0NsYWltTWFpbEl0ZW1zEg8KB21haWxfaWQY", - "ASABKAQiJAoRQ2x0X01sX0RlbGV0ZU1haWwSDwoHbWFpbF9pZBgBIAEoBCIi", - "Cg9DbHRfR19UYXNrQ2xhaW0SDwoHdGFza19pZBgBIAMoDSInChRDbHRfR19H", - "ZXRTaG9wQ29udGVudBIPCgdzaG9wX2lkGAEgASgNIjMKDE1TR19TaG9wSXRl", - "bRIKCgJpZBgBIAEoDRIXCg9wdXJjaGFzZWRfY291bnQYAiABKA0iRwoPR19D", - "bHRfU2hvcERhdGFzEg8KB3Nob3BfaWQYASABKA0SIwoFaXRlbXMYAiADKAsy", - "FC5OTERfUEIuTVNHX1Nob3BJdGVtIkMKEkNsdF9HX1Nob3BQdXJjaGFzZRIP", - "CgdzaG9wX2lkGAEgASgNEg0KBWluZGV4GAIgASgNEg0KBWNvdW50GAMgASgN", - "IisKDk1TR19Ta2lsbExldmVsEgoKAmlkGAEgASgNEg0KBWxldmVsGAIgASgN", - "Ik8KFkdfQ2x0X0FjdG9yUGxheWVyU2tpbGwSDQoFY2xlYXIYASABKAgSJgoG", - "c2tpbGxzGAIgAygLMhYuTkxEX1BCLk1TR19Ta2lsbExldmVsIiwKGENsdF9H", - "X1BsYXllclNraWxsVXBncmFkZRIQCghza2lsbF9pZBgBIAEoDSIRCg9NU0df", - "UHZwVGVhbURhdGEiWQoaQ2x0X0dfU2V0RGVmZW5jZVRlYW1Gb3JQdnASFAoM", - "Y2hhcmFjdGVyX2lkGAEgAygNEhIKCnZlaGljbGVfaWQYAiABKA0SEQoJdGVh", - "bV9kYXRhGAMgASgMIoABChJNU0dfUHZwRGVmZW5jZURhdGESLQoKY2hhcmFj", - "dGVycxgBIAMoCzIZLk5MRF9QQi5NU0dfQ2hhcmFjdGVySW5mbxIoCgd2ZWhp", - "Y2xlGAIgASgLMhcuTkxEX1BCLk1TR19WZWhpY2xlSW5mbxIRCgl0ZWFtX2Rh", - "dGEYAyABKAwiZgoMTVNHX1B2cEFjdG9yEhAKCGFjdG9yX2lkGAEgASgNEhAK", - "CG5pY2tuYW1lGAIgASgJEg0KBXNvY3JlGAMgASgNEg0KBW9yZGVyGAQgASgN", - "EhQKDGRlZmVuY2VfZGF0YRgFIAEoDCIXChVDbHRfTWdfUHZwSW5mb3JtYXRp", - "b24iWgoUR19DbHRfUHZwSW5mb3JtYXRpb24SDQoFc2NvcmUYASABKA0SDQoF", - "b3JkZXIYAiABKA0SJAoGcml2YWxzGAMgAygLMhQuTkxEX1BCLk1TR19QdnBB", - "Y3RvciIiCg5DbHRfR19QdnBTdGFydBIQCghhY3Rvcl9pZBgBIAEoDSIuCg9D", - "bHRfR19QdnBSZXN1bHQSCwoDa2V5GAEgASgNEg4KBmlzX3dpbhgCIAEoCCJO", - "Cg5HX0NsdF9BY3RvclB2cBIVCg1jaGFyYWN0ZXJfaWRzGAEgAygNEhIKCnZl", - "aGljbGVfaWQYAiABKA0SEQoJdGVhbV9kYXRhGAMgASgMInUKFEdfQ2x0X1B2", - "cERlZmVuY2VEYXRhEg0KBXNjb3JlGAEgASgNEhUKDWRlZmVuY2Vfc2NvcmUY", - "AiABKA0SHAoUZGVmZW5jZV9jb21iYXRfY291bnQYAyABKA0SGQoRZGVmZW5j", - "ZV93aW5fY291bnQYBCABKA0qPAoJTG9naW5UeXBlEggKBE5vbmUQABIJCgRQ", - "SFhIEOgHEgsKBlRhcFRhcBDpBxINCghGaXJlYmFzZRDqByo6Cg1QSFhITG9n", - "aW5EYXRhEgsKB0FjY291bnQQABIMCghQYXNzd29yZBABEg4KClBIWEhMRF9N", - "YXgQAipACg9UYXBUYXBMb2dpbkRhdGESDwoLQWNjZXNzVG9rZW4QABIKCgZN", - "YWNLZXkQARIQCgxUYXBUYXBMRF9NYXgQAiouChFGaXJlYmFzZUxvZ2luRGF0", - "YRILCgdJRFRva2VuEAASDAoIRkJMRF9NYXgQASpjCgtVcGdyYWRlVHlwZRIL", - "CgdVVF9Ob25lEAASDAoIVVRfTGV2ZWwQARIMCghVVF9CcmVhaxACEhEKDVVU", - "X1VsdHJhU2tpbGwQAxIMCghVVF9Bd2FrZRAEEgoKBlVJX01heBAFQgtaCXBi", - "L3hzZl9wYmIGcHJvdG8z")); + "CgRzdGFyGAMgASgNIjEKDU1TR19Hcm91cEluZm8SCgoCaWQYASABKA0SFAoM", + "cmV3YXJkX2luZGV4GAIgASgNIp8BChBHX0NsdF9BY3RvckxldmVsEg4KBmlz", + "X2FsbBgBIAEoCBIVCg1sYXN0X2VudGVyX2lkGAIgASgNEhcKD2xhc3RfZW50", + "ZXJfdGltZRgDIAEoDRIkCgVpbmZvcxgEIAMoCzIVLk5MRF9QQi5NU0dfTGV2", + "ZWxJbmZvEiUKBmdyb3VwcxgFIAMoCzIVLk5MRF9QQi5NU0dfR3JvdXBJbmZv", + "IjgKEENsdF9HX0VudGVyTGV2ZWwSEAoIbGV2ZWxfaWQYASABKA0SEgoKdGVh", + "bV9pbmRleBgCIAEoDSIzCg9DbHRfR19FeGl0TGV2ZWwSEgoKaXNfc3VjY2Vz", + "cxgBIAEoCBIMCgRzdGFyGAIgASgNIl0KD01TR19SYWZmbGVDb3VudBIQCghn", + "YWNoYV9pZBgBIAEoDRISCgpmcmVlX2NvdW50GAIgASgNEhEKCWxpbWl0X3Rl", + "bhgDIAEoDRIRCglsaW1pdF9vbmUYBCABKA0iSwoRR19DbHRfQWN0b3JSYWZm", + "bGUSDQoFY2xlYXIYASABKAgSJwoGY291bnRzGAIgAygLMhcuTkxEX1BCLk1T", + "R19SYWZmbGVDb3VudCJPCgxDbHRfR19SYWZmbGUSCgoCaWQYASABKA0SDAoE", + "dHlwZRgCIAEoDRIPCgdpc19mcmVlGAMgASgIEhQKDHRpY2tldF9jb3VudBgE", + "IAEoDSJsCg5HX0NsdF9JdGVtTGlzdBITCgtpdGVtX3NvdXJjZRgBIAEoDRIR", + "Cglzb3VyY2VfaWQYAiABKA0SDwoHaXRlbV9pZBgDIAMoDRISCgppdGVtX2Nv", + "dW50GAQgAygNEg0KBWluZGV4GAUgASgNIjQKEUNsdF9HX0dyb3VwUmV3YXJk", + "EhAKCGdyb3VwX2lkGAEgASgNEg0KBWluZGV4GAIgASgNIlcKFENsdF9HX1Zl", + "aGljbGVVcGdyYWRlEhIKCnZlaGljbGVfaWQYASABKA0SFAoMdXBncmFkZV90", + "eXBlGAIgAygNEhUKDXVwZ3JhZGVfY291bnQYAyADKA0iYwoMTVNHX1RlYW1J", + "bmZvEg0KBWluZGV4GAEgASgNEgwKBG5hbWUYAiABKAkSDAoEaWNvbhgDIAEo", + "DRIUCgxjaGFyYWN0ZXJfaWQYBCADKA0SEgoKdmVoaWNsZV9pZBgFIAEoDSJG", + "Cg9HX0NsdF9BY3RvclRlYW0SDgoGaXNfYWxsGAEgASgIEiMKBWluZm9zGAIg", + "AygLMhQuTkxEX1BCLk1TR19UZWFtSW5mbyJnChBDbHRfR19DcmVhdGVUZWFt", + "Eg0KBWluZGV4GAEgASgNEgwKBG5hbWUYAiABKAkSDAoEaWNvbhgDIAEoDRIU", + "CgxjaGFyYWN0ZXJfaWQYBCADKA0SEgoKdmVoaWNsZV9pZBgFIAEoDSIqCg1D", + "bHRfR19Vc2VJdGVtEgoKAmlkGAEgASgNEg0KBWNvdW50GAIgASgNIhAKDkNs", + "dF9HX1Rlc3RJbml0Ih4KDkNsdF9HX0dpZnRDb2RlEgwKBGNvZGUYASABKAki", + "IAoPTWxfQ2x0X01haWxJbmZvEg0KBWNvdW50GAEgASgNIiYKEkNsdF9NbF9N", + "YWlsUmVxdWVzdBIQCghuZWVkX2FsbBgBIAEoCCJ6CghNU0dfTWFpbBIKCgJp", + "ZBgBIAEoBBIRCglzZW5kX3RpbWUYAiABKA0SDwoHbWFpbF9pZBgDIAEoDRIR", + "CgltYWlsX2RhdGEYBCABKAwSDQoFdGl0bGUYBSABKAkSDAoEYm9keRgGIAEo", + "CRIOCgZzdGF0dXMYByABKA0iQQoPTWxfQ2x0X01haWxEYXRhEg0KBWNsZWFu", + "GAEgASgIEh8KBW1haWxzGAIgAygLMhAuTkxEX1BCLk1TR19NYWlsIh0KD0Ns", + "dF9NbF9PcGVuTWFpbBIKCgJpZBgBIAEoBCIpCgxNU0dfTWFpbEl0ZW0SCgoC", + "aWQYASABKA0SDQoFY291bnQYAiABKA0iRQoMTVNHX01haWxEYXRhEiMKBWl0", + "ZW1zGAEgAygLMhQuTkxEX1BCLk1TR19NYWlsSXRlbRIQCghtYWlsX21zZxgC", + "IAMoCSIWChRNbF9DbHRfTmV3R2xvYmFsTWFpbCI0Cg5HX0NsdF9Mb2dpbktl", + "eRIRCglzZXJ2ZXJfaWQYAiABKA0SDwoHa2V5X3N0chgBIAEoCSI0Cg1DbHRf", + "R19SZWxvZ2luEhAKCGFjdG9yX2lkGAEgASgNEhEKCWxvZ2luX2tleRgCIAEo", + "CSIoChVDbHRfTWxfQ2xhaW1NYWlsSXRlbXMSDwoHbWFpbF9pZBgBIAEoBCIk", + "ChFDbHRfTWxfRGVsZXRlTWFpbBIPCgdtYWlsX2lkGAEgASgEIiIKD0NsdF9H", + "X1Rhc2tDbGFpbRIPCgd0YXNrX2lkGAEgAygNIicKFENsdF9HX0dldFNob3BD", + "b250ZW50Eg8KB3Nob3BfaWQYASABKA0iMwoMTVNHX1Nob3BJdGVtEgoKAmlk", + "GAEgASgNEhcKD3B1cmNoYXNlZF9jb3VudBgCIAEoDSJHCg9HX0NsdF9TaG9w", + "RGF0YXMSDwoHc2hvcF9pZBgBIAEoDRIjCgVpdGVtcxgCIAMoCzIULk5MRF9Q", + "Qi5NU0dfU2hvcEl0ZW0iQwoSQ2x0X0dfU2hvcFB1cmNoYXNlEg8KB3Nob3Bf", + "aWQYASABKA0SDQoFaW5kZXgYAiABKA0SDQoFY291bnQYAyABKA0iKwoOTVNH", + "X1NraWxsTGV2ZWwSCgoCaWQYASABKA0SDQoFbGV2ZWwYAiABKA0iTwoWR19D", + "bHRfQWN0b3JQbGF5ZXJTa2lsbBINCgVjbGVhchgBIAEoCBImCgZza2lsbHMY", + "AiADKAsyFi5OTERfUEIuTVNHX1NraWxsTGV2ZWwiLAoYQ2x0X0dfUGxheWVy", + "U2tpbGxVcGdyYWRlEhAKCHNraWxsX2lkGAEgASgNIhEKD01TR19QdnBUZWFt", + "RGF0YSJZChpDbHRfR19TZXREZWZlbmNlVGVhbUZvclB2cBIUCgxjaGFyYWN0", + "ZXJfaWQYASADKA0SEgoKdmVoaWNsZV9pZBgCIAEoDRIRCgl0ZWFtX2RhdGEY", + "AyABKAwigAEKEk1TR19QdnBEZWZlbmNlRGF0YRItCgpjaGFyYWN0ZXJzGAEg", + "AygLMhkuTkxEX1BCLk1TR19DaGFyYWN0ZXJJbmZvEigKB3ZlaGljbGUYAiAB", + "KAsyFy5OTERfUEIuTVNHX1ZlaGljbGVJbmZvEhEKCXRlYW1fZGF0YRgDIAEo", + "DCJmCgxNU0dfUHZwQWN0b3ISEAoIYWN0b3JfaWQYASABKA0SEAoIbmlja25h", + "bWUYAiABKAkSDQoFc29jcmUYAyABKA0SDQoFb3JkZXIYBCABKA0SFAoMZGVm", + "ZW5jZV9kYXRhGAUgASgMIhcKFUNsdF9NZ19QdnBJbmZvcm1hdGlvbiJaChRH", + "X0NsdF9QdnBJbmZvcm1hdGlvbhINCgVzY29yZRgBIAEoDRINCgVvcmRlchgC", + "IAEoDRIkCgZyaXZhbHMYAyADKAsyFC5OTERfUEIuTVNHX1B2cEFjdG9yIiIK", + "DkNsdF9HX1B2cFN0YXJ0EhAKCGFjdG9yX2lkGAEgASgNIi4KD0NsdF9HX1B2", + "cFJlc3VsdBILCgNrZXkYASABKA0SDgoGaXNfd2luGAIgASgIIk4KDkdfQ2x0", + "X0FjdG9yUHZwEhUKDWNoYXJhY3Rlcl9pZHMYASADKA0SEgoKdmVoaWNsZV9p", + "ZBgCIAEoDRIRCgl0ZWFtX2RhdGEYAyABKAwidQoUR19DbHRfUHZwRGVmZW5j", + "ZURhdGESDQoFc2NvcmUYASABKA0SFQoNZGVmZW5jZV9zY29yZRgCIAEoDRIc", + "ChRkZWZlbmNlX2NvbWJhdF9jb3VudBgDIAEoDRIZChFkZWZlbmNlX3dpbl9j", + "b3VudBgEIAEoDSIjChNDbHRfTWdfUHZwT3JkZXJMaXN0EgwKBHBhZ2UYASAB", + "KA0iRQoQTVNHX1B2cE9yZGVyRGF0YRINCgVvcmRlchgBIAEoDRIQCghhY3Rv", + "cl9pZBgCIAEoDRIQCghuaWNrbmFtZRgDIAEoCSJQChdNZ19DbHRfUHZwT3Jk", + "ZXJMaXN0RGF0YRIMCgRwYWdlGAEgASgNEicKBWRhdGFzGAIgAygLMhguTkxE", + "X1BCLk1TR19QdnBPcmRlckRhdGEqPAoJTG9naW5UeXBlEggKBE5vbmUQABIJ", + "CgRQSFhIEOgHEgsKBlRhcFRhcBDpBxINCghGaXJlYmFzZRDqByo6Cg1QSFhI", + "TG9naW5EYXRhEgsKB0FjY291bnQQABIMCghQYXNzd29yZBABEg4KClBIWEhM", + "RF9NYXgQAipACg9UYXBUYXBMb2dpbkRhdGESDwoLQWNjZXNzVG9rZW4QABIK", + "CgZNYWNLZXkQARIQCgxUYXBUYXBMRF9NYXgQAiouChFGaXJlYmFzZUxvZ2lu", + "RGF0YRILCgdJRFRva2VuEAASDAoIRkJMRF9NYXgQASpjCgtVcGdyYWRlVHlw", + "ZRILCgdVVF9Ob25lEAASDAoIVVRfTGV2ZWwQARIMCghVVF9CcmVhaxACEhEK", + "DVVUX1VsdHJhU2tpbGwQAxIMCghVVF9Bd2FrZRAEEgoKBlVJX01heBAFQgta", + "CXBiL3hzZl9wYmIGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(new[] {typeof(global::NLDPB.LoginType), typeof(global::NLDPB.PHXHLoginData), typeof(global::NLDPB.TapTapLoginData), typeof(global::NLDPB.FirebaseLoginData), typeof(global::NLDPB.UpgradeType), }, null, new pbr::GeneratedClrTypeInfo[] { @@ -162,15 +166,15 @@ namespace NLDPB { new pbr::GeneratedClrTypeInfo(typeof(global::NLDPB.G_Clt_ActorTask), global::NLDPB.G_Clt_ActorTask.Parser, new[]{ "IsAll", "Infos", "Counts" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::NLDPB.Clt_G_SetNickname), global::NLDPB.Clt_G_SetNickname.Parser, new[]{ "Nickname" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::NLDPB.MSG_LevelInfo), global::NLDPB.MSG_LevelInfo.Parser, new[]{ "Id", "IsPassed", "Star" }, null, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::NLDPB.MSG_ChapterInfo), global::NLDPB.MSG_ChapterInfo.Parser, new[]{ "Id", "RewardIndex" }, null, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::NLDPB.G_Clt_ActorLevel), global::NLDPB.G_Clt_ActorLevel.Parser, new[]{ "IsAll", "LastEnterId", "LastEnterTime", "Infos", "Chapters" }, null, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::NLDPB.MSG_GroupInfo), global::NLDPB.MSG_GroupInfo.Parser, new[]{ "Id", "RewardIndex" }, null, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::NLDPB.G_Clt_ActorLevel), global::NLDPB.G_Clt_ActorLevel.Parser, new[]{ "IsAll", "LastEnterId", "LastEnterTime", "Infos", "Groups" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::NLDPB.Clt_G_EnterLevel), global::NLDPB.Clt_G_EnterLevel.Parser, new[]{ "LevelId", "TeamIndex" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::NLDPB.Clt_G_ExitLevel), global::NLDPB.Clt_G_ExitLevel.Parser, new[]{ "IsSuccess", "Star" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::NLDPB.MSG_RaffleCount), global::NLDPB.MSG_RaffleCount.Parser, new[]{ "GachaId", "FreeCount", "LimitTen", "LimitOne" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::NLDPB.G_Clt_ActorRaffle), global::NLDPB.G_Clt_ActorRaffle.Parser, new[]{ "Clear", "Counts" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::NLDPB.Clt_G_Raffle), global::NLDPB.Clt_G_Raffle.Parser, new[]{ "Id", "Type", "IsFree", "TicketCount" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::NLDPB.G_Clt_ItemList), global::NLDPB.G_Clt_ItemList.Parser, new[]{ "ItemSource", "SourceId", "ItemId", "ItemCount", "Index" }, null, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::NLDPB.Clt_G_ChapterReward), global::NLDPB.Clt_G_ChapterReward.Parser, new[]{ "Chapter", "Index" }, null, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::NLDPB.Clt_G_GroupReward), global::NLDPB.Clt_G_GroupReward.Parser, new[]{ "GroupId", "Index" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::NLDPB.Clt_G_VehicleUpgrade), global::NLDPB.Clt_G_VehicleUpgrade.Parser, new[]{ "VehicleId", "UpgradeType", "UpgradeCount" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::NLDPB.MSG_TeamInfo), global::NLDPB.MSG_TeamInfo.Parser, new[]{ "Index", "Name", "Icon", "CharacterId", "VehicleId" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::NLDPB.G_Clt_ActorTeam), global::NLDPB.G_Clt_ActorTeam.Parser, new[]{ "IsAll", "Infos" }, null, null, null, null), @@ -207,7 +211,10 @@ namespace NLDPB { new pbr::GeneratedClrTypeInfo(typeof(global::NLDPB.Clt_G_PvpStart), global::NLDPB.Clt_G_PvpStart.Parser, new[]{ "ActorId" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::NLDPB.Clt_G_PvpResult), global::NLDPB.Clt_G_PvpResult.Parser, new[]{ "Key", "IsWin" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::NLDPB.G_Clt_ActorPvp), global::NLDPB.G_Clt_ActorPvp.Parser, new[]{ "CharacterIds", "VehicleId", "TeamData" }, null, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::NLDPB.G_Clt_PvpDefenceData), global::NLDPB.G_Clt_PvpDefenceData.Parser, new[]{ "Score", "DefenceScore", "DefenceCombatCount", "DefenceWinCount" }, null, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::NLDPB.G_Clt_PvpDefenceData), global::NLDPB.G_Clt_PvpDefenceData.Parser, new[]{ "Score", "DefenceScore", "DefenceCombatCount", "DefenceWinCount" }, null, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::NLDPB.Clt_Mg_PvpOrderList), global::NLDPB.Clt_Mg_PvpOrderList.Parser, new[]{ "Page" }, null, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::NLDPB.MSG_PvpOrderData), global::NLDPB.MSG_PvpOrderData.Parser, new[]{ "Order", "ActorId", "Nickname" }, null, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::NLDPB.Mg_Clt_PvpOrderListData), global::NLDPB.Mg_Clt_PvpOrderListData.Parser, new[]{ "Page", "Datas" }, null, null, null, null) })); } #endregion @@ -6054,16 +6061,16 @@ namespace NLDPB { } - public sealed partial class MSG_ChapterInfo : pb::IMessage + public sealed partial class MSG_GroupInfo : pb::IMessage #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE , pb::IBufferMessage #endif { - private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new MSG_ChapterInfo()); + private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new MSG_GroupInfo()); 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)] @@ -6079,7 +6086,7 @@ namespace NLDPB { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public MSG_ChapterInfo() { + public MSG_GroupInfo() { OnConstruction(); } @@ -6087,7 +6094,7 @@ namespace NLDPB { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public MSG_ChapterInfo(MSG_ChapterInfo other) : this() { + public MSG_GroupInfo(MSG_GroupInfo other) : this() { id_ = other.id_; rewardIndex_ = other.rewardIndex_; _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); @@ -6095,8 +6102,8 @@ namespace NLDPB { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public MSG_ChapterInfo Clone() { - return new MSG_ChapterInfo(this); + public MSG_GroupInfo Clone() { + return new MSG_GroupInfo(this); } /// Field number for the "id" field. @@ -6126,12 +6133,12 @@ namespace NLDPB { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override bool Equals(object other) { - return Equals(other as MSG_ChapterInfo); + return Equals(other as MSG_GroupInfo); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public bool Equals(MSG_ChapterInfo other) { + public bool Equals(MSG_GroupInfo other) { if (ReferenceEquals(other, null)) { return false; } @@ -6217,7 +6224,7 @@ namespace NLDPB { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public void MergeFrom(MSG_ChapterInfo other) { + public void MergeFrom(MSG_GroupInfo other) { if (other == null) { return; } @@ -6321,7 +6328,7 @@ namespace NLDPB { lastEnterId_ = other.lastEnterId_; lastEnterTime_ = other.lastEnterTime_; infos_ = other.infos_.Clone(); - chapters_ = other.chapters_.Clone(); + groups_ = other.groups_.Clone(); _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } @@ -6378,15 +6385,15 @@ namespace NLDPB { get { return infos_; } } - /// Field number for the "chapters" field. - public const int ChaptersFieldNumber = 5; - private static readonly pb::FieldCodec _repeated_chapters_codec - = pb::FieldCodec.ForMessage(42, global::NLDPB.MSG_ChapterInfo.Parser); - private readonly pbc::RepeatedField chapters_ = new pbc::RepeatedField(); + /// Field number for the "groups" field. + public const int GroupsFieldNumber = 5; + private static readonly pb::FieldCodec _repeated_groups_codec + = pb::FieldCodec.ForMessage(42, global::NLDPB.MSG_GroupInfo.Parser); + private readonly pbc::RepeatedField groups_ = new pbc::RepeatedField(); [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public pbc::RepeatedField Chapters { - get { return chapters_; } + public pbc::RepeatedField Groups { + get { return groups_; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -6408,7 +6415,7 @@ namespace NLDPB { if (LastEnterId != other.LastEnterId) return false; if (LastEnterTime != other.LastEnterTime) return false; if(!infos_.Equals(other.infos_)) return false; - if(!chapters_.Equals(other.chapters_)) return false; + if(!groups_.Equals(other.groups_)) return false; return Equals(_unknownFields, other._unknownFields); } @@ -6420,7 +6427,7 @@ namespace NLDPB { if (LastEnterId != 0) hash ^= LastEnterId.GetHashCode(); if (LastEnterTime != 0) hash ^= LastEnterTime.GetHashCode(); hash ^= infos_.GetHashCode(); - hash ^= chapters_.GetHashCode(); + hash ^= groups_.GetHashCode(); if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); } @@ -6452,7 +6459,7 @@ namespace NLDPB { output.WriteUInt32(LastEnterTime); } infos_.WriteTo(output, _repeated_infos_codec); - chapters_.WriteTo(output, _repeated_chapters_codec); + groups_.WriteTo(output, _repeated_groups_codec); if (_unknownFields != null) { _unknownFields.WriteTo(output); } @@ -6476,7 +6483,7 @@ namespace NLDPB { output.WriteUInt32(LastEnterTime); } infos_.WriteTo(ref output, _repeated_infos_codec); - chapters_.WriteTo(ref output, _repeated_chapters_codec); + groups_.WriteTo(ref output, _repeated_groups_codec); if (_unknownFields != null) { _unknownFields.WriteTo(ref output); } @@ -6497,7 +6504,7 @@ namespace NLDPB { size += 1 + pb::CodedOutputStream.ComputeUInt32Size(LastEnterTime); } size += infos_.CalculateSize(_repeated_infos_codec); - size += chapters_.CalculateSize(_repeated_chapters_codec); + size += groups_.CalculateSize(_repeated_groups_codec); if (_unknownFields != null) { size += _unknownFields.CalculateSize(); } @@ -6520,7 +6527,7 @@ namespace NLDPB { LastEnterTime = other.LastEnterTime; } infos_.Add(other.infos_); - chapters_.Add(other.chapters_); + groups_.Add(other.groups_); _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); } @@ -6553,7 +6560,7 @@ namespace NLDPB { break; } case 42: { - chapters_.AddEntriesFrom(input, _repeated_chapters_codec); + groups_.AddEntriesFrom(input, _repeated_groups_codec); break; } } @@ -6588,7 +6595,7 @@ namespace NLDPB { break; } case 42: { - chapters_.AddEntriesFrom(ref input, _repeated_chapters_codec); + groups_.AddEntriesFrom(ref input, _repeated_groups_codec); break; } } @@ -8247,16 +8254,16 @@ namespace NLDPB { /// /// client --> game 领取章节宝箱 /// - public sealed partial class Clt_G_ChapterReward : pb::IMessage + public sealed partial class Clt_G_GroupReward : pb::IMessage #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE , pb::IBufferMessage #endif { - private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new Clt_G_ChapterReward()); + private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new Clt_G_GroupReward()); 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)] @@ -8272,7 +8279,7 @@ namespace NLDPB { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public Clt_G_ChapterReward() { + public Clt_G_GroupReward() { OnConstruction(); } @@ -8280,27 +8287,27 @@ namespace NLDPB { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public Clt_G_ChapterReward(Clt_G_ChapterReward other) : this() { - chapter_ = other.chapter_; + public Clt_G_GroupReward(Clt_G_GroupReward other) : this() { + groupId_ = other.groupId_; index_ = other.index_; _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public Clt_G_ChapterReward Clone() { - return new Clt_G_ChapterReward(this); + public Clt_G_GroupReward Clone() { + return new Clt_G_GroupReward(this); } - /// Field number for the "chapter" field. - public const int ChapterFieldNumber = 1; - private uint chapter_; + /// Field number for the "group_id" field. + public const int GroupIdFieldNumber = 1; + private uint groupId_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public uint Chapter { - get { return chapter_; } + public uint GroupId { + get { return groupId_; } set { - chapter_ = value; + groupId_ = value; } } @@ -8322,19 +8329,19 @@ namespace NLDPB { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override bool Equals(object other) { - return Equals(other as Clt_G_ChapterReward); + return Equals(other as Clt_G_GroupReward); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public bool Equals(Clt_G_ChapterReward other) { + public bool Equals(Clt_G_GroupReward other) { if (ReferenceEquals(other, null)) { return false; } if (ReferenceEquals(other, this)) { return true; } - if (Chapter != other.Chapter) return false; + if (GroupId != other.GroupId) return false; if (Index != other.Index) return false; return Equals(_unknownFields, other._unknownFields); } @@ -8343,7 +8350,7 @@ namespace NLDPB { [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override int GetHashCode() { int hash = 1; - if (Chapter != 0) hash ^= Chapter.GetHashCode(); + if (GroupId != 0) hash ^= GroupId.GetHashCode(); if (Index != 0) hash ^= Index.GetHashCode(); if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); @@ -8363,9 +8370,9 @@ namespace NLDPB { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE output.WriteRawMessage(this); #else - if (Chapter != 0) { + if (GroupId != 0) { output.WriteRawTag(8); - output.WriteUInt32(Chapter); + output.WriteUInt32(GroupId); } if (Index != 0) { output.WriteRawTag(16); @@ -8381,9 +8388,9 @@ namespace NLDPB { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { - if (Chapter != 0) { + if (GroupId != 0) { output.WriteRawTag(8); - output.WriteUInt32(Chapter); + output.WriteUInt32(GroupId); } if (Index != 0) { output.WriteRawTag(16); @@ -8399,8 +8406,8 @@ namespace NLDPB { [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int CalculateSize() { int size = 0; - if (Chapter != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Chapter); + if (GroupId != 0) { + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(GroupId); } if (Index != 0) { size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Index); @@ -8413,12 +8420,12 @@ namespace NLDPB { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public void MergeFrom(Clt_G_ChapterReward other) { + public void MergeFrom(Clt_G_GroupReward other) { if (other == null) { return; } - if (other.Chapter != 0) { - Chapter = other.Chapter; + if (other.GroupId != 0) { + GroupId = other.GroupId; } if (other.Index != 0) { Index = other.Index; @@ -8439,7 +8446,7 @@ namespace NLDPB { _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); break; case 8: { - Chapter = input.ReadUInt32(); + GroupId = input.ReadUInt32(); break; } case 16: { @@ -8462,7 +8469,7 @@ namespace NLDPB { _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); break; case 8: { - Chapter = input.ReadUInt32(); + GroupId = input.ReadUInt32(); break; } case 16: { @@ -17048,6 +17055,682 @@ namespace NLDPB { } + /// + /// client --> manager 请求pvp排行榜 + /// + public sealed partial class Clt_Mg_PvpOrderList : pb::IMessage + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + , pb::IBufferMessage + #endif + { + private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new Clt_Mg_PvpOrderList()); + 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::NLDPB.ClientReflection.Descriptor.MessageTypes[70]; } + } + + [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 Clt_Mg_PvpOrderList() { + OnConstruction(); + } + + partial void OnConstruction(); + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public Clt_Mg_PvpOrderList(Clt_Mg_PvpOrderList other) : this() { + page_ = other.page_; + _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public Clt_Mg_PvpOrderList Clone() { + return new Clt_Mg_PvpOrderList(this); + } + + /// Field number for the "page" field. + public const int PageFieldNumber = 1; + private uint page_; + /// + /// 请求第几页 + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public uint Page { + get { return page_; } + set { + page_ = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public override bool Equals(object other) { + return Equals(other as Clt_Mg_PvpOrderList); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public bool Equals(Clt_Mg_PvpOrderList other) { + if (ReferenceEquals(other, null)) { + return false; + } + if (ReferenceEquals(other, this)) { + return true; + } + if (Page != other.Page) 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 (Page != 0) hash ^= Page.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 (Page != 0) { + output.WriteRawTag(8); + output.WriteUInt32(Page); + } + 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 (Page != 0) { + output.WriteRawTag(8); + output.WriteUInt32(Page); + } + 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 (Page != 0) { + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Page); + } + if (_unknownFields != null) { + size += _unknownFields.CalculateSize(); + } + return size; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public void MergeFrom(Clt_Mg_PvpOrderList other) { + if (other == null) { + return; + } + if (other.Page != 0) { + Page = other.Page; + } + _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 8: { + Page = input.ReadUInt32(); + 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 8: { + Page = input.ReadUInt32(); + break; + } + } + } + } + #endif + + } + + public sealed partial class MSG_PvpOrderData : pb::IMessage + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + , pb::IBufferMessage + #endif + { + private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new MSG_PvpOrderData()); + 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::NLDPB.ClientReflection.Descriptor.MessageTypes[71]; } + } + + [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 MSG_PvpOrderData() { + OnConstruction(); + } + + partial void OnConstruction(); + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public MSG_PvpOrderData(MSG_PvpOrderData other) : this() { + order_ = other.order_; + actorId_ = other.actorId_; + nickname_ = other.nickname_; + _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public MSG_PvpOrderData Clone() { + return new MSG_PvpOrderData(this); + } + + /// Field number for the "order" field. + public const int OrderFieldNumber = 1; + private uint order_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public uint Order { + get { return order_; } + set { + order_ = value; + } + } + + /// Field number for the "actor_id" field. + public const int ActorIdFieldNumber = 2; + private uint actorId_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public uint ActorId { + get { return actorId_; } + set { + actorId_ = value; + } + } + + /// Field number for the "nickname" field. + public const int NicknameFieldNumber = 3; + private string nickname_ = ""; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public string Nickname { + get { return nickname_; } + set { + nickname_ = 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 MSG_PvpOrderData); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public bool Equals(MSG_PvpOrderData other) { + if (ReferenceEquals(other, null)) { + return false; + } + if (ReferenceEquals(other, this)) { + return true; + } + if (Order != other.Order) return false; + if (ActorId != other.ActorId) return false; + if (Nickname != other.Nickname) 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 (Order != 0) hash ^= Order.GetHashCode(); + if (ActorId != 0) hash ^= ActorId.GetHashCode(); + if (Nickname.Length != 0) hash ^= Nickname.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 (Order != 0) { + output.WriteRawTag(8); + output.WriteUInt32(Order); + } + if (ActorId != 0) { + output.WriteRawTag(16); + output.WriteUInt32(ActorId); + } + if (Nickname.Length != 0) { + output.WriteRawTag(26); + output.WriteString(Nickname); + } + 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 (Order != 0) { + output.WriteRawTag(8); + output.WriteUInt32(Order); + } + if (ActorId != 0) { + output.WriteRawTag(16); + output.WriteUInt32(ActorId); + } + if (Nickname.Length != 0) { + output.WriteRawTag(26); + output.WriteString(Nickname); + } + 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 (Order != 0) { + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Order); + } + if (ActorId != 0) { + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(ActorId); + } + if (Nickname.Length != 0) { + size += 1 + pb::CodedOutputStream.ComputeStringSize(Nickname); + } + if (_unknownFields != null) { + size += _unknownFields.CalculateSize(); + } + return size; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public void MergeFrom(MSG_PvpOrderData other) { + if (other == null) { + return; + } + if (other.Order != 0) { + Order = other.Order; + } + if (other.ActorId != 0) { + ActorId = other.ActorId; + } + if (other.Nickname.Length != 0) { + Nickname = other.Nickname; + } + _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 8: { + Order = input.ReadUInt32(); + break; + } + case 16: { + ActorId = input.ReadUInt32(); + break; + } + case 26: { + Nickname = 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 8: { + Order = input.ReadUInt32(); + break; + } + case 16: { + ActorId = input.ReadUInt32(); + break; + } + case 26: { + Nickname = input.ReadString(); + break; + } + } + } + } + #endif + + } + + /// + /// manager --> client pvp排行榜数据 + /// + public sealed partial class Mg_Clt_PvpOrderListData : pb::IMessage + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + , pb::IBufferMessage + #endif + { + private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new Mg_Clt_PvpOrderListData()); + 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::NLDPB.ClientReflection.Descriptor.MessageTypes[72]; } + } + + [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 Mg_Clt_PvpOrderListData() { + OnConstruction(); + } + + partial void OnConstruction(); + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public Mg_Clt_PvpOrderListData(Mg_Clt_PvpOrderListData other) : this() { + page_ = other.page_; + datas_ = other.datas_.Clone(); + _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public Mg_Clt_PvpOrderListData Clone() { + return new Mg_Clt_PvpOrderListData(this); + } + + /// Field number for the "page" field. + public const int PageFieldNumber = 1; + private uint page_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public uint Page { + get { return page_; } + set { + page_ = value; + } + } + + /// Field number for the "datas" field. + public const int DatasFieldNumber = 2; + private static readonly pb::FieldCodec _repeated_datas_codec + = pb::FieldCodec.ForMessage(18, global::NLDPB.MSG_PvpOrderData.Parser); + private readonly pbc::RepeatedField datas_ = new pbc::RepeatedField(); + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public pbc::RepeatedField Datas { + get { return datas_; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public override bool Equals(object other) { + return Equals(other as Mg_Clt_PvpOrderListData); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public bool Equals(Mg_Clt_PvpOrderListData other) { + if (ReferenceEquals(other, null)) { + return false; + } + if (ReferenceEquals(other, this)) { + return true; + } + if (Page != other.Page) return false; + if(!datas_.Equals(other.datas_)) 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 (Page != 0) hash ^= Page.GetHashCode(); + hash ^= datas_.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 (Page != 0) { + output.WriteRawTag(8); + output.WriteUInt32(Page); + } + datas_.WriteTo(output, _repeated_datas_codec); + 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 (Page != 0) { + output.WriteRawTag(8); + output.WriteUInt32(Page); + } + datas_.WriteTo(ref output, _repeated_datas_codec); + 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 (Page != 0) { + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Page); + } + size += datas_.CalculateSize(_repeated_datas_codec); + if (_unknownFields != null) { + size += _unknownFields.CalculateSize(); + } + return size; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public void MergeFrom(Mg_Clt_PvpOrderListData other) { + if (other == null) { + return; + } + if (other.Page != 0) { + Page = other.Page; + } + datas_.Add(other.datas_); + _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 8: { + Page = input.ReadUInt32(); + break; + } + case 18: { + datas_.AddEntriesFrom(input, _repeated_datas_codec); + 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 8: { + Page = input.ReadUInt32(); + break; + } + case 18: { + datas_.AddEntriesFrom(ref input, _repeated_datas_codec); + break; + } + } + } + } + #endif + + } + #endregion } diff --git a/ProjectNLD/Assets/Code/Scripts/Gameplay/Net/Proto/MessageId.cs b/ProjectNLD/Assets/Code/Scripts/Gameplay/Net/Proto/MessageId.cs index 38661d63a83..511bd77d478 100644 --- a/ProjectNLD/Assets/Code/Scripts/Gameplay/Net/Proto/MessageId.cs +++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/Net/Proto/MessageId.cs @@ -24,7 +24,7 @@ namespace NLDMID { static MessageIdReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChBtZXNzYWdlX2lkLnByb3RvEgdOTERfTUlEKqcJCgVNU0dJRBIICgROb25l", + "ChBtZXNzYWdlX2lkLnByb3RvEgdOTERfTUlEKtsJCgVNU0dJRBIICgROb25l", "EAASFAoQQ2x0X0d0X0hhbmRzaGFrZRABEhQKEEd0X0NsdF9IYW5kc2hha2UQ", "AhIUChBDbHRfR3RfSGVhcnRiZWF0EAMSFAoQR3RfQ2x0X0hlYXJ0YmVhdBAE", "EhUKEUd0X0NsdF9EaXNjb25uZWN0EAUSDwoLQ2x0X0xfTG9naW4QBhIVChFM", @@ -35,23 +35,24 @@ namespace NLDMID { "EwoPR19DbHRfQWN0b3JUYXNrEBASFQoRQ2x0X0dfU2V0Tmlja25hbWUQERIU", "ChBHX0NsdF9BY3RvckxldmVsEBISFAoQQ2x0X0dfRW50ZXJMZXZlbBATEhMK", "D0NsdF9HX0V4aXRMZXZlbBAUEhUKEUdfQ2x0X0FjdG9yUmFmZmxlEBUSEAoM", - "Q2x0X0dfUmFmZmxlEBYSEgoOR19DbHRfSXRlbUxpc3QQFxIXChNDbHRfR19D", - "aGFwdGVyUmV3YXJkEBgSGAoUQ2x0X0dfVmVoaWNsZVVwZ3JhZGUQGRITCg9H", - "X0NsdF9BY3RvclRlYW0QGhIUChBDbHRfR19DcmVhdGVUZWFtEBsSEQoNQ2x0", - "X0dfVXNlSXRlbRAcEhIKDkNsdF9HX1Rlc3RJbml0EB0SEgoOQ2x0X0dfR2lm", - "dENvZGUQHhITCg9NbF9DbHRfTWFpbEluZm8QHxIWChJDbHRfTWxfTWFpbFJl", - "cXVlc3QQIBITCg9NbF9DbHRfTWFpbERhdGEQIRITCg9DbHRfTWxfT3Blbk1h", - "aWwQIhIYChRNbF9DbHRfTmV3R2xvYmFsTWFpbBAjEhIKDkdfQ2x0X0xvZ2lu", - "S2V5ECQSEQoNQ2x0X0dfUmVsb2dpbhAlEhkKFUNsdF9NbF9DbGFpbU1haWxJ", - "dGVtcxAmEhUKEUNsdF9NbF9EZWxldGVNYWlsECcSEwoPQ2x0X0dfVGFza0Ns", - "YWltECgSGAoUQ2x0X0dfR2V0U2hvcENvbnRlbnQQKRITCg9HX0NsdF9TaG9w", - "RGF0YXMQKhIWChJDbHRfR19TaG9wUHVyY2hhc2UQKxIaChZHX0NsdF9BY3Rv", - "clBsYXllclNraWxsECwSHAoYQ2x0X0dfUGxheWVyU2tpbGxVcGdyYWRlEC0S", - "HgoaQ2x0X0dfU2V0RGVmZW5jZVRlYW1Gb3JQdnAQLhIZChVDbHRfTWdfUHZw", - "SW5mb3JtYXRpb24QLxIYChRHX0NsdF9QdnBJbmZvcm1hdGlvbhAwEhIKDkNs", - "dF9HX1B2cFN0YXJ0EDESEwoPQ2x0X0dfUHZwUmVzdWx0EDISEgoOR19DbHRf", - "QWN0b3JQdnAQMxIYChRHX0NsdF9QdnBEZWZlbmNlRGF0YRA0Eg0KCU1TR0lE", - "X01heBBkQgtaCXBiL3hzZl9wYmIGcHJvdG8z")); + "Q2x0X0dfUmFmZmxlEBYSEgoOR19DbHRfSXRlbUxpc3QQFxIVChFDbHRfR19H", + "cm91cFJld2FyZBAYEhgKFENsdF9HX1ZlaGljbGVVcGdyYWRlEBkSEwoPR19D", + "bHRfQWN0b3JUZWFtEBoSFAoQQ2x0X0dfQ3JlYXRlVGVhbRAbEhEKDUNsdF9H", + "X1VzZUl0ZW0QHBISCg5DbHRfR19UZXN0SW5pdBAdEhIKDkNsdF9HX0dpZnRD", + "b2RlEB4SEwoPTWxfQ2x0X01haWxJbmZvEB8SFgoSQ2x0X01sX01haWxSZXF1", + "ZXN0ECASEwoPTWxfQ2x0X01haWxEYXRhECESEwoPQ2x0X01sX09wZW5NYWls", + "ECISGAoUTWxfQ2x0X05ld0dsb2JhbE1haWwQIxISCg5HX0NsdF9Mb2dpbktl", + "eRAkEhEKDUNsdF9HX1JlbG9naW4QJRIZChVDbHRfTWxfQ2xhaW1NYWlsSXRl", + "bXMQJhIVChFDbHRfTWxfRGVsZXRlTWFpbBAnEhMKD0NsdF9HX1Rhc2tDbGFp", + "bRAoEhgKFENsdF9HX0dldFNob3BDb250ZW50ECkSEwoPR19DbHRfU2hvcERh", + "dGFzECoSFgoSQ2x0X0dfU2hvcFB1cmNoYXNlECsSGgoWR19DbHRfQWN0b3JQ", + "bGF5ZXJTa2lsbBAsEhwKGENsdF9HX1BsYXllclNraWxsVXBncmFkZRAtEh4K", + "GkNsdF9HX1NldERlZmVuY2VUZWFtRm9yUHZwEC4SGQoVQ2x0X01nX1B2cElu", + "Zm9ybWF0aW9uEC8SGAoUR19DbHRfUHZwSW5mb3JtYXRpb24QMBISCg5DbHRf", + "R19QdnBTdGFydBAxEhMKD0NsdF9HX1B2cFJlc3VsdBAyEhIKDkdfQ2x0X0Fj", + "dG9yUHZwEDMSGAoUR19DbHRfUHZwRGVmZW5jZURhdGEQNBIXChNDbHRfTWdf", + "UHZwT3JkZXJMaXN0EDUSGwoXTWdfQ2x0X1B2cE9yZGVyTGlzdERhdGEQNhIN", + "CglNU0dJRF9NYXgQZEILWglwYi94c2ZfcGJiBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(new[] {typeof(global::NLDMID.MSGID), }, null, null)); @@ -153,7 +154,7 @@ namespace NLDMID { /// /// client --> game 领取章节宝箱 /// - [pbr::OriginalName("Clt_G_ChapterReward")] CltGChapterReward = 24, + [pbr::OriginalName("Clt_G_GroupReward")] CltGGroupReward = 24, /// /// client --> game 载具升级 /// @@ -266,6 +267,14 @@ namespace NLDMID { /// game --> client 防守数据 /// [pbr::OriginalName("G_Clt_PvpDefenceData")] GCltPvpDefenceData = 52, + /// + /// client --> manager 请求pvp排行榜 + /// + [pbr::OriginalName("Clt_Mg_PvpOrderList")] CltMgPvpOrderList = 53, + /// + /// manager --> client pvp排行榜数据 + /// + [pbr::OriginalName("Mg_Clt_PvpOrderListData")] MgCltPvpOrderListData = 54, [pbr::OriginalName("MSGID_Max")] Max = 100, } diff --git a/ProjectNLD/Assets/Code/Scripts/Gameplay/PVP/PVPDefenderData.cs b/ProjectNLD/Assets/Code/Scripts/Gameplay/PVP/PVPDefenderData.cs index fd7582549a8..c83838ad269 100644 --- a/ProjectNLD/Assets/Code/Scripts/Gameplay/PVP/PVPDefenderData.cs +++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/PVP/PVPDefenderData.cs @@ -20,9 +20,8 @@ public class PVPDefenderData public PVPDefenderData() { - } - + public PVPDefenderData(MSG_PvpDefenceData pvpDefenceData) { var unitInfos = PVPUnitInfo.DeSerialize(pvpDefenceData.TeamData.ToByteArray()); @@ -74,8 +73,15 @@ public class PVPDefenderData /// /// 单个战斗单元上阵数据，该数据会序列化后发送给服务器 /// +[Serializable] public class PVPUnitInfo { + [Serializable] + private class PVPUnitInfoListData + { + public List unitInfos; + } + public uint unitID; public Unit.UnitType type = Unit.UnitType.Charactor; @@ -88,7 +94,11 @@ public class PVPUnitInfo public static byte[] Serialize(List unitInfos) { - var jsonStr = JsonUtility.ToJson(unitInfos); + var listData = new PVPUnitInfoListData() + { + unitInfos = unitInfos, + }; + var jsonStr = JsonUtility.ToJson(listData); return System.Text.Encoding.UTF8.GetBytes(jsonStr); } @@ -97,7 +107,10 @@ public class PVPUnitInfo if (bytes == null) return new List(); var jsonStr = System.Text.Encoding.UTF8.GetString(bytes); - return JsonUtility.FromJson>(jsonStr); + var listData = JsonUtility.FromJson(jsonStr); + if (listData == null) + return new List(); + return listData.unitInfos; } } diff --git a/ProjectNLD/Assets/Code/Scripts/Gameplay/PVP/PVPManager.DefenderPrepare.cs b/ProjectNLD/Assets/Code/Scripts/Gameplay/PVP/PVPManager.DefenderPrepare.cs index 624e1ca06f7..a7966f7ec00 100644 --- a/ProjectNLD/Assets/Code/Scripts/Gameplay/PVP/PVPManager.DefenderPrepare.cs +++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/PVP/PVPManager.DefenderPrepare.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using Cysharp.Threading.Tasks; using Framework; +using Framework.Wrapper; using Gameplay; using Gameplay.Level; using Gameplay.Net; @@ -40,12 +41,12 @@ public partial class PVPManager public async void ExitDefendPrepare(List unitInfosAfterEdit) { + SetPVPDefenderPrepareData(unitInfosAfterEdit); PrepareTeamManager.Instance.Dispose(); UIManager.Instance.CloseWindow(UINameConst.UI_PVPDefendPrepare, UIWindowCloseType.HideAndDestroy); UIManager.Instance.ShowAllUI(); await GameSceneManager.Instance.UnLoadSceneAsync(_scenePath); CameraManager.Instance.SetMainCameraActive(true); - SetPVPDefenderPrepareData(unitInfosAfterEdit); } private async UniTask LoadScene() @@ -87,17 +88,19 @@ public partial class PVPManager return 0; } } - + private void SetPVPDefenderPrepareData(List unitInfos) { unitInfos.Sort((a, b) => a.type.CompareTo(b.type)); + if(unitInfos.Count == 0) + return; uint[] characterIDs = new uint[unitInfos.Count - 1]; for (int i = 0; i < unitInfos.Count - 1; i++) { characterIDs[i] = unitInfos[i].unitID; } - uint vehicleID = unitInfos[^1].unitID; + uint vehicleID = unitInfos[^1].type == Unit.UnitType.Vehicle ? unitInfos[^1].unitID : 0; byte[] teamData = PVPUnitInfo.Serialize(unitInfos); NetHelper.SetDefenceTeamForPvp(characterIDs, vehicleID, teamData); } diff --git a/ProjectNLD/Assets/Code/Scripts/Gameplay/PVP/PVPManager.cs b/ProjectNLD/Assets/Code/Scripts/Gameplay/PVP/PVPManager.cs index c16ba65b6a3..84b9c3c1949 100644 --- a/ProjectNLD/Assets/Code/Scripts/Gameplay/PVP/PVPManager.cs +++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/PVP/PVPManager.cs @@ -51,7 +51,7 @@ public partial class PVPManager : Singlenton, IInitable public void Init() { - EventManager.Instance.Register(EventManager.EventName.OnGetPVPInformation, + EventManager.Instance.Register(EventManager.EventName.OnGetPVPInformationFromServer, OnGetPVPInformation); EventManager.Instance.Register(EventManager.EventName.AllConfigLoad, OnAllConfigLoad); InitFight(); @@ -59,7 +59,7 @@ public partial class PVPManager : Singlenton, IInitable public void Release() { - EventManager.Instance.Register(EventManager.EventName.OnGetPVPInformation, + EventManager.Instance.Register(EventManager.EventName.OnGetPVPInformationFromServer, OnGetPVPInformation); EventManager.Instance.Unregister(EventManager.EventName.AllConfigLoad, OnAllConfigLoad); ReleaseFight(); @@ -95,5 +95,6 @@ public partial class PVPManager : Singlenton, IInitable PVPEnemyInfo enemyInfo = new(actor); _enemies.Add(enemyInfo); } + EventManager.Instance.Send(EventManager.EventName.OnGetPVPInformation); } } \ No newline at end of file diff --git a/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/UIBinder/UI_PVPMainBinder.cs b/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/UIBinder/UI_PVPMainBinder.cs new file mode 100644 index 00000000000..82c1d833b84 --- /dev/null +++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/UIBinder/UI_PVPMainBinder.cs @@ -0,0 +1,34 @@ +using System.Collections; +using System.Collections.Generic; +using TMPro; +using Framework; +using UnityEngine; +using UnityEngine.UI; +using UnityEngine.UIElements; +using Button = UnityEngine.UI.Button; +using Image = UnityEngine.UI.Image; +using Toggle = UnityEngine.UI.Toggle; +using ScrollView = PhxhSDK.PhxhScrollView; + +public class UI_PVPMainBinder +{ + + public static void GetComponents(UI_PVPMainController window) + { + window.Button_EnemyInfo_0 = window.GetComponent