diff --git a/Assets/ManagedResources/Atlas/GMAltas/ArtFront/gm_xuChongSong_zh.png b/Assets/ManagedResources/Atlas/GMAltas/ArtFront/gm_xuChongSong_zh.png new file mode 100644 index 0000000000..6b57bddf64 Binary files /dev/null and b/Assets/ManagedResources/Atlas/GMAltas/ArtFront/gm_xuChongSong_zh.png differ diff --git a/Assets/ManagedResources/Atlas/GMAltas/ArtFront/gm_xuChongSong_zh.png.meta b/Assets/ManagedResources/Atlas/GMAltas/ArtFront/gm_xuChongSong_zh.png.meta new file mode 100644 index 0000000000..ffd33afb61 --- /dev/null +++ b/Assets/ManagedResources/Atlas/GMAltas/ArtFront/gm_xuChongSong_zh.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 9f2bac761bd7fc445b7135c7c88804d7 +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: 38b07d57d0726be459b10f292255e8a9 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: GMAltas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/RechargeView/RechargeView.prefab b/Assets/ManagedResources/Prefabs/UI/RechargeView/RechargeView.prefab index e418c673cd..ac52c02227 100644 --- a/Assets/ManagedResources/Prefabs/UI/RechargeView/RechargeView.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RechargeView/RechargeView.prefab @@ -32,10 +32,10 @@ RectTransform: m_Father: {fileID: 7302376467385853434} 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: 264, y: -27.5} - m_SizeDelta: {x: 352, y: 54} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2584905128268111516 CanvasRenderer: @@ -372,6 +372,7 @@ RectTransform: - {fileID: 1993081030921202936} - {fileID: 8221971548835934693} - {fileID: 2644543625368348627} + - {fileID: 2718292341563925778} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -611,10 +612,10 @@ RectTransform: m_Father: {fileID: 8312955512334950455} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 535, y: -37.45} - m_SizeDelta: {x: 56, y: 74.9} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 74.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &464356722378884689 CanvasRenderer: @@ -1515,10 +1516,10 @@ RectTransform: m_Father: {fileID: 8312955512334950455} 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: 156, y: -37.45} - m_SizeDelta: {x: 68, y: 84.95} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 84.95} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1088701170764945780 CanvasRenderer: @@ -2035,7 +2036,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 93, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7359477196684499124 @@ -2242,10 +2243,10 @@ RectTransform: m_Father: {fileID: 8312955512334950455} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 61, y: -37.45} - m_SizeDelta: {x: 122, y: 51} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 51} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4737725430561649768 CanvasRenderer: @@ -2316,10 +2317,10 @@ RectTransform: m_Father: {fileID: 8312955512334950455} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 451.5, y: -37.45} - m_SizeDelta: {x: 111, y: 54} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &177341635030693569 CanvasRenderer: @@ -2390,10 +2391,10 @@ RectTransform: m_Father: {fileID: 8312955512334950455} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 293, y: -37.45} - m_SizeDelta: {x: 206, y: 60} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2909736135784968746 CanvasRenderer: @@ -3068,7 +3069,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0.39976883, y: -47.896736} - m_SizeDelta: {x: 563, y: 74.9} + m_SizeDelta: {x: 0, y: 74.9} m_Pivot: {x: 0.50000006, y: 0.5000005} --- !u!114 &1855110437659185165 MonoBehaviour: @@ -3691,7 +3692,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 12, y: -121.89997} - m_SizeDelta: {x: 440, y: 55} + m_SizeDelta: {x: 0, y: 55} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6323395715852626071 CanvasRenderer: @@ -3922,10 +3923,10 @@ RectTransform: m_Father: {fileID: 7302376467385853434} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 44, y: -27.5} - m_SizeDelta: {x: 88, y: 55} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 55} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3822165279810349626 CanvasRenderer: @@ -4039,6 +4040,85 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &8738631180145693111 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2718292341563925778} + - component: {fileID: 5895612997318442604} + - component: {fileID: 649310362580077010} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2718292341563925778 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8738631180145693111} + 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: 1161233374134730788} + 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: 424.1} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5895612997318442604 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8738631180145693111} + m_CullTransparentMesh: 0 +--- !u!114 &649310362580077010 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8738631180145693111} + 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.95294124, g: 0.7254902, b: 0.21960786, 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: 35 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u6BCF\u5145\u503C1\u5143\u53EF\u989D\u5916\u83B7\u5F9710\u4ED9\u6676" --- !u!1 &8812929885378345159 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/ShopView/ShopView.prefab b/Assets/ManagedResources/Prefabs/UI/ShopView/ShopView.prefab index 643ef919be..27f8507ce6 100644 --- a/Assets/ManagedResources/Prefabs/UI/ShopView/ShopView.prefab +++ b/Assets/ManagedResources/Prefabs/UI/ShopView/ShopView.prefab @@ -324,7 +324,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: 139.2} + m_AnchoredPosition: {x: -31, y: 139.2} m_SizeDelta: {x: 280, y: 78} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222765991508291066 @@ -2796,7 +2796,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: 49.6, y: -43.9} + m_AnchoredPosition: {x: 70, y: -43.9} m_SizeDelta: {x: 156, y: 136} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2164890353251220410 @@ -2836,6 +2836,82 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &575990108177617346 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5936352163049348637} + - component: {fileID: 7041719556531910036} + - component: {fileID: 353208435946517188} + m_Layer: 5 + m_Name: xuChong + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5936352163049348637 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 575990108177617346} + 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: 3034098376043518640} + - {fileID: 1962161826756985495} + m_Father: {fileID: 7103197795649631257} + m_RootOrder: 6 + 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: 139.2} + m_SizeDelta: {x: 303, y: 77} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7041719556531910036 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 575990108177617346} + m_CullTransparentMesh: 0 +--- !u!114 &353208435946517188 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 575990108177617346} + 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: 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: 9f2bac761bd7fc445b7135c7c88804d7, 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!1 &636554389393670323 GameObject: m_ObjectHideFlags: 0 @@ -4026,14 +4102,14 @@ RectTransform: m_GameObject: {fileID: 3020578642793149421} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.35, y: 0.35, z: 1} + m_LocalScale: {x: 0.3, y: 0.3, z: 1} m_Children: [] m_Father: {fileID: 224715751737728956} 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: 85.9, y: 1.1} + m_AnchoredPosition: {x: 63.5, y: 1.1} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3097185143146032839 @@ -4071,13 +4147,13 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 0 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 6480 + m_Text: 6480000 --- !u!1 &3020610902591281743 GameObject: m_ObjectHideFlags: 0 @@ -4112,8 +4188,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.6000385, y: -32} - m_SizeDelta: {x: 188.58, y: 46.03} + m_AnchoredPosition: {x: 3, y: -31} + m_SizeDelta: {x: 215, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3096225094805375901 CanvasRenderer: @@ -4145,7 +4221,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 27 + m_FontSize: 28 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -4155,8 +4231,8 @@ MonoBehaviour: m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 1 - m_LineSpacing: 0.7 - m_Text: "\u8FD9\u662F\u4E94\u4E2A\u5B57\u4EE8\u4E2A" + m_LineSpacing: 0.8 + m_Text: "\u901A\u5929\u6559\u4E3B\u53D8\u8EAB\u5361\u52A8\u8FC7" LanguageIndex: 10412 --- !u!1 &3020615136999118653 GameObject: @@ -4594,6 +4670,85 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\xA56" +--- !u!1 &3092156994944427945 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1962161826756985495} + - component: {fileID: 8485553768464077967} + - component: {fileID: 7444224275215724237} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1962161826756985495 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3092156994944427945} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.3, y: 0.3, z: 1} + m_Children: [] + m_Father: {fileID: 5936352163049348637} + 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: 63.3, y: 0.9} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8485553768464077967 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3092156994944427945} + m_CullTransparentMesh: 0 +--- !u!114 &7444224275215724237 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3092156994944427945} + 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: 1, g: 0.9568628, b: 0.77647066, 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: 1679af67885ed2241b5bd04483cb02cc, type: 2} + m_FontSize: 0 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 6480000 --- !u!1 &3130579941747738974 GameObject: m_ObjectHideFlags: 0 @@ -4978,6 +5133,7 @@ RectTransform: - {fileID: 224686678241914128} - {fileID: 3184820659047775435} - {fileID: 5023853526277665288} + - {fileID: 5936352163049348637} m_Father: {fileID: 224496811525665260} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -5259,6 +5415,80 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &6081908825966130455 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3034098376043518640} + - component: {fileID: 2566503440714381985} + - component: {fileID: 8840851907079449163} + m_Layer: 5 + m_Name: itemIcon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3034098376043518640 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6081908825966130455} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.3, y: 0.3, z: 0.5} + m_Children: [] + m_Father: {fileID: 5936352163049348637} + 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: 23.5, y: 4.5} + m_SizeDelta: {x: 156, y: 136} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2566503440714381985 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6081908825966130455} + m_CullTransparentMesh: 0 +--- !u!114 &8840851907079449163 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6081908825966130455} + 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: 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: de6cd38183296a14c8a07417420b1763, 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!1 &6453630043360194039 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index caf139f6af..e459a094ca 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -422,7 +422,7 @@ PanelTypeView2 = { PanelType = { - Main = { 14, 16 }, -- 体力 2 + Main = { 14, 16,15 }, -- 体力 2 RoleInfo = { 14, 3, 4 }, -- 成长护符 FightPointPass = { 14, 3, 16 }, -- 新关卡 SoulCrystal = { 14, 16 }, -- 魂晶 diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/GMSong10WanPanel.lua b/Assets/ManagedResources/~Lua/Modules/Operating/GMSong10WanPanel.lua index b0ae926b8f..ace8b250f8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/GMSong10WanPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/GMSong10WanPanel.lua @@ -38,7 +38,7 @@ function GMSong10WanPanel:BindEvent() end) Util.AddClick(this.btn_get, function() if isCanGet then - NetManager.GetActivityRewardRequest(0,11201,function(msg) + NetManager.GetActivityRewardRequest(1,11201,function(msg) UIManager.OpenPanel(UIName.RewardItemPopup, msg, 1,function () isCanGet=false this.getRed:SetActive(false) diff --git a/Assets/ManagedResources/~Lua/View/ShopView.lua b/Assets/ManagedResources/~Lua/View/ShopView.lua index ce8bb7b73c..6d020a39c0 100644 --- a/Assets/ManagedResources/~Lua/View/ShopView.lua +++ b/Assets/ManagedResources/~Lua/View/ShopView.lua @@ -648,6 +648,8 @@ function this:RechargeShopItemAdapter(shopItem, itemData) -- 获取对象 local first = Util.GetGameObject(shopItem, "first") local firstNum = Util.GetGameObject(shopItem, "first/Text"):GetComponent("Text") + local xuChong = Util.GetGameObject(shopItem, "xuChong") + local xuNum = Util.GetGameObject(shopItem, "xuChong/Text"):GetComponent("Text") local icon = Util.GetGameObject(shopItem, "icon"):GetComponent("Image") local num = Util.GetGameObject(shopItem, "itemNum"):GetComponent("Text") local price = Util.GetGameObject(shopItem, "price/Text"):GetComponent("Text") @@ -662,7 +664,13 @@ function this:RechargeShopItemAdapter(shopItem, itemData) local curBuyCount = itemData.buyTimes first:SetActive(curBuyCount < 1) firstNum.text = itemInfo.FirstMultiple[1][2] - + if itemInfo.ContinuedMultiple and tonumber(itemInfo.ContinuedMultiple[1])~=nil then + xuChong:SetActive(curBuyCount>=1) + xuNum.text=itemInfo.ContinuedMultiple[2] + else + xuChong:SetActive(false) + end + -- 购买事件 Util.AddOnceClick(shopItem, function() PayManager.Pay(itemData.goodsId, function(id) diff --git a/Assets/ManagedResources/~Lua/View/UpView.lua b/Assets/ManagedResources/~Lua/View/UpView.lua index 21d349fdb3..9b8642ecf9 100644 --- a/Assets/ManagedResources/~Lua/View/UpView.lua +++ b/Assets/ManagedResources/~Lua/View/UpView.lua @@ -363,7 +363,7 @@ function UpView:RechargeType(_type) PopupTipPanel.ShowTip(Language[10422]) return end - JumpManager.GoJump(36008) + JumpManager.GoJump(36010) end elseif _type == UpViewRechargeType.YeQiuQuan then--跳限时商市 if UIManager.IsOpen(UIName.TenRecruitPanel) then