diff --git a/Assets/ManagedResources/Prefabs/UI/ContinuePackage/PremiumRebatePanel.prefab b/Assets/ManagedResources/Prefabs/UI/ContinuePackage/PremiumRebatePanel.prefab index bcfe3b5ba4..d46428df9f 100644 --- a/Assets/ManagedResources/Prefabs/UI/ContinuePackage/PremiumRebatePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/ContinuePackage/PremiumRebatePanel.prefab @@ -110,7 +110,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 5560347858770598648} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} @@ -212,7 +212,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 0.78431374} + m_Color: {r: 0, g: 0, b: 0, a: 0.8392157} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -438,6 +438,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 7121277092858204037} + - {fileID: 3425824529020890089} - {fileID: 2545290923758964436} - {fileID: 327719872794192258} m_Father: {fileID: 2750471745573935426} @@ -814,7 +815,7 @@ RectTransform: - {fileID: 7944016472393893859} - {fileID: 3435773343199518887} m_Father: {fileID: 5560347858770598648} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1138,6 +1139,101 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &4592626312206583315 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3425824529020890089} + - component: {fileID: 9095002885393083940} + - component: {fileID: 3402853726618675202} + - component: {fileID: 3191184971601667761} + m_Layer: 0 + m_Name: Image (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3425824529020890089 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4592626312206583315} + 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: 5560347858770598648} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 41, y: -511.5} + m_SizeDelta: {x: 22, y: 38} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &9095002885393083940 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4592626312206583315} + m_CullTransparentMesh: 0 +--- !u!114 &3402853726618675202 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4592626312206583315} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: e2731e40030fada4c8f0f329d0ac9d63, 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 +--- !u!114 &3191184971601667761 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4592626312206583315} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &4729234240114352799 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset b/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset index 5866b1d3a2..8f1129ffd4 100644 --- a/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset +++ b/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset @@ -16295,6 +16295,30 @@ MonoBehaviour: extension: .png resPathIndex: 27 resAbNameIndex: 13 + - resName: c_czfl_30yuan + extension: .png + resPathIndex: 27 + resAbNameIndex: 13 + - resName: c_czfl_30yuan2 + extension: .png + resPathIndex: 27 + resAbNameIndex: 13 + - resName: c_czfl_6yuan + extension: .png + resPathIndex: 27 + resAbNameIndex: 13 + - resName: c_czfl_6yuan2 + extension: .png + resPathIndex: 27 + resAbNameIndex: 13 + - resName: c_czfl_diban + extension: .png + resPathIndex: 27 + resAbNameIndex: 13 + - resName: c_czfl_tubiao + extension: .png + resPathIndex: 27 + resAbNameIndex: 13 - resName: c_cjjs_baitou_01 extension: .png resPathIndex: 28 @@ -26995,6 +27019,10 @@ MonoBehaviour: extension: .png resPathIndex: 183 resAbNameIndex: 88 + - resName: xuanzhongkuang + extension: .png + resPathIndex: 184 + resAbNameIndex: 89 - resName: y_yujianzuoji_jian_01 extension: .png resPathIndex: 184 @@ -54891,6 +54919,10 @@ MonoBehaviour: extension: .png resPathIndex: 647 resAbNameIndex: 2632 + - resName: r_LvUpItem_zuhe + extension: .png + resPathIndex: 647 + resAbNameIndex: 2632 - resName: r_Material_MakedMineral_0001 extension: .png resPathIndex: 647 @@ -77953,6 +77985,7 @@ MonoBehaviour: - lz4/publicartres/models.unity3d - assetBundleName: lz4/prefabs/ui/fight.unity3d dependences: + - lz4/atlas/activityaltas.unity3d - lz4/atlas/fightatlas.unity3d - lz4/atlas/fightlevelatlas.unity3d - lz4/atlas/popupatlas.unity3d @@ -79598,6 +79631,7 @@ MonoBehaviour: - lz4/fonts/vipfont.unity3d - lz4/icons.unity3d - lz4/publicartres/animations.unity3d + - lz4/publicartres/materials.unity3d - assetBundleName: lz4/prefabs/ui/recruit.unity3d dependences: - lz4/atlas/commonatlas.unity3d