diff --git a/Assets/ManagedResources/Atlas/GMAltas/ArtFront/gm_mianfeizhichong_zh.png b/Assets/ManagedResources/Atlas/GMAltas/ArtFront/gm_mianfeizhichong_zh.png new file mode 100644 index 0000000000..a76acf2df2 Binary files /dev/null and b/Assets/ManagedResources/Atlas/GMAltas/ArtFront/gm_mianfeizhichong_zh.png differ diff --git a/Assets/ManagedResources/Atlas/GMAltas/ArtFront/gm_mianfeizhichong_zh.png.meta b/Assets/ManagedResources/Atlas/GMAltas/ArtFront/gm_mianfeizhichong_zh.png.meta new file mode 100644 index 0000000000..445924450c --- /dev/null +++ b/Assets/ManagedResources/Atlas/GMAltas/ArtFront/gm_mianfeizhichong_zh.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 8602770b818b779429c43d089342dfc7 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 2457275b59c395a478a307b324d4b1cf + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: GMAltas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/GMAltas/gm_shop_item_bg.png b/Assets/ManagedResources/Atlas/GMAltas/gm_shop_item_bg.png new file mode 100644 index 0000000000..b8efe77995 Binary files /dev/null and b/Assets/ManagedResources/Atlas/GMAltas/gm_shop_item_bg.png differ diff --git a/Assets/ManagedResources/Atlas/GMAltas/gm_shop_item_bg.png.meta b/Assets/ManagedResources/Atlas/GMAltas/gm_shop_item_bg.png.meta new file mode 100644 index 0000000000..3633ed027a --- /dev/null +++ b/Assets/ManagedResources/Atlas/GMAltas/gm_shop_item_bg.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 126d583ec5fab5c4eb94b7bfd391758f +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 09b3ffc4f128d6f41b5c3be46afd84d8 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: GMAltas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/GMPanel/GMFreeRecharge.prefab b/Assets/ManagedResources/Prefabs/UI/GMPanel/GMFreeRecharge.prefab index 35d1b4d6f4..27615dc92d 100644 --- a/Assets/ManagedResources/Prefabs/UI/GMPanel/GMFreeRecharge.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GMPanel/GMFreeRecharge.prefab @@ -155,7 +155,7 @@ RectTransform: 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: -81.8, y: -31.9} + m_AnchoredPosition: {x: -68, y: -53.7} m_SizeDelta: {x: 110, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &194752081 @@ -305,8 +305,8 @@ RectTransform: 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: -2116.8, y: 671.4} - m_SizeDelta: {x: 248.4, y: 439.2} + m_AnchoredPosition: {x: -1021, y: 299.08} + m_SizeDelta: {x: 216, y: 434} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &361516933 CanvasRenderer: @@ -336,7 +336,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 665b464729a55fc4cabf01ca5a6e4d6f, type: 3} + m_Sprite: {fileID: 21300000, guid: 126d583ec5fab5c4eb94b7bfd391758f, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -421,7 +421,7 @@ RectTransform: 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: 22, y: -36.4} + m_AnchoredPosition: {x: 22, y: -58.19999} m_SizeDelta: {x: 124.19, y: 46.03} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &401074220 @@ -478,6 +478,7 @@ GameObject: - component: {fileID: 457855539} - component: {fileID: 457855541} - component: {fileID: 457855540} + - component: {fileID: 1620567715809339272} m_Layer: 0 m_Name: Num m_TagString: Untagged @@ -501,7 +502,7 @@ RectTransform: 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: -282, y: -16.9} + m_AnchoredPosition: {x: -156.8, y: 58.2} m_SizeDelta: {x: 172.9, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &457855541 @@ -525,7 +526,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.08627451, g: 0.12156863, b: 0.14901961, a: 1} + m_Color: {r: 0.98823535, g: 0.7843138, b: 0.38823533, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -534,7 +535,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 50 + m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -545,8 +546,23 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u4F59\u989D\uFF1A100" + m_Text: "500\u5143" LanguageIndex: 0 +--- !u!114 &1620567715809339272 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 457855538} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0.45098042, g: 0.28627452, b: 0.121568635, a: 1} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &535472987 GameObject: m_ObjectHideFlags: 0 @@ -824,8 +840,8 @@ RectTransform: 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: -47.1} - m_SizeDelta: {x: 1080, y: 923.8} + m_AnchoredPosition: {x: 11.8, y: 11.5} + m_SizeDelta: {x: 914.5, y: 1041} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &942461903 CanvasRenderer: @@ -1062,8 +1078,8 @@ RectTransform: 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: -1.5047, y: -78.7} - m_SizeDelta: {x: 219.01, y: 47.7} + m_AnchoredPosition: {x: -1.07, y: -98.3} + m_SizeDelta: {x: 203.06, y: 47.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1108870465 CanvasRenderer: @@ -1252,8 +1268,8 @@ RectTransform: 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.98999786, y: 74} - m_SizeDelta: {x: 250, y: 250} + m_AnchoredPosition: {x: 0.98999786, y: 49.3} + m_SizeDelta: {x: 175, y: 175} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1209697801 CanvasRenderer: @@ -1408,7 +1424,7 @@ RectTransform: 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: 37.4, y: 1} + m_AnchoredPosition: {x: 37.4, y: -21.5} m_SizeDelta: {x: 280, y: 44.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1355520119 @@ -1902,7 +1918,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1137169187801004114 RectTransform: m_ObjectHideFlags: 0 @@ -1923,7 +1939,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -218.92, y: 50} + m_AnchoredPosition: {x: -160.4, y: 56.3} m_SizeDelta: {x: 232.37, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8054413355739791528 @@ -2088,7 +2104,7 @@ RectTransform: 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: 54} + m_AnchoredPosition: {x: 0, y: 64} m_SizeDelta: {x: 121, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2948091018443376136 @@ -2219,7 +2235,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5924655562714418700 RectTransform: m_ObjectHideFlags: 0 @@ -2293,7 +2309,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &4644413850146383832 RectTransform: m_ObjectHideFlags: 0 @@ -2384,8 +2400,8 @@ RectTransform: 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.3, y: 0.61} - m_SizeDelta: {x: 272, y: 121.34} + m_AnchoredPosition: {x: 3.75, y: 3.22} + m_SizeDelta: {x: 248.56, y: 99.03} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8954153026382200265 CanvasRenderer: @@ -2529,6 +2545,8 @@ RectTransform: - {fileID: 198735939987716845} - {fileID: 1742723746983456016} - {fileID: 457855539} + - {fileID: 1675182769892847826} + - {fileID: 6360099942884865889} m_Father: {fileID: 1574912427587607898} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2646,8 +2664,8 @@ RectTransform: 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: -35.000042} - m_SizeDelta: {x: 1008, y: 402} + m_AnchoredPosition: {x: -11.7, y: -27.6} + m_SizeDelta: {x: 961.2, y: 382.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9142378058513353641 CanvasRenderer: @@ -2796,8 +2814,8 @@ RectTransform: 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: -141} - m_SizeDelta: {x: 681.6, y: 31.6} + m_AnchoredPosition: {x: -9.69, y: -8.9824915} + m_SizeDelta: {x: 597.88, y: 17.97} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1332630284907424659 CanvasRenderer: @@ -2870,7 +2888,7 @@ RectTransform: 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: -70} + m_AnchoredPosition: {x: -19, y: 19} m_SizeDelta: {x: 400, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7808231887947794752 @@ -2903,7 +2921,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 32 + m_FontSize: 25 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -2990,6 +3008,86 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &4487179161738225197 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1675182769892847826} + - component: {fileID: 2182733017932971447} + - component: {fileID: 1275682394852366181} + m_Layer: 0 + m_Name: text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1675182769892847826 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4487179161738225197} + 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: 844575118310930223} + 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: -277.3, y: 58.2} + m_SizeDelta: {x: 62.65, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2182733017932971447 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4487179161738225197} + m_CullTransparentMesh: 0 +--- !u!114 &1275682394852366181 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4487179161738225197} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.45098042, g: 0.28627452, b: 0.121568635, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 25 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 50 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u4F59\u989D:" + LanguageIndex: 0 --- !u!1 &4590367328431826276 GameObject: m_ObjectHideFlags: 0 @@ -3098,7 +3196,7 @@ RectTransform: 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: 290.3, y: 25.1} + m_AnchoredPosition: {x: 242.9, y: -28.4} m_SizeDelta: {x: 100, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8732238446148751608 @@ -3122,7 +3220,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.33333334, g: 0.29803923, b: 0.21176471, a: 1} + m_Color: {r: 0.45098042, g: 0.28627452, b: 0.121568635, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -3315,7 +3413,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7750159474538140700 RectTransform: m_ObjectHideFlags: 0 @@ -3406,8 +3504,8 @@ RectTransform: 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: -25.7} - m_SizeDelta: {x: 904, y: 1104.7} + m_AnchoredPosition: {x: 0, y: 2.9} + m_SizeDelta: {x: 904, y: 1035.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5777872234744706466 CanvasRenderer: @@ -3522,8 +3620,8 @@ RectTransform: 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: -30.65} - m_SizeDelta: {x: 1080, y: 1260} + m_AnchoredPosition: {x: 0, y: -20.4} + m_SizeDelta: {x: 1080, y: 1270.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8582569479666850519 CanvasRenderer: @@ -3670,8 +3768,8 @@ RectTransform: 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: 164} - m_SizeDelta: {x: 384, y: 124} + m_AnchoredPosition: {x: -12, y: 164.7} + m_SizeDelta: {x: 429, y: 164.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &228029696967699065 CanvasRenderer: @@ -3701,7 +3799,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 1f2e4ee54ae87b54b8ddf132cec950ab, type: 3} + m_Sprite: {fileID: 21300000, guid: 8602770b818b779429c43d089342dfc7, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3710,6 +3808,124 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &6693501183737466226 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6360099942884865889} + - component: {fileID: 1946917054010582833} + - component: {fileID: 1701747586453513860} + - component: {fileID: 6844395433012134755} + m_Layer: 5 + m_Name: Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &6360099942884865889 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6693501183737466226} + 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: 3892220337093646846} + m_Father: {fileID: 844575118310930223} + m_RootOrder: 5 + 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: -154.3, y: -111.72} + m_SizeDelta: {x: 220.16, y: 80.17} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1946917054010582833 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6693501183737466226} + m_CullTransparentMesh: 0 +--- !u!114 &1701747586453513860 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6693501183737466226} + m_Enabled: 0 + 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: 1 + 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: addacd5860691b74db509358d99a6dfb, 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 &6844395433012134755 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6693501183737466226} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + 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_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_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1701747586453513860} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!1 &6829003389224534466 GameObject: m_ObjectHideFlags: 0 @@ -3745,7 +3961,7 @@ RectTransform: 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_AnchoredPosition: {x: 0, y: 3} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8233268900659202346 @@ -3784,7 +4000,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9529412, g: 0.92156863, b: 0.7921569, a: 1} + m_Color: {r: 0.3803922, g: 0.28235295, b: 0.09411766, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -3793,10 +4009,10 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 50 + m_FontSize: 40 m_FontStyle: 0 - m_BestFit: 1 - m_MinSize: 30 + m_BestFit: 0 + m_MinSize: 4 m_MaxSize: 50 m_Alignment: 4 m_AlignByGeometry: 0 @@ -3921,7 +4137,7 @@ RectTransform: 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: 37.4, y: 142} + m_AnchoredPosition: {x: 37.4, y: 103.9} m_SizeDelta: {x: 280, y: 44.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4534350853209029296 @@ -3982,7 +4198,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2760089878686763764 RectTransform: m_ObjectHideFlags: 0 @@ -4060,6 +4276,85 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8031914734396872621} m_CullTransparentMesh: 0 +--- !u!1 &8036978439219796668 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3892220337093646846} + - component: {fileID: 8286866702116689722} + - component: {fileID: 687325785223228558} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3892220337093646846 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8036978439219796668} + 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: 6360099942884865889} + 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: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8286866702116689722 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8036978439219796668} + m_CullTransparentMesh: 0 +--- !u!114 &687325785223228558 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8036978439219796668} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.38823533, g: 0.1764706, b: 0.07058824, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 40 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u76F4 \u5145" --- !u!1 &8323371330630606485 GameObject: m_ObjectHideFlags: 0 @@ -4138,8 +4433,8 @@ RectTransform: 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: -334.52, y: -0.46} - m_SizeDelta: {x: 669.1, y: 15.56} + m_AnchoredPosition: {x: -294.05, y: -0.46} + m_SizeDelta: {x: 588.16, y: 15.56} m_Pivot: {x: 0, y: 0.5} --- !u!222 &6921372531623507925 CanvasRenderer: @@ -4213,7 +4508,7 @@ RectTransform: 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: -739} + m_AnchoredPosition: {x: 0, y: 553} m_SizeDelta: {x: 1082, y: 122.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8999532519980108781 @@ -4270,7 +4565,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 4 - m_Spacing: -3.73 + m_Spacing: 30 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/GMFreeRecharge.lua b/Assets/ManagedResources/~Lua/Modules/Operating/GMFreeRecharge.lua index 7a7c4136e9..98444138f5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/GMFreeRecharge.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/GMFreeRecharge.lua @@ -6,8 +6,8 @@ local itemConfig=ConfigManager.GetConfig(ConfigName.ItemConfig) local rewardCom=ConfigManager.GetConfig(ConfigName.RechargeCommodityConfig) local sortingOrder = 0 local TabBox = require("Modules/Common/TabBox") -local _TabData={ [1] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "直充",img = "gm_shuachong_scGM_01_zh",id=7 }, - [2] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "神充" ,img = "gm_shuachong_cjGM_01_zh",id=8 }, +local _TabData={ [1] = { default = "s_slbz_1anniuhuangse", select = "s_slbz_1anniuongse", name = "直充",img = "gm_mianfeizhichong_zh",id=7 }, + [2] = { default = "s_slbz_1anniuhuangse", select = "s_slbz_1anniuongse", name = "神充" ,img = "gm_mianfeizhichong_zh",id=8 }, } function GMFreeRecharge:New(gameObject) @@ -33,7 +33,7 @@ function GMFreeRecharge:InitComponent() self.grid=Util.GetGameObject(self.gameObject,"scrollbg/scrollroot") local rootHight = self.grid.transform.rect.height local width = self.grid.transform.rect.width - self.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, self.grid.transform,self.itemPre, nil, Vector2.New(width, rootHight), 1, 3, Vector2.New(50,10)) + self.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, self.grid.transform,self.itemPre, nil, Vector2.New(width, rootHight), 1, 3, Vector2.New(60,40)) self.ScrollView.moveTween.MomentumAmount = 1 self.ScrollView.moveTween.Strength = 2 --self.ScrollView.elastic = false @@ -46,12 +46,11 @@ function GMFreeRecharge:InitComponent() SwitchView=function(_index) local list=ConfigManager.GetAllConfigsDataByKey(ConfigName.GMMaster,"Type",_TabData[_index].id) if list then - LogError("3333333333333 list len=="..#list) self.ScrollView:SetData(list, function (index, go) self:SingleDataShow(go,list[index]) end,false) else - LogError("222222222222222222") + end end self.TabCtrl = TabBox.New() @@ -62,7 +61,7 @@ end function GMFreeRecharge:SingleDataShow(item,data) item.gameObject:SetActive(true) - local iconImg=Util.GetGameObject(item,"GameObject/icon"):GetComponent("Image") + --local iconImg=Util.GetGameObject(item,"GameObject/icon"):GetComponent("Image") local getImg=Util.GetGameObject(item,"GameObject/itemIcon"):GetComponent("Image") local getTxt=Util.GetGameObject(item,"GameObject/itemNum"):GetComponent("Text") local extraObj=Util.GetGameObject(item,"GameObject/first") @@ -72,6 +71,7 @@ function GMFreeRecharge:SingleDataShow(item,data) local costImg=Util.GetGameObject(item,"GameObject/need/Image"):GetComponent("Image") local costTxt=Util.GetGameObject(item,"GameObject/need/Text"):GetComponent("Text") local nameTxt=Util.GetGameObject(item,"GameObject/price/Text"):GetComponent("Text") + local icon=Util.GetGameObject(item,"GameObject/icon"):GetComponent("Image") local btn=Util.GetGameObject(item,"GameObject/price") nameTxt.text=data.Name local cost=data.Price @@ -89,7 +89,7 @@ function GMFreeRecharge:SingleDataShow(item,data) local reward=rechargeConfig.RewardShow getImg.sprite=self.spLoader:LoadSprite(artConfig[itemConfig[reward[1][1]].ResourceID].Name) getTxt.text=PrintWanNum(reward[1][2]) - + icon.sprite=self.spLoader:LoadSprite(artConfig[rechargeConfig.Id].Name) if reward[2] then extraObj:SetActive(true) extImg.sprite=self.spLoader:LoadSprite(artConfig[itemConfig[reward[2][1]].ResourceID].Name) @@ -101,7 +101,7 @@ function GMFreeRecharge:SingleDataShow(item,data) Util.AddOnceClick(btn,function() PayManager.Pay(data.PackID,function() local num=BagManager.GetItemCountById(1367) - self.coinNumTxt.text="GM余额:"..num + self.coinNumTxt.text=num end) end) end @@ -137,7 +137,7 @@ function GMFreeRecharge:OnShow(_sortingOrder) self.gameObject:SetActive(true) sortingOrder = _sortingOrder local num=BagManager.GetItemCountById(1367) - self.coinNumTxt.text="GM余额:"..num + self.coinNumTxt.text=num local useTime=PrivilegeManager.GetPrivilegeUsedTimes(PRIVILEGE_TYPE.GM_YI_YUAN_UP_TIME) local maxNum=ActivityGiftManager.GetYiYuanUpMaxTime() self.progressImg.fillAmount=useTime/maxNum