diff --git a/Assets/prefabs/ui/activity/hero_fund/activity_herofund_ui.prefab b/Assets/prefabs/ui/activity/hero_fund/activity_herofund_ui.prefab index ddc4b9561..503b1f932 100644 --- a/Assets/prefabs/ui/activity/hero_fund/activity_herofund_ui.prefab +++ b/Assets/prefabs/ui/activity/hero_fund/activity_herofund_ui.prefab @@ -344,7 +344,7 @@ RectTransform: - {fileID: 8987829491234460504} - {fileID: 4219852738933710711} m_Father: {fileID: 4412000624834818031} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -525,7 +525,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -779,7 +779,7 @@ GameObject: - component: {fileID: 6262266099309738003} - component: {fileID: 7415994793770204428} m_Layer: 5 - m_Name: activity_bounty_cell + m_Name: fund_cell m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -822,20 +822,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: prefabList: - - name: activity_bounty_cell.level.tx_level - hashName: 2100353243 + - name: fund_cell.level.tx_level + hashName: 1400512197 objectType: 0 gameObject: {fileID: 2645977001679978933} - - name: activity_bounty_cell.reward_cell_1 - hashName: 3417442044 + - name: fund_cell.reward_cell_1 + hashName: 2979224530 objectType: 1 gameObject: {fileID: 7617449553333829390} - - name: activity_bounty_cell.reward_cell_2 - hashName: 3417442045 + - name: fund_cell.reward_cell_2 + hashName: 2979224531 objectType: 1 gameObject: {fileID: 2811008687169529354} - - name: activity_bounty_cell.reward_cell_3 - hashName: 3417442046 + - name: fund_cell.reward_cell_3 + hashName: 2979224532 objectType: 1 gameObject: {fileID: 117480353050942206} --- !u!222 &6262266099309738003 @@ -858,85 +858,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f2ff04a05639f474f85820cdf1f47de0, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &1742139030281939317 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4673673534377187605} - - component: {fileID: 5691433230727239477} - - component: {fileID: 5615563629722791687} - m_Layer: 5 - m_Name: bounty - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4673673534377187605 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1742139030281939317} - 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: - - {fileID: 5859929786241267949} - - {fileID: 6386251777911031802} - - {fileID: 796268548633827234} - - {fileID: 6779365506364287914} - m_Father: {fileID: 4412000624834818031} - m_RootOrder: 1 - 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: 345} - m_SizeDelta: {x: 549, y: 123} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5691433230727239477 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1742139030281939317} - m_CullTransparentMesh: 1 ---- !u!114 &5615563629722791687 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1742139030281939317} - 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: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 34d7d73e7989c4c4b87d663d11343e3a, 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 &2146887775768185042 GameObject: m_ObjectHideFlags: 0 @@ -1047,7 +968,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -1181,7 +1102,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -1627,7 +1548,7 @@ GameObject: - component: {fileID: 9037265049815301898} - component: {fileID: 8824740618196422353} m_Layer: 5 - m_Name: list_bounty + m_Name: scrollrect m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1647,7 +1568,7 @@ RectTransform: - {fileID: 1395761259647782094} - {fileID: 7732586670699628709} m_Father: {fileID: 4412000624834818031} - m_RootOrder: 3 + 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} @@ -1850,7 +1771,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -1866,140 +1787,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &3906571939079914947 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6779365506364287914} - - component: {fileID: 7540527481840411905} - - component: {fileID: 7016942415164302350} - m_Layer: 5 - m_Name: tx_lv_num - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6779365506364287914 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3906571939079914947} - 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: 4673673534377187605} - m_RootOrder: 3 - 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: 205, y: -7} - m_SizeDelta: {x: 80.9, y: 67.4} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7540527481840411905 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3906571939079914947} - m_CullTransparentMesh: 1 ---- !u!114 &7016942415164302350 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3906571939079914947} - 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: - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, 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: 1 - m_fontSizeMin: 18 - m_fontSizeMax: 48 - 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 &3948953813767906410 GameObject: m_ObjectHideFlags: 0 @@ -2302,7 +2089,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -2463,6 +2250,7 @@ GameObject: - component: {fileID: 3897315103194960258} - component: {fileID: 5128531495297514166} - component: {fileID: 745140378479176368} + - component: {fileID: 631408806886304191} m_Layer: 0 m_Name: close_btn m_TagString: Untagged @@ -2477,16 +2265,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5102539967445665239} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 8461932745927490369} - m_RootOrder: 2 + m_Father: {fileID: 4412000624834818031} + 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} - m_AnchoredPosition: {x: 0, y: -503} + m_AnchoredPosition: {x: 0, y: -543} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5128531495297514166 @@ -2511,7 +2299,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 + m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -2527,6 +2315,19 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &631408806886304191 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5102539967445665239} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} + m_Name: + m_EditorClassIdentifier: + IsShowClickAnimation: 1 --- !u!1 &5263660300203150264 GameObject: m_ObjectHideFlags: 0 @@ -2609,7 +2410,7 @@ GameObject: - component: {fileID: 8278805824888950264} - component: {fileID: 4282400205309572514} m_Layer: 5 - m_Name: bounty_panel + m_Name: bg m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -2627,9 +2428,10 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 2653021882444939612} - - {fileID: 4673673534377187605} - {fileID: 5257372685562306940} - {fileID: 4438338106098005838} + - {fileID: 6986091995792665702} + - {fileID: 3897315103194960258} m_Father: {fileID: 8461932745927490369} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2659,26 +2461,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: prefabList: - - name: bounty_panel.bounty.tx_score - hashName: 1602109052 - objectType: 0 - gameObject: {fileID: 5596467760808342329} - - name: bounty_panel.bounty.prog.img_prog - hashName: 282931237 - objectType: 0 - gameObject: {fileID: 6768542269163737331} - - name: bounty_panel.bounty.prog.tx_prog - hashName: 658489478 - objectType: 0 - gameObject: {fileID: 6986287328781686269} - - name: bounty_panel.bounty.tx_lv - hashName: 1911891424 - objectType: 0 - gameObject: {fileID: 7744115755640636801} - - name: bounty_panel.bounty.tx_lv_num - hashName: 2237403303 - objectType: 0 - gameObject: {fileID: 3906571939079914947} - name: bounty_panel.title.free.tx_free hashName: 1340770009 objectType: 0 @@ -2753,7 +2535,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -2769,140 +2551,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &5596467760808342329 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5859929786241267949} - - component: {fileID: 9023020171910422639} - - component: {fileID: 1678117644637503055} - m_Layer: 5 - m_Name: tx_score - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5859929786241267949 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5596467760808342329} - 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: 4673673534377187605} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -30, y: 22} - m_SizeDelta: {x: 246.7, y: 28} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &9023020171910422639 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5596467760808342329} - m_CullTransparentMesh: 1 ---- !u!114 &1678117644637503055 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5596467760808342329} - 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: - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, 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: 20 - m_fontSizeBase: 36 - m_fontWeight: 400 - m_enableAutoSizing: 1 - m_fontSizeMin: 18 - m_fontSizeMax: 20 - 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 &5642094468124675463 GameObject: m_ObjectHideFlags: 0 @@ -2962,7 +2610,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -3011,8 +2659,6 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4412000624834818031} - - {fileID: 6986091995792665702} - - {fileID: 3897315103194960258} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3042,110 +2688,98 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: prefabList: - - name: activity_ui.task_panel - hashName: 2448577844 - objectType: 1 - gameObject: {fileID: 0} - - name: activity_ui.bounty_panel - hashName: 2086121818 - objectType: 1 - gameObject: {fileID: 5390457402351964377} - - name: activity_ui.skin_panel - hashName: 4164692780 - objectType: 1 - gameObject: {fileID: 0} - - name: activity_ui.hero_panel - hashName: 3679093737 - objectType: 1 - gameObject: {fileID: 0} - - name: activity_ui.common.btns.btn_task - hashName: 284582694 + - name: activity_herofund_ui.bg.title.free + hashName: 4280064257 objectType: 0 - gameObject: {fileID: 0} - - name: activity_ui.common.btns.btn_bounty - hashName: 2398700044 + gameObject: {fileID: 8651028322362536140} + - name: activity_herofund_ui.bg.title.free.tx_free + hashName: 313609050 objectType: 0 - gameObject: {fileID: 0} - - name: activity_ui.common.btns.btn_skin - hashName: 284562206 + gameObject: {fileID: 4843548041775843599} + - name: activity_herofund_ui.bg.title.buy1 + hashName: 4279948544 objectType: 0 - gameObject: {fileID: 0} - - name: activity_ui.common.btns.btn_hero - hashName: 284229019 + gameObject: {fileID: 3948953813767906410} + - name: activity_herofund_ui.bg.title.buy1.tx_buyed + hashName: 2738699608 objectType: 0 - gameObject: {fileID: 0} - - name: activity_ui.common.btn_close - hashName: 1631621372 + gameObject: {fileID: 7105489052357226531} + - name: activity_herofund_ui.bg.title.buy2 + hashName: 4279948545 objectType: 0 - gameObject: {fileID: 0} - - name: activity_ui.img_title - hashName: 1359568690 + gameObject: {fileID: 3118383314282874246} + - name: activity_herofund_ui.bg.title.buy2.tx_buyed + hashName: 2542186103 objectType: 0 - gameObject: {fileID: 0} - - name: activity_ui.img_title.tx_title - hashName: 3948555289 + gameObject: {fileID: 2249628531949489253} + - name: activity_herofund_ui.bg.title.buy1.btn_buy + hashName: 3963323189 objectType: 0 - gameObject: {fileID: 0} - - name: activity_ui.countdown.btn_help - hashName: 2944091851 + gameObject: {fileID: 482515068583733452} + - name: activity_herofund_ui.bg.title.buy1.btn_buy.tx_buy + hashName: 4111591204 objectType: 0 - gameObject: {fileID: 208314126805523469} - - name: activity_ui.countdown.content.icon - hashName: 1461103829 + gameObject: {fileID: 2226729383409259039} + - name: activity_herofund_ui.bg.title.buy2.btn_buy + hashName: 2155868726 + objectType: 0 + gameObject: {fileID: 1367503221150158619} + - name: activity_herofund_ui.bg.title.buy2.btn_buy.tx_buy + hashName: 3601057027 + objectType: 0 + gameObject: {fileID: 7342354745705057618} + - name: activity_herofund_ui.bg.scrollrect + hashName: 1871300336 + objectType: 0 + gameObject: {fileID: 3430073042800902170} + - name: activity_herofund_ui.bg.scrollrect.viewport.content.prog + hashName: 485750649 + objectType: 0 + gameObject: {fileID: 3642527194306233845} + - name: activity_herofund_ui.bg.scrollrect.viewport.content.prog.img_prog + hashName: 2452191531 + objectType: 0 + gameObject: {fileID: 5263660300203150264} + - name: activity_herofund_ui.bg.scrollrect.viewport.content.mask_img + hashName: 1460970639 + objectType: 0 + gameObject: {fileID: 4972821386284809787} + - name: activity_herofund_ui.bg.scrollrect.viewport.content.line + hashName: 485622803 + objectType: 0 + gameObject: {fileID: 7369537272378671756} + - name: activity_herofund_ui.bg.scrollrect.viewport.content.line.btn_buy_level + hashName: 2375505869 + objectType: 0 + gameObject: {fileID: 4278010862733438949} + - name: activity_herofund_ui.bg.scrollrect.viewport.content.line.btn_buy_level.icon + hashName: 787609082 + objectType: 0 + gameObject: {fileID: 4841540250766973325} + - name: activity_herofund_ui.bg.scrollrect.viewport.content.line.btn_buy_level.tx_num + hashName: 1311925388 + objectType: 0 + gameObject: {fileID: 810307259187955158} + - name: activity_herofund_ui.bg.countdown + hashName: 1826065810 + objectType: 0 + gameObject: {fileID: 8944690804392300797} + - name: activity_herofund_ui.bg.countdown.icon + hashName: 2562036565 objectType: 0 gameObject: {fileID: 5642094468124675463} - - name: activity_ui.countdown.content.tx_countdown - hashName: 446324370 + - name: activity_herofund_ui.bg.countdown.tx_countdown + hashName: 2083177746 objectType: 0 gameObject: {fileID: 1307564746847574849} - - name: activity_ui.common.btns.btn_task.tx_btn - hashName: 3693700585 + - name: activity_herofund_ui.bg.countdown.btn_help + hashName: 4230753312 objectType: 0 - gameObject: {fileID: 0} - - name: activity_ui.common.btns.btn_task.select.tx_select - hashName: 508065389 + gameObject: {fileID: 208314126805523469} + - name: activity_herofund_ui.bg.close_btn + hashName: 4286646006 objectType: 0 - gameObject: {fileID: 0} - - name: activity_ui.common.btns.btn_task.select - hashName: 3647914180 - objectType: 0 - gameObject: {fileID: 0} - - name: activity_ui.common.btns.btn_bounty.tx_btn - hashName: 2434734147 - objectType: 0 - gameObject: {fileID: 0} - - name: activity_ui.common.btns.btn_bounty.select.tx_select - hashName: 1101955143 - objectType: 0 - gameObject: {fileID: 0} - - name: activity_ui.common.btns.btn_bounty.select - hashName: 2388947742 - objectType: 0 - gameObject: {fileID: 0} - - name: activity_ui.common.btns.btn_skin.tx_btn - hashName: 1058688753 - objectType: 0 - gameObject: {fileID: 0} - - name: activity_ui.common.btns.btn_skin.select.tx_select - hashName: 1661973877 - objectType: 0 - gameObject: {fileID: 0} - - name: activity_ui.common.btns.btn_skin.select - hashName: 1012902348 - objectType: 0 - gameObject: {fileID: 0} - - name: activity_ui.common.btns.btn_hero.tx_btn - hashName: 3184987604 - objectType: 0 - gameObject: {fileID: 0} - - name: activity_ui.common.btns.btn_hero.select.tx_select - hashName: 1782674584 - objectType: 0 - gameObject: {fileID: 0} - - name: activity_ui.common.btns.btn_hero.select - hashName: 3139201199 - objectType: 0 - gameObject: {fileID: 0} + gameObject: {fileID: 5102539967445665239} --- !u!223 &2459416726653635175 Canvas: m_ObjectHideFlags: 0 @@ -3198,7 +2832,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} m_Color: {r: 0, g: 0, b: 0, a: 0.972549} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -3214,75 +2848,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &6768542269163737331 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7541562683600564178} - - component: {fileID: 8040625684681142396} - - component: {fileID: 3161237989119375205} - m_Layer: 5 - m_Name: img_prog - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7541562683600564178 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6768542269163737331} - 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: 6386251777911031802} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -8, y: -8} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8040625684681142396 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6768542269163737331} - m_CullTransparentMesh: 1 ---- !u!114 &3161237989119375205 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6768542269163737331} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6c44c307d57c9417085df33db10b886d, 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: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 3b14bc3747e2c3248b47a3ac14d44d6d, type: 3} - m_FillDirection: 0 - m_Value: 0.5 - m_FillCenter: 1 --- !u!1 &6810712669508764441 GameObject: m_ObjectHideFlags: 0 @@ -3352,140 +2917,6 @@ MonoBehaviour: m_FillDirection: 3 m_Value: 0.5 m_FillCenter: 1 ---- !u!1 &6986287328781686269 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6814847784475714140} - - component: {fileID: 5910008235929321773} - - component: {fileID: 6158896844592205437} - m_Layer: 5 - m_Name: tx_prog - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6814847784475714140 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6986287328781686269} - 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: 6386251777911031802} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5910008235929321773 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6986287328781686269} - m_CullTransparentMesh: 1 ---- !u!114 &6158896844592205437 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6986287328781686269} - 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: - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, 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: 25 - m_fontSizeBase: 36 - m_fontWeight: 400 - m_enableAutoSizing: 1 - m_fontSizeMin: 18 - m_fontSizeMax: 25 - 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 &7105489052357226531 GameObject: m_ObjectHideFlags: 0 @@ -3545,7 +2976,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -3679,7 +3110,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -3830,293 +3261,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &7744115755640636801 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 796268548633827234} - - component: {fileID: 2122779416172864963} - - component: {fileID: 2399920179132118716} - m_Layer: 5 - m_Name: tx_lv - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &796268548633827234 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7744115755640636801} - 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: 4673673534377187605} - 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: 205, y: 25.41} - m_SizeDelta: {x: 80.9, y: 31.39} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2122779416172864963 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7744115755640636801} - m_CullTransparentMesh: 1 ---- !u!114 &2399920179132118716 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7744115755640636801} - 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: - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, 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: 24 - m_fontSizeBase: 36 - m_fontWeight: 400 - m_enableAutoSizing: 1 - m_fontSizeMin: 18 - m_fontSizeMax: 24 - 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 &8016971785646387202 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6386251777911031802} - - component: {fileID: 265635265159610762} - - component: {fileID: 2299921482562766263} - m_Layer: 5 - m_Name: prog - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6386251777911031802 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8016971785646387202} - 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: - - {fileID: 7541562683600564178} - - {fileID: 6814847784475714140} - - {fileID: 7742686998208275832} - m_Father: {fileID: 4673673534377187605} - m_RootOrder: 1 - 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: -30, y: -20} - m_SizeDelta: {x: 353, y: 27} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &265635265159610762 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8016971785646387202} - m_CullTransparentMesh: 1 ---- !u!114 &2299921482562766263 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8016971785646387202} - 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: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 75eeb868e0670844e959094562d14ec7, type: 3} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!1 &8091326338775398242 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7742686998208275832} - - component: {fileID: 5045477041005121063} - - component: {fileID: 620688476601815599} - m_Layer: 5 - m_Name: img - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7742686998208275832 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8091326338775398242} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.8, y: 0.8, z: 1} - m_Children: [] - m_Father: {fileID: 6386251777911031802} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 0, y: 5} - m_SizeDelta: {x: 120, y: 120} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5045477041005121063 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8091326338775398242} - m_CullTransparentMesh: 1 ---- !u!114 &620688476601815599 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8091326338775398242} - 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: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 40d6819d6228f8543aaaedd94aca5d26, 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 &8651028322362536140 GameObject: m_ObjectHideFlags: 0 @@ -4225,12 +3369,12 @@ RectTransform: - {fileID: 5173525970922816887} - {fileID: 8374797007877043826} - {fileID: 7478206260666429712} - m_Father: {fileID: 8461932745927490369} - m_RootOrder: 1 + m_Father: {fileID: 4412000624834818031} + m_RootOrder: 3 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: -387.5} + m_AnchoredPosition: {x: 0, y: -427.5} m_SizeDelta: {x: 309, y: 38} m_Pivot: {x: 0.5, y: 0} --- !u!222 &8277174569845984948 @@ -4255,7 +3399,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -4396,16 +3540,16 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} ---- !u!224 &1669265390632377040 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - m_PrefabInstance: {fileID: 3786549724142463620} - m_PrefabAsset: {fileID: 0} --- !u!1 &7617449553333829390 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} m_PrefabInstance: {fileID: 3786549724142463620} m_PrefabAsset: {fileID: 0} +--- !u!224 &1669265390632377040 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + m_PrefabInstance: {fileID: 3786549724142463620} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6673005517663014772 PrefabInstance: m_ObjectHideFlags: 0 @@ -4531,16 +3675,16 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} ---- !u!224 &9168675490417147680 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - m_PrefabInstance: {fileID: 6673005517663014772} - m_PrefabAsset: {fileID: 0} --- !u!1 &117480353050942206 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} m_PrefabInstance: {fileID: 6673005517663014772} m_PrefabAsset: {fileID: 0} +--- !u!224 &9168675490417147680 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + m_PrefabInstance: {fileID: 6673005517663014772} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8806979742309823360 PrefabInstance: m_ObjectHideFlags: 0 @@ -4666,13 +3810,13 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} ---- !u!224 &6457677548625216468 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - m_PrefabInstance: {fileID: 8806979742309823360} - m_PrefabAsset: {fileID: 0} --- !u!1 &2811008687169529354 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} m_PrefabInstance: {fileID: 8806979742309823360} m_PrefabAsset: {fileID: 0} +--- !u!224 &6457677548625216468 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + m_PrefabInstance: {fileID: 8806979742309823360} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/proto/protocol.bytes b/Assets/proto/protocol.bytes index 72df0f438..cc6b9c435 100644 --- a/Assets/proto/protocol.bytes +++ b/Assets/proto/protocol.bytes @@ -1,5 +1,5 @@ -Åš +ûž pb/proto/protocol.protocspb"ž Gift act_type (RactType @@ -90,7 +90,27 @@ growUpGift"U current_grow_up_id (RcurrentGrowUpId$ trigger_end_at (R triggerEndAt"Q TriggerGrowUpGift2Ntf8 - group_up_gift ( 2.cspb.ActGrowUpGift2R groupUpGift"4 + group_up_gift ( 2.cspb.ActGrowUpGift2R groupUpGift"ƒ + HeroFundData! + free_awarded (R freeAwarded& +pay_low_awarded (R payLowAwarded( +pay_high_awarded (RpayHighAwarded"l +HeroFund +open_at (RopenAt( +funds ( 2.cspb.HeroFundDataRfunds + +total_wave (R totalWave"4 + HeroIdWithLv +id (Rid +grade (Rgrade"D +HeroFundAwardReq0 + +id_with_lv ( 2.cspb.HeroIdWithLvRidWithLv"– +HeroFundAwardRsp( +err_code (2 .cspb.ErrCodeRerrCode0 + +id_with_lv ( 2.cspb.HeroIdWithLvRidWithLv& +rewards ( 2 .cspb.RewardRrewards"4 ActIntroductoryGift trigger_at (R triggerAt"Á @@ -931,7 +951,7 @@ facebookId"C client_info ( 2.cspb.ClientInfoR clientInfo -skip_guide (R skipGuide"— +skip_guide (R skipGuide"Ä LoginRsp( err_code (2 .cspb.ErrCodeRerrCode* today_first_login (RtodayFirstLogin @@ -978,7 +998,8 @@ mall_daily ( 2.cspb.MallDailyR mallDaily+ collection$ ( 2.cspb.CollectionR collection! - game_version% ( R gameVersion"U + game_version% ( R gameVersion+ + hero_fund& ( 2.cspb.HeroFundRheroFund"U PipedReq id ( Rid ts (Rts