diff --git a/Assets/ManagedResources/Atlas/FuXingGaoZhao/r_fxgz_gauanbianniu.png b/Assets/ManagedResources/Atlas/FuXingGaoZhao/r_fxgz_gauanbianniu.png new file mode 100644 index 0000000000..98029094fb Binary files /dev/null and b/Assets/ManagedResources/Atlas/FuXingGaoZhao/r_fxgz_gauanbianniu.png differ diff --git a/Assets/ManagedResources/Atlas/FuXingGaoZhao/r_fxgz_gauanbianniu.png.meta b/Assets/ManagedResources/Atlas/FuXingGaoZhao/r_fxgz_gauanbianniu.png.meta new file mode 100644 index 0000000000..9cd9a9fd38 --- /dev/null +++ b/Assets/ManagedResources/Atlas/FuXingGaoZhao/r_fxgz_gauanbianniu.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: ae735a0fcf1a23042b5bdfe98adb68d0 +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: 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: 7203c66c0080f4e45a281810ea47be40 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: FuXingGaoZhao + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/FuXingGaoZhao/r_fxgz_mujia.png b/Assets/ManagedResources/Atlas/FuXingGaoZhao/r_fxgz_mujia.png new file mode 100644 index 0000000000..7e3f0fb599 Binary files /dev/null and b/Assets/ManagedResources/Atlas/FuXingGaoZhao/r_fxgz_mujia.png differ diff --git a/Assets/ManagedResources/Atlas/FuXingGaoZhao/r_fxgz_mujia.png.meta b/Assets/ManagedResources/Atlas/FuXingGaoZhao/r_fxgz_mujia.png.meta new file mode 100644 index 0000000000..214c0f073f --- /dev/null +++ b/Assets/ManagedResources/Atlas/FuXingGaoZhao/r_fxgz_mujia.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 6589d49a6d560754c8630163c9f5d018 +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: 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: 866a5ccff9569a5498cef77196d1f006 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: FuXingGaoZhao + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/FifteenDayGift/FifteenDayGiftPanel.prefab b/Assets/ManagedResources/Prefabs/UI/FifteenDayGift/FifteenDayGiftPanel.prefab index a2650139de..16a14477a8 100644 --- a/Assets/ManagedResources/Prefabs/UI/FifteenDayGift/FifteenDayGiftPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/FifteenDayGift/FifteenDayGiftPanel.prefab @@ -8193,7 +8193,7 @@ MonoBehaviour: initFloat: 0 isInit: 1 changeV3: {x: 0, y: 0, z: 0} - changeFloat: 1 + changeFloat: 0.7 duration: 1 delay: 0 curveType: 1 diff --git a/Assets/ManagedResources/Prefabs/UI/FuXingGaoZhao/FuXingGaoZhaoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/FuXingGaoZhao/FuXingGaoZhaoPanel.prefab index da84140f2b..78b63850e1 100644 --- a/Assets/ManagedResources/Prefabs/UI/FuXingGaoZhao/FuXingGaoZhaoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/FuXingGaoZhao/FuXingGaoZhaoPanel.prefab @@ -5294,19 +5294,19 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1333925602859226835} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -86.5} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 8236708395195346482} - {fileID: 7884176429201175402} - {fileID: 3745816118181519858} - {fileID: 8117553058189776102} - m_Father: {fileID: 2592001850472780297} + m_Father: {fileID: 1192602625946304208} 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: 0} + m_AnchoredPosition: {x: 0, y: 63} m_SizeDelta: {x: 1080, y: 1920} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4620770588226768647 @@ -10305,14 +10305,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 699031951179895194} - - {fileID: 8640507796650688639} - - {fileID: 4317001038267334191} - - {fileID: 2982825754318185032} - - {fileID: 75740560664453618} - - {fileID: 3735300593631283739} - - {fileID: 6166516440663295320} - - {fileID: 8117304347507422952} + - {fileID: 6201156418856193922} + - {fileID: 1192602625946304208} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -15239,16 +15233,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2784348283800886665} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -86.5} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 2592001850472780297} + m_Father: {fileID: 1192602625946304208} 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: 0, y: -900} + m_AnchoredPosition: {x: 0, y: -825} m_SizeDelta: {x: 160, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5609358027440368271 @@ -15272,7 +15266,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9568628, g: 0.86274517, b: 0.6117647, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -20368,18 +20362,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3461415511515366859} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -86.5} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 2739905982881107575} - m_Father: {fileID: 2592001850472780297} + m_Children: [] + m_Father: {fileID: 1192602625946304208} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 1032, y: 1513} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6562702879592835339 CanvasRenderer: @@ -20409,7 +20402,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: a7cad9c6049be62478c8c4b1370ebd52, type: 3} + m_Sprite: {fileID: 21300000, guid: 6589d49a6d560754c8630163c9f5d018, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -25299,6 +25292,110 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &3777170045904699537 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6201156418856193922} + - component: {fileID: 840305486792811855} + - component: {fileID: 8809104000321346367} + - component: {fileID: 2831380138747989906} + m_Layer: 5 + m_Name: mask + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6201156418856193922 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3777170045904699537} + 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: 2592001850472780297} + 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 &840305486792811855 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3777170045904699537} + m_CullTransparentMesh: 0 +--- !u!114 &8809104000321346367 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3777170045904699537} + 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: 0, g: 0, b: 0, a: 0.7058824} + 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: 0} + 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 &2831380138747989906 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3777170045904699537} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3} + m_Name: + m_EditorClassIdentifier: + tweenSequeue: + - initV3: {x: 0, y: 0, z: 0} + initFloat: 0 + isInit: 1 + changeV3: {x: 1, y: 1, z: 1} + changeFloat: 0.7 + duration: 0.3 + delay: 0 + curveType: 1 + changeType: 6 + sequeueType: 1 + loop: 0 + loopType: 0 + targetObj: {fileID: 6201156418856193922} + isPlayAudio: 1 + isHaveCloseBtn: 0 + isPlayOnOpen: 1 --- !u!1 &3820070998757264061 GameObject: m_ObjectHideFlags: 0 @@ -25374,80 +25471,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &3933958980527183940 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2739905982881107575} - - component: {fileID: 8944469023078306071} - - component: {fileID: 6903543366712727205} - m_Layer: 5 - m_Name: di - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2739905982881107575 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3933958980527183940} - 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: 699031951179895194} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 165} - m_SizeDelta: {x: 0, y: 330} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8944469023078306071 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3933958980527183940} - m_CullTransparentMesh: 0 ---- !u!114 &6903543366712727205 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3933958980527183940} - 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: ec57da0f47b6f5543838e74d07f7a738, 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 &4169383905514056058 GameObject: m_ObjectHideFlags: 0 @@ -25476,18 +25499,18 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4169383905514056058} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -86.5} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 2462850027227817144} - {fileID: 1195583498281145206} - m_Father: {fileID: 2592001850472780297} + m_Father: {fileID: 1192602625946304208} 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: -55.752563, y: -723} - m_SizeDelta: {x: 350, y: 128} + m_AnchoredPosition: {x: -55.752563, y: -648} + m_SizeDelta: {x: 359, y: 139} m_Pivot: {x: 0.34429798, y: 1.0000001} --- !u!222 &2448417778657596675 CanvasRenderer: @@ -25517,7 +25540,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: 2f8aa4834dad54c448d093eaa5d3302d, type: 3} + m_Sprite: {fileID: 21300000, guid: c767334521547484aa8fb6b50d13ae18, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -30679,6 +30702,79 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u7B2C\u4E00\u5929" LanguageIndex: 0 +--- !u!1 &4935982897222171731 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1192602625946304208} + - component: {fileID: 1561126556982506461} + m_Layer: 0 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1192602625946304208 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4935982897222171731} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 86.5} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 699031951179895194} + - {fileID: 8640507796650688639} + - {fileID: 4317001038267334191} + - {fileID: 2982825754318185032} + - {fileID: 75740560664453618} + - {fileID: 3735300593631283739} + - {fileID: 6166516440663295320} + - {fileID: 6084032262447248284} + m_Father: {fileID: 2592001850472780297} + 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!114 &1561126556982506461 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4935982897222171731} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3} + m_Name: + m_EditorClassIdentifier: + tweenSequeue: + - initV3: {x: 0, y: 0, z: 0} + initFloat: 0 + isInit: 1 + changeV3: {x: 1, y: 1, z: 1} + changeFloat: 1 + duration: 0.15 + delay: 0 + curveType: 1 + changeType: 4 + sequeueType: 1 + loop: 0 + loopType: 0 + targetObj: {fileID: 1192602625946304208} + isPlayAudio: 1 + isHaveCloseBtn: 0 + isPlayOnOpen: 1 --- !u!1 &4988448459177450199 GameObject: m_ObjectHideFlags: 0 @@ -35659,7 +35755,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.64705884, g: 0.27450982, b: 0.16078432, a: 1} + m_Color: {r: 0.227451, g: 0.14509805, b: 0.027450982, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -35715,7 +35811,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -5, y: -158} + m_AnchoredPosition: {x: -5, y: -312} m_SizeDelta: {x: 612, y: 210} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4609286631420479438 @@ -35932,7 +36028,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6426810063182007079} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -86.5} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4551724890407884371} @@ -35943,7 +36039,7 @@ RectTransform: - {fileID: 6620067469979587850} - {fileID: 8498435848882951301} - {fileID: 3158088164678658652} - m_Father: {fileID: 2592001850472780297} + m_Father: {fileID: 1192602625946304208} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -35978,7 +36074,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6644485313528970540} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -86.5} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 8020054320884601061} @@ -35988,12 +36084,12 @@ RectTransform: - {fileID: 8476440336634998172} - {fileID: 6059736030603862039} - {fileID: 2363736995563706436} - m_Father: {fileID: 2592001850472780297} + m_Father: {fileID: 1192602625946304208} 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: 0, y: -397} + m_AnchoredPosition: {x: 0, y: -334} m_SizeDelta: {x: 922, y: 640} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1697103852556535286 @@ -36211,143 +36307,6 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u7B2C\u4E00\u5929" LanguageIndex: 0 ---- !u!1 &6883479893982116457 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8117304347507422952} - - component: {fileID: 1246042112677248833} - - component: {fileID: 6774220395364302352} - - component: {fileID: 2363687299420046780} - - component: {fileID: 1922628979608855589} - m_Layer: 5 - m_Name: btnBack - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8117304347507422952 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6883479893982116457} - 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: 2592001850472780297} - m_RootOrder: 7 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 70, y: 90} - m_SizeDelta: {x: 140, y: 121} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1246042112677248833 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6883479893982116457} - m_CullTransparentMesh: 0 ---- !u!114 &6774220395364302352 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6883479893982116457} - 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: 3 - 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: 1922628979608855589} - m_OnClick: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null ---- !u!95 &2363687299420046780 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6883479893982116457} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!114 &1922628979608855589 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6883479893982116457} - 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: 2887ec8dbdcb57242a540f77f7cb5a72, 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 &7332196628881703313 GameObject: m_ObjectHideFlags: 0 @@ -36374,15 +36333,15 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7332196628881703313} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -86.5} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 2592001850472780297} + m_Father: {fileID: 1192602625946304208} 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: -1.2568359, y: -158} + m_AnchoredPosition: {x: -1.2568359, y: -89} m_SizeDelta: {x: 293, y: 63} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2713194774263229033 @@ -36810,6 +36769,143 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u7B2C\u4E00\u5929" LanguageIndex: 0 +--- !u!1 &8375306687272875772 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6084032262447248284} + - component: {fileID: 85837043548360474} + - component: {fileID: 4292477052217890335} + - component: {fileID: 7629764018469515786} + - component: {fileID: 7800868786912851245} + m_Layer: 5 + m_Name: btnBack + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6084032262447248284 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8375306687272875772} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -86.5} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1192602625946304208} + m_RootOrder: 7 + 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: 393, y: 655} + m_SizeDelta: {x: 154, y: 118} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &85837043548360474 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8375306687272875772} + m_CullTransparentMesh: 0 +--- !u!114 &4292477052217890335 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8375306687272875772} + 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: ae735a0fcf1a23042b5bdfe98adb68d0, 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 &7629764018469515786 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8375306687272875772} + 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: 3 + 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: 4292477052217890335} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!95 &7800868786912851245 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8375306687272875772} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &8390640889034727092 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/FifteenDayGift/FifteenDayGiftPanel.lua b/Assets/ManagedResources/~Lua/Modules/FifteenDayGift/FifteenDayGiftPanel.lua index accad01dff..b7ae78c311 100644 --- a/Assets/ManagedResources/~Lua/Modules/FifteenDayGift/FifteenDayGiftPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/FifteenDayGift/FifteenDayGiftPanel.lua @@ -108,6 +108,9 @@ function FifteenDayGift:OnShow() end function FifteenDayGift:Refresh() + if UIManager.IsOpen(UIName.FightAreaRewardFullPopup) then + UIManager.ClosePanel(UIName.FightAreaRewardFullPopup) + end Data = FifteenDayGiftManager.GetData() CheckRedPointStatus(RedPointType.FifteenDayGift_1) if self.timer then @@ -149,9 +152,9 @@ function FifteenDayGift:SetSingleReward(sData,go,index) front:GetComponent("RectTransform").rotation = sData.State == 0 and angle[1] or angle[2] back:GetComponent("RectTransform").rotation = sData.State == 1 and angle[1] or angle[2] --判断哪些可领取,插入表 - LogPurple("sData.Progress:"..tostring(sData.Progress).." sData.State:"..tostring(sData.State)) + -- LogPurple("sData.Progress:"..tostring(sData.Progress).." sData.State:"..tostring(sData.State)) if sData.Progress <= curTime and sData.State == 0 then - LogPink("index:"..tostring(index)) + -- LogPink("index:"..tostring(index)) table.insert(frontList,front) table.insert(backList,back) red:SetActive(true) diff --git a/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua b/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua index 686c20f583..deaac9a114 100644 --- a/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua @@ -10,12 +10,12 @@ local func local timeData = string.split(ConfigManager.GetConfigDataByKey(ConfigName.SpecialConfig,"Id",109).Value,"#") --初始化组件(用于子类重写) function FuXingGaoZhao:InitComponent() - self.backBtn = Util.GetGameObject(self.gameObject,"btnBack") - self.effect = Util.GetGameObject(self.gameObject,"UI_effect_LuckyCatPanel_normal") - self.time = Util.GetGameObject(self.gameObject,"Time"):GetComponent("Text") - self.getBtn = Util.GetGameObject(self.gameObject,"getBtn") + self.backBtn = Util.GetGameObject(self.gameObject,"Content/btnBack") + self.effect = Util.GetGameObject(self.gameObject,"Content/UI_effect_LuckyCatPanel_normal") + self.time = Util.GetGameObject(self.gameObject,"Content/Time"):GetComponent("Text") + self.getBtn = Util.GetGameObject(self.gameObject,"Content/getBtn") FuXingGaoZhaoManager.InitRewardData() - self.mid = Util.GetGameObject(self.gameObject,"mid") + self.mid = Util.GetGameObject(self.gameObject,"Content/mid") if #rewardList == 0 then for i = 1, self.mid.transform.childCount do table.insert(rewardList,self.mid.transform:GetChild(i-1))