diff --git a/Assets/prefabs/ui/common/reward_cell.prefab b/Assets/prefabs/ui/common/reward_cell.prefab index 4df0bfe75..e42418257 100644 --- a/Assets/prefabs/ui/common/reward_cell.prefab +++ b/Assets/prefabs/ui/common/reward_cell.prefab @@ -31,6 +31,7 @@ RectTransform: m_Children: - {fileID: 3335062103840720553} - {fileID: 4089771124753005517} + - {fileID: 4296149395571454274} - {fileID: 5164977974539208548} - {fileID: 7171483589642333812} m_Father: {fileID: 2568998946116628564} @@ -79,6 +80,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &2025453443738186468 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4296149395571454274} + - component: {fileID: 4831175979435118179} + - component: {fileID: 2998044814907671567} + m_Layer: 5 + m_Name: left_up_icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4296149395571454274 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2025453443738186468} + 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_Children: [] + m_Father: {fileID: 5993802040676866955} + m_RootOrder: 2 + 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: -44, y: 46} + m_SizeDelta: {x: 40, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4831175979435118179 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2025453443738186468} + m_CullTransparentMesh: 1 +--- !u!114 &2998044814907671567 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2025453443738186468} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: a70289eca986ce142b027934f6cdd63c, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &3441384696332212169 GameObject: m_ObjectHideFlags: 0 @@ -109,7 +185,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 5993802040676866955} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -463,6 +539,10 @@ MonoBehaviour: hashName: 4246067598 objectType: 0 gameObject: {fileID: 6779517126958811877} + - name: reward_cell.item_bg.left_up_icon + hashName: 4169433406 + objectType: 0 + gameObject: {fileID: 2025453443738186468} --- !u!225 &6876715644725703649 CanvasGroup: m_ObjectHideFlags: 0 @@ -641,7 +721,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 5993802040676866955} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} diff --git a/Assets/proto/protocol.bytes b/Assets/proto/protocol.bytes index ed54fa82b..b1f4c1c72 100644 --- a/Assets/proto/protocol.bytes +++ b/Assets/proto/protocol.bytes @@ -1,5 +1,5 @@ -{ +| pb/proto/protocol.protocspb" Gift act_type (RactType @@ -107,11 +107,12 @@ proClaimed: rewards ( 2 .cspb.RewardRrewards"? BountyBoughtNtf season (Rseason -level (Rlevel"D +level (Rlevel"l ChapterInfo total_count (R totalCount -index (Rindex" +index (Rindex& +mystery_box_idx (R mysteryBoxIdx" Chapter$ max_chapter_id (R maxChapterId max_wave (RmaxWaveA @@ -143,12 +144,13 @@ kills_boss (R killsBoss# clear_10_combo (R clear10Combo skills_cast (R -skillsCast" +skillsCast" ChapterSettlementRsp( err_code (2 .cspb.ErrCodeRerrCode& -rewards ( 2 .cspb.RewardRrewards$ -max_chapter_id (R maxChapterId -max_wave (RmaxWave"H +rewards ( 2 .cspb.RewardRrewards +mystery (Rmystery$ +max_chapter_id (R maxChapterId +max_wave (RmaxWave"H ChapterBoxRewardReq chapter_id (R chapterId