diff --git a/Assets/AddressableAssetsData/AssetGroups/HomeUIRes.asset b/Assets/AddressableAssetsData/AssetGroups/HomeUIRes.asset index da6909eac..7d32e432a 100644 --- a/Assets/AddressableAssetsData/AssetGroups/HomeUIRes.asset +++ b/Assets/AddressableAssetsData/AssetGroups/HomeUIRes.asset @@ -59,6 +59,12 @@ MonoBehaviour: m_SerializedLabels: - MainUI FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 7632b2940005e1e4ea0f2e053bb1a9dc + m_Address: Assets/MyGame/aa/UI/Home/Sub/Hl_Act_RebateView Variant.prefab + m_ReadOnly: 0 + m_SerializedLabels: + - MainUI + FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 8da2f97ccd96f8044b1c634d075e27f7 m_Address: Assets/MyGame/aa/UI/Home/Sub/EmailPanel.prefab m_ReadOnly: 0 diff --git a/Assets/Art/FengLei/ResLY/Texture/dt_act_rebate.png b/Assets/Art/FengLei/ResLY/Texture/dt_act_rebate.png new file mode 100644 index 000000000..046c07e78 Binary files /dev/null and b/Assets/Art/FengLei/ResLY/Texture/dt_act_rebate.png differ diff --git a/Assets/Art/FengLei/ResLY/Texture/dt_act_rebate.png.meta b/Assets/Art/FengLei/ResLY/Texture/dt_act_rebate.png.meta new file mode 100644 index 000000000..f43bce5f7 --- /dev/null +++ b/Assets/Art/FengLei/ResLY/Texture/dt_act_rebate.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: ac878198c8ae47e4382d0b314d3e8cdd +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + 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 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/FengLei/ResLY/Texture/击鼓回礼.png b/Assets/Art/FengLei/ResLY/Texture/击鼓回礼.png new file mode 100644 index 000000000..4c213e4d1 Binary files /dev/null and b/Assets/Art/FengLei/ResLY/Texture/击鼓回礼.png differ diff --git a/Assets/Art/FengLei/ResLY/Texture/击鼓回礼.png.meta b/Assets/Art/FengLei/ResLY/Texture/击鼓回礼.png.meta new file mode 100644 index 000000000..d016be7e2 --- /dev/null +++ b/Assets/Art/FengLei/ResLY/Texture/击鼓回礼.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: f53ba0b289a9d1b4c954b43ec3dc1b4f +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + 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 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/XJMH/hall/hallprefab/active/Hl_Act_RebateView.prefab b/Assets/Art/XJMH/hall/hallprefab/active/Hl_Act_RebateView.prefab index c8f15a64e..23c9dd2ca 100644 --- a/Assets/Art/XJMH/hall/hallprefab/active/Hl_Act_RebateView.prefab +++ b/Assets/Art/XJMH/hall/hallprefab/active/Hl_Act_RebateView.prefab @@ -2575,7 +2575,7 @@ ParticleSystemRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1059526000286091} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 @@ -3625,7 +3625,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 224436722206005839} - - component: {fileID: 223991820794942784} - component: {fileID: 5176222625305695662} m_Layer: 0 m_Name: Hl_Act_RebateView @@ -3646,8 +3645,9 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 224384522050117679} - {fileID: 224461570636962937} + - {fileID: 224384522050117679} + - {fileID: 632593848998226032} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0} m_AnchorMin: {x: 0, y: 0} @@ -3655,29 +3655,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!223 &223991820794942784 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1373534084433915} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 2 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 1 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 0 - m_AdditionalShaderChannelsFlag: 25 - m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: -1356241285 - m_SortingOrder: 0 - m_TargetDisplay: 0 --- !u!222 &5176222625305695662 CanvasRenderer: m_ObjectHideFlags: 0 @@ -6142,7 +6119,7 @@ ParticleSystemRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1479513806937601} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 @@ -8486,7 +8463,7 @@ ParticleSystemRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1484316984629213} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 @@ -10906,7 +10883,7 @@ ParticleSystemRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1498589306494239} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 @@ -13100,3 +13077,87 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7820533411337758100 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 632593848998226032} + - component: {fileID: 2660230253340276894} + - component: {fileID: 1480270133845062225} + m_Layer: 0 + m_Name: UIParticle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &632593848998226032 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7820533411337758100} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 224436722206005839} + 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: 50, y: 50} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2660230253340276894 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7820533411337758100} + m_CullTransparentMesh: 1 +--- !u!114 &1480270133845062225 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7820533411337758100} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 16f0b0b6d0b7542bfbd20a3e05b04ff1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_IsTrail: 0 + m_IgnoreCanvasScaler: 0 + m_AbsoluteMode: 0 + m_Scale3D: {x: 10, y: 10, z: 10} + m_AnimatableProperties: [] + m_Particles: + - {fileID: 198664901533941607} + - {fileID: 198197980897019859} + - {fileID: 198144309666991439} + - {fileID: 198571472734578461} + m_MeshSharing: 0 + m_GroupId: 0 + m_GroupMaxId: 0 + m_PositionMode: 0 + m_AutoScaling: 0 + m_AutoScalingMode: 2 + m_UseCustomView: 0 + m_CustomViewSize: 10 + m_TimeScaleMultiplier: 1 diff --git a/Assets/Framework/Tool/UITool/UIManager.cs b/Assets/Framework/Tool/UITool/UIManager.cs index efac60991..772a8f513 100644 --- a/Assets/Framework/Tool/UITool/UIManager.cs +++ b/Assets/Framework/Tool/UITool/UIManager.cs @@ -41,6 +41,7 @@ public enum UIPanel VIPPenel = 151, JJJPenel = 152, ActivityPenel = 153, + JiGuHuiLi=154, MonthCardPanel = 161, BackPackPanel = 162, diff --git a/Assets/MyGame/Scenes/UIScene.unity b/Assets/MyGame/Scenes/UIScene.unity index 48284e6af..bffc618bb 100644 --- a/Assets/MyGame/Scenes/UIScene.unity +++ b/Assets/MyGame/Scenes/UIScene.unity @@ -7009,6 +7009,8 @@ MonoBehaviour: userMaxDraw: 0 rankingRewardConfig: isEnabled: 0 + isMaintaining: 0 + maintainingMessage: groups: [] user: BaseInfo: diff --git a/Assets/MyGame/Scripts/Net/APIRequestList_Supplement.cs b/Assets/MyGame/Scripts/Net/APIRequestList_Supplement.cs index 59aca8793..99bca2816 100644 --- a/Assets/MyGame/Scripts/Net/APIRequestList_Supplement.cs +++ b/Assets/MyGame/Scripts/Net/APIRequestList_Supplement.cs @@ -1,4 +1,5 @@ using Assets.MyGame.Scripts.Net.API; +using Assets.MyGame.Scripts.Net.API.GameConfig_SubClass; using Assets.MyGame.Scripts.Net.APIRequest.Params; using Assets.MyGame.Scripts.Net.APIResponses; using System; @@ -8,7 +9,7 @@ namespace Assets.MyGame.Scripts.Net { /// /// 补充请求方法：以下接口暂未接入业务，仅注册调用入口。 - /// 字段类型为推测，接入业务前请按后端实际返回再调整。 + /// 响应类型已按 2026-09-02 后端 swagger（/swagger/v1/swagger.json）校对同步。 /// public static partial class APIRequestList { @@ -39,31 +40,31 @@ namespace Assets.MyGame.Scripts.Net } /// 获取捕鱼返利信息（GET /api/User/GetFishingReturnInfo） - public static void GetFishingReturnInfo(Action callback) + public static void GetFishingReturnInfo(Action callback) { - APIManager.Response(APIType.User_GetFishingReturnInfo, callback); + APIManager.Response(APIType.User_GetFishingReturnInfo, callback); } /// 领取捕鱼返利金币（GET /api/User/ClaimFishingReturn） - public static void ClaimFishingReturn(Action callback) + public static void ClaimFishingReturn(Action callback) { - APIManager.Response(APIType.User_ClaimFishingReturn, callback); + APIManager.Response(APIType.User_ClaimFishingReturn, callback); } // ---------------- ActivityConfig ---------------- /// 奖池抽奖活动配置（GET /api/ActivityConfig/lotteryConfig） - public static void GetLotteryActivityConfig(Action callback) + public static void GetLotteryActivityConfig(Action callback) { - APIManager.Response(APIType.ActivityConfig_LotteryConfig, callback); + APIManager.Response(APIType.ActivityConfig_LotteryConfig, callback); } // ---------------- Lottery ---------------- /// 抽奖配置（GET /api/Lottery/Config） - public static void GetLotteryConfig(Action callback) + public static void GetLotteryConfig(Action callback) { - APIManager.Response(APIType.Lottery_Config, callback); + APIManager.Response(APIType.Lottery_Config, callback); } /// 抽奖（GET /api/Lottery/Draw） @@ -73,37 +74,37 @@ namespace Assets.MyGame.Scripts.Net } /// 用户抽奖状态（GET /api/Lottery/UserStatus） - public static void GetLotteryUserStatus(Action callback) + public static void GetLotteryUserStatus(Action callback) { - APIManager.Response(APIType.Lottery_UserStatus, callback); + APIManager.Response(APIType.Lottery_UserStatus, callback); } - /// 已抽奖项（GET /api/Lottery/DrawnPrizes） - public static void GetLotteryDrawnPrizes(Action> callback) + /// 已抽奖项ID列表（GET /api/Lottery/DrawnPrizes） + public static void GetLotteryDrawnPrizes(Action> callback) { - APIManager.Response>(APIType.Lottery_DrawnPrizes, callback); + APIManager.Response>(APIType.Lottery_DrawnPrizes, callback); } // ---------------- SummonCard ---------------- - /// 使用召唤卡（GET /api/SummonCard/use） - public static void UseSummonCard(SummonCardUseParam req, Action callback) + /// 使用召唤卡（GET /api/SummonCard/use，返回字符串消息） + public static void UseSummonCard(SummonCardUseParam req, Action callback) { - APIManager.Response(APIType.SummonCard_Use, req, callback); + APIManager.Response(APIType.SummonCard_Use, req, callback); } // ---------------- Dict ---------------- /// 字典单条查询（GET /api/Dict/GetByCode） - public static void GetDictByCode(DictGetByCodeParam req, Action callback) + public static void GetDictByCode(DictGetByCodeParam req, Action callback) { - APIManager.Response(APIType.Dict_GetByCode, req, callback); + APIManager.Response(APIType.Dict_GetByCode, req, callback); } /// 字典列表查询（GET /api/Dict/GetListByCode） - public static void GetDictListByCode(DictGetListByCodeParam req, Action> callback) + public static void GetDictListByCode(DictGetListByCodeParam req, Action> callback) { - APIManager.Response>(APIType.Dict_GetListByCode, req, callback); + APIManager.Response>(APIType.Dict_GetListByCode, req, callback); } // ---------------- Hall ---------------- diff --git a/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/LotteryActivityConfig.cs b/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/LotteryActivityConfig.cs index 0bf283cdd..07d66dfd5 100644 --- a/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/LotteryActivityConfig.cs +++ b/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/LotteryActivityConfig.cs @@ -27,10 +27,25 @@ namespace Assets.MyGame.Scripts.Net.API.GameConfig_SubClass [Serializable] public class LotteryPrize { - public string type; - public long count; + /// 奖项唯一标识ID（如"A001"、"B002"，用于唯一性控制：同一用户不能重复抽中） + public string prizeId; + /// 奖项名称（用于前端展示） public string name; + /// 奖项图标地址 public string icon; + /// 奖励类型 1=金币，2=钻石，3=道具，4=道具碎片 + public int type; + /// 奖励数量 + public long count; + /// 道具/碎片编号（type=3或4时使用） + public string otherId; + /// 道具详情 + public BaseProduct product; + /// 在该等级内的抽中奖权重 public int weight; + /// 该奖项总库存数量（全局，0=无限库存） + public int totalCount; + /// 已抽中数量（运行时统计，用于判断库存是否充足） + public int drawnCount; } } diff --git a/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/RankingRewardConfig.cs b/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/RankingRewardConfig.cs index fe300cd24..7809a38fd 100644 --- a/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/RankingRewardConfig.cs +++ b/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/RankingRewardConfig.cs @@ -13,6 +13,10 @@ namespace Assets.MyGame.Scripts.Net.API { /// 总开关 public bool isEnabled; + /// 排行榜维护中开关，开启后前端请求排行榜会提示维护中 + public bool isMaintaining; + /// 维护中提示文案 + public string maintainingMessage; /// 排行榜奖励分组列表 public List groups; } diff --git a/Assets/MyGame/Scripts/Net/APIResponses/SupplementResponses.cs b/Assets/MyGame/Scripts/Net/APIResponses/SupplementResponses.cs index 03d8e9fbd..a75ab9c48 100644 --- a/Assets/MyGame/Scripts/Net/APIResponses/SupplementResponses.cs +++ b/Assets/MyGame/Scripts/Net/APIResponses/SupplementResponses.cs @@ -1,3 +1,5 @@ +using Assets.MyGame.Scripts.Net.API.GameConfig_SubClass; +using Assets.MyGame.Scripts.Net.API.UserData_SubClass; using System; using System.Collections.Generic; @@ -6,7 +8,7 @@ namespace Assets.MyGame.Scripts.Net.APIResponses // ============================================================ // 补充响应类：以下接口暂未接入业务，但已注册到 APIManager， // 方便后续快速接入。按 swagger 路径分组放置。 - // 字段类型为推测，接入业务前请按后端实际返回再调整。 + // 字段已按 2026-09-02 后端 swagger（/swagger/v1/swagger.json）校对同步。 // ============================================================ // ---------------- /api/User/GetUserAssets ---------------- @@ -14,63 +16,35 @@ namespace Assets.MyGame.Scripts.Net.APIResponses [Serializable] public class UserAssetsResponse { - public string userId; public long gold; public int diamond; - public long safeBoxGold; - public int level; - public long exp; - public int vipLevel; - public List props; + public List props; } // ---------------- /api/User/GetFishingReturnInfo ---------------- /// 捕鱼返利信息 [Serializable] - public class FishingReturnInfoResponse + public class FishingReturnDto { - /// 待领取返利金币 - public long pendingGold; - /// 累计返利金币 - public long totalGold; - /// 上次结算时间 - public long lastSettleTime; - /// 是否可领取 - public bool canClaim; + /// 今日捕鱼消耗金币 + public long todayConsume; + /// 昨日捕鱼消耗金币 + public long yesterdayConsume; + /// 是否已领取昨日返利 + public bool isClaimed; + /// 可领取的金币数量 + public long canClaimGold; } // ---------------- /api/User/ClaimFishingReturn ---------------- /// 领取捕鱼返利响应 [Serializable] - public class ClaimFishingReturnResponse + public class ClaimFishingReturnDto { - /// 本次领取金币 - public long claimedGold; - /// 领取时间 - public long claimTime; - } - - // ---------------- /api/ActivityConfig/lotteryConfig & /api/Lottery/Config ---------------- - /// 抽奖活动配置 - [Serializable] - public class LotteryConfigResponse - { - public int lotteryId; - public string name; - public long startTime; - public long endTime; - public List prizes; - } - - [Serializable] - public class LotteryPrizeInfo - { - public int prizeId; - public string prizeName; - public int prizeType; // 1=金币 2=钻石 3=道具 - public int count; - public int weight; // 权重 - public string icon; + /// 领取的金币数量 + public long gold; + /// 结果消息 + public string message; } // ---------------- /api/Lottery/Draw ---------------- @@ -78,65 +52,95 @@ namespace Assets.MyGame.Scripts.Net.APIResponses [Serializable] public class LotteryDrawResponse { - public int prizeId; - public string prizeName; - public int prizeType; - public int count; - public long drawTime; + /// 奖品Id + public string prizeId; + /// 奖品名称 + public string name; + /// 奖品类型 1=金币 2=钻石 3=道具 + public int type; + /// 数量 + public long count; + /// 关联Id + public string otherId; + /// 消耗 + public long cost; } // ---------------- /api/Lottery/UserStatus ---------------- - /// 用户抽奖状态 + /// 用户抽奖状态实体 [Serializable] - public class LotteryUserStatusResponse + public class LotteryUserStatus { - public int lotteryId; - public int freeCount; // 剩余免费次数 - public int paidCount; // 剩余付费次数 - public long lastDrawTime; - } - - // ---------------- /api/Lottery/DrawnPrizes ---------------- - /// 已抽奖项记录 - [Serializable] - public class LotteryDrawnPrizeItem - { - public int prizeId; - public string prizeName; - public int prizeType; - public int count; - public long drawTime; + public string id; + public bool isDelete; + public OptionUserInfo createInfo; + /// 用户ID（每个用户一条状态记录） + public string userId; + /// 用户已抽中的奖项ID列表（唯一性控制） + public List drawnPrizeIds; + /// 用户总抽奖次数 + public int totalDrawCount; + /// 用户活动是否结束（已抽完所有奖项） + public bool isFinished; } // ---------------- /api/SummonCard/use ---------------- - /// 使用召唤卡响应 - [Serializable] - public class SummonCardUseResponse - { - public bool success; - public string message; - public List drops; // 掉落道具列表 - } + // 返回 StringBaseResponse（纯字符串），无需独立响应类。 - // ---------------- /api/Dict/GetByCode ---------------- - /// 字典单条 + // ---------------- /api/Dict/GetByCode、GetListByCode ---------------- + /// 字典实体 [Serializable] - public class DictItem + public class SystemDic { - public string code; + public string id; + public bool isDelete; + public OptionUserInfo createInfo; + public string parentId; public string name; + public int order; + public string icon; public string value; + public string code; public string remark; + public string remark1; } // ---------------- /api/Hall/GetBattleOrderLevelStatus ---------------- - /// 战令各等级奖励领取状态 + /// 战令各等级奖励领取状态响应 [Serializable] public class BattleOrderLevelStatusResponse { + /// 当前等级 public int currentLevel; - public List normalReceivedLevels; // 普通奖励已领取等级 - public List luxuryReceivedLevels; // 豪华奖励已领取等级 - public List supremeReceivedLevels; // 至尊奖励已领取等级 + /// 当前经验 + public long currentExp; + /// 是否已购买豪华版 + public bool isLuxury; + /// 是否已购买至尊版 + public bool isSupreme; + /// 各等级领取状态列表 + public List levelStatusList; + } + + /// 单个战令等级领取状态 + [Serializable] + public class BattleOrderLevelStatus + { + /// 等级 + public int level; + /// 升级所需经验 + public long exp; + /// 普通奖励状态 1=不满足 2=未领取 3=已领取 + public int normalStatus; + /// 普通奖励列表 + public List normalGiftList; + /// 豪华奖励状态 0=未购买 1=不满足 2=未领取 3=已领取 + public int luxuryStatus; + /// 豪华奖励列表 + public List luxuryGiftList; + /// 至尊奖励状态 0=未购买 1=不满足 2=未领取 3=已领取 + public int supremeStatus; + /// 至尊奖励列表 + public List supremeGiftList; } } diff --git a/Assets/MyGame/aa/UI/Home/MainPanel.prefab b/Assets/MyGame/aa/UI/Home/MainPanel.prefab index dc9ae945f..d9961548c 100644 --- a/Assets/MyGame/aa/UI/Home/MainPanel.prefab +++ b/Assets/MyGame/aa/UI/Home/MainPanel.prefab @@ -1036,6 +1036,81 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &670153160503991223 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 11223694950714690} + - component: {fileID: 8168477535803785525} + - component: {fileID: 7760243687359630445} + m_Layer: 0 + m_Name: -h-vip (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &11223694950714690 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 670153160503991223} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.820125, y: 0.820125, z: 0.820125} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 10590606596356465} + 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_SizeDelta: {x: 102, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8168477535803785525 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 670153160503991223} + m_CullTransparentMesh: 1 +--- !u!114 &7760243687359630445 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 670153160503991223} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: ac878198c8ae47e4382d0b314d3e8cdd, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &745742519290695972 GameObject: m_ObjectHideFlags: 0 @@ -1492,6 +1567,7 @@ RectTransform: m_Children: - {fileID: 1966558116143631329} - {fileID: 4653724501418068477} + - {fileID: 10590606596356465} m_Father: {fileID: 1168244435367184264} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} @@ -3115,6 +3191,7 @@ MonoBehaviour: btn_VIP: {fileID: 8541196967996867916} btn_JJJ: {fileID: 1816541001779962754} btn_Activity: {fileID: 5755752145888582303} + btn_JGHL: {fileID: 7384288748678883603} btn_Turret: {fileID: 2556317451469856225} btn_Wing: {fileID: 1749647457923232867} btn_ZS: {fileID: 8965837012233099418} @@ -4159,6 +4236,81 @@ MonoBehaviour: y: 0 width: 1 height: 1 +--- !u!1 &3071065595143525188 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6720835598669085361} + - component: {fileID: 745209779296753765} + - component: {fileID: 7364064596627831358} + m_Layer: 0 + m_Name: Image (4) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6720835598669085361 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3071065595143525188} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.42135042, y: 0.42135042, z: 0.42135042} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 10590606596356465} + 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: -29.9} + m_SizeDelta: {x: 216, y: 77} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &745209779296753765 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3071065595143525188} + m_CullTransparentMesh: 1 +--- !u!114 &7364064596627831358 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3071065595143525188} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: f53ba0b289a9d1b4c954b43ec3dc1b4f, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &3083776924760764887 GameObject: m_ObjectHideFlags: 0 @@ -5506,6 +5658,140 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!1 &3485380416958611026 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4601197123417797973} + - component: {fileID: 1603121679807044375} + - component: {fileID: 8823665339053756838} + m_Layer: 0 + m_Name: font (5) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &4601197123417797973 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3485380416958611026} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 10590606596356465} + 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: 0, y: 0} + m_SizeDelta: {x: 195.61664, y: 37} + m_Pivot: {x: 0.5, y: 0} +--- !u!222 &1603121679807044375 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3485380416958611026} + m_CullTransparentMesh: 1 +--- !u!114 &8823665339053756838 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3485380416958611026} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\u6551\u6D4E\u91D1" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 7cb7af7685a457443a295fdaa17beeea, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: ca0125a88aeeced47b30b03e3514a974, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 0 + m_fontColorGradient: + topLeft: {r: 1, g: 0.48584908, b: 0.48584908, a: 1} + topRight: {r: 1, g: 0.48584908, b: 0.48584908, a: 1} + bottomLeft: {r: 1, g: 0.48584908, b: 0.48584908, a: 1} + bottomRight: {r: 1, g: 0.48584908, b: 0.48584908, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 25.6 + m_fontSizeBase: 25.6 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 61.29794, y: 0, z: 53.430824, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &3493100069030655041 GameObject: m_ObjectHideFlags: 0 @@ -10664,6 +10950,129 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7553818541019409269 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 10590606596356465} + - component: {fileID: 888923850308548212} + - component: {fileID: 1660487158326945252} + - component: {fileID: 7384288748678883603} + m_Layer: 0 + m_Name: "-h-\u6551\u6D4E\u91D1 (1)" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &10590606596356465 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7553818541019409269} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 11223694950714690} + - {fileID: 4601197123417797973} + - {fileID: 6720835598669085361} + m_Father: {fileID: 2564644207036948081} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 96, y: 99} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &888923850308548212 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7553818541019409269} + m_CullTransparentMesh: 1 +--- !u!114 &1660487158326945252 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7553818541019409269} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 6caf440b00171b14282f4e572758266d, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &7384288748678883603 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7553818541019409269} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + 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_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1660487158326945252} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &7657864743914521669 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/MyGame/aa/UI/Home/Sub/Hl_Act_RebateView Variant.prefab b/Assets/MyGame/aa/UI/Home/Sub/Hl_Act_RebateView Variant.prefab new file mode 100644 index 000000000..ea0fe9506 --- /dev/null +++ b/Assets/MyGame/aa/UI/Home/Sub/Hl_Act_RebateView Variant.prefab @@ -0,0 +1,432 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &5840757721197820902 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1171827350472897, guid: 0da1041621426bf49ba2962c8b84b077, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1373534084433915, guid: 0da1041621426bf49ba2962c8b84b077, type: 3} + propertyPath: m_Name + value: Hl_Act_RebateView Variant + objectReference: {fileID: 0} + - target: {fileID: 1979796387035122, guid: 0da1041621426bf49ba2962c8b84b077, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4172125867196306, guid: 0da1041621426bf49ba2962c8b84b077, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4172125867196306, guid: 0da1041621426bf49ba2962c8b84b077, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4172125867196306, guid: 0da1041621426bf49ba2962c8b84b077, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4172125867196306, guid: 0da1041621426bf49ba2962c8b84b077, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4219696953566162, guid: 0da1041621426bf49ba2962c8b84b077, type: 3} + propertyPath: m_LocalScale.x + value: 7.6244926 + objectReference: {fileID: 0} + - target: {fileID: 4219696953566162, guid: 0da1041621426bf49ba2962c8b84b077, type: 3} + propertyPath: m_LocalScale.y + value: 7.6244926 + objectReference: {fileID: 0} + - target: {fileID: 4219696953566162, guid: 0da1041621426bf49ba2962c8b84b077, type: 3} + propertyPath: m_LocalScale.z + value: 7.6244926 + objectReference: {fileID: 0} + - target: {fileID: 4425791881096046, guid: 0da1041621426bf49ba2962c8b84b077, type: 3} + propertyPath: m_LocalScale.x + value: 6.2094626 + objectReference: {fileID: 0} + - target: {fileID: 4425791881096046, guid: 0da1041621426bf49ba2962c8b84b077, type: 3} + propertyPath: m_LocalScale.y + value: 6.2094626 + objectReference: {fileID: 0} + - target: {fileID: 4425791881096046, guid: 0da1041621426bf49ba2962c8b84b077, type: 3} + propertyPath: m_LocalScale.z + value: 6.2094626 + objectReference: {fileID: 0} + - target: {fileID: 4508635453910174, guid: 0da1041621426bf49ba2962c8b84b077, type: 3} + propertyPath: m_LocalScale.x + value: 4.374727 + objectReference: {fileID: 0} + - target: {fileID: 4508635453910174, guid: 0da1041621426bf49ba2962c8b84b077, type: 3} + propertyPath: m_LocalScale.y + value: 4.374727 + objectReference: {fileID: 0} + - target: {fileID: 4508635453910174, guid: 0da1041621426bf49ba2962c8b84b077, type: 3} + propertyPath: m_LocalScale.z + value: 4.374727 + objectReference: {fileID: 0} + - target: {fileID: 4917139363289093, guid: 0da1041621426bf49ba2962c8b84b077, type: 3} + propertyPath: m_LocalScale.x + value: 7.6244926 + objectReference: {fileID: 0} + - target: {fileID: 4917139363289093, guid: 0da1041621426bf49ba2962c8b84b077, type: 3} + propertyPath: m_LocalScale.y + value: 7.6244926 + objectReference: {fileID: 0} + - target: {fileID: 4917139363289093, guid: 0da1041621426bf49ba2962c8b84b077, type: 3} + propertyPath: m_LocalScale.z + value: 7.6244926 + objectReference: {fileID: 0} + - target: {fileID: 224436722206005839, guid: 0da1041621426bf49ba2962c8b84b077, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 224436722206005839, guid: 0da1041621426bf49ba2962c8b84b077, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 224436722206005839, guid: 0da1041621426bf49ba2962c8b84b077, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 224436722206005839, guid: 0da1041621426bf49ba2962c8b84b077, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 224436722206005839, guid: 0da1041621426bf49ba2962c8b84b077, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 224436722206005839, guid: 0da1041621426bf49ba2962c8b84b077, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 224436722206005839, guid: 0da1041621426bf49ba2962c8b84b077, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224436722206005839, guid: 0da1041621426bf49ba2962c8b84b077, + type: 3} + propertyPath: m_SizeDelta.y + value: 750 + objectReference: {fileID: 0} + - target: {fileID: 224436722206005839, guid: 0da1041621426bf49ba2962c8b84b077, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224436722206005839, guid: 0da1041621426bf49ba2962c8b84b077, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224436722206005839, guid: 0da1041621426bf49ba2962c8b84b077, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224436722206005839, guid: 0da1041621426bf49ba2962c8b84b077, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224436722206005839, guid: 0da1041621426bf49ba2962c8b84b077, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 224436722206005839, guid: 0da1041621426bf49ba2962c8b84b077, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 224436722206005839, guid: 0da1041621426bf49ba2962c8b84b077, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 224436722206005839, guid: 0da1041621426bf49ba2962c8b84b077, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224436722206005839, guid: 0da1041621426bf49ba2962c8b84b077, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224436722206005839, guid: 0da1041621426bf49ba2962c8b84b077, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224436722206005839, guid: 0da1041621426bf49ba2962c8b84b077, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 224436722206005839, guid: 0da1041621426bf49ba2962c8b84b077, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 224780292954537064, guid: 0da1041621426bf49ba2962c8b84b077, + type: 3} + propertyPath: m_LocalScale.x + value: 1.6718 + objectReference: {fileID: 0} + - target: {fileID: 224780292954537064, guid: 0da1041621426bf49ba2962c8b84b077, + type: 3} + propertyPath: m_LocalScale.y + value: 1.6718 + objectReference: {fileID: 0} + - target: {fileID: 224780292954537064, guid: 0da1041621426bf49ba2962c8b84b077, + type: 3} + propertyPath: m_LocalScale.z + value: 1.6718 + objectReference: {fileID: 0} + - target: {fileID: 224780292954537064, guid: 0da1041621426bf49ba2962c8b84b077, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 442 + objectReference: {fileID: 0} + - target: {fileID: 224780292954537064, guid: 0da1041621426bf49ba2962c8b84b077, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 163 + objectReference: {fileID: 0} + - target: {fileID: 632593848998226032, guid: 0da1041621426bf49ba2962c8b84b077, + type: 3} + propertyPath: m_LocalScale.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 632593848998226032, guid: 0da1041621426bf49ba2962c8b84b077, + type: 3} + propertyPath: m_LocalScale.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 632593848998226032, guid: 0da1041621426bf49ba2962c8b84b077, + type: 3} + propertyPath: m_LocalScale.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6963081131879555479, guid: 0da1041621426bf49ba2962c8b84b077, + type: 3} + propertyPath: m_Text + value: "\u6BCF\u65E5\u8FD4\u8FD8\u4E0A\u9650" + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1373534084433915, guid: 0da1041621426bf49ba2962c8b84b077, + type: 3} + insertIndex: -1 + addedObject: {fileID: 4809508525869610458} + - targetCorrespondingSourceObject: {fileID: 1622789786840728, guid: 0da1041621426bf49ba2962c8b84b077, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2249343523781759287} + - targetCorrespondingSourceObject: {fileID: 1657601269235107, guid: 0da1041621426bf49ba2962c8b84b077, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2964314431365277092} + m_SourcePrefab: {fileID: 100100000, guid: 0da1041621426bf49ba2962c8b84b077, type: 3} +--- !u!114 &511654298408630191 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6203507190300347465, guid: 0da1041621426bf49ba2962c8b84b077, + type: 3} + m_PrefabInstance: {fileID: 5840757721197820902} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &2714278672185799615 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8405269560752605273, guid: 0da1041621426bf49ba2962c8b84b077, + type: 3} + m_PrefabInstance: {fileID: 5840757721197820902} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5839877511987152453} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &3527558958553297255 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7060203982182763137, guid: 0da1041621426bf49ba2962c8b84b077, + type: 3} + m_PrefabInstance: {fileID: 5840757721197820902} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &3580185052173720177 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6963081131879555479, guid: 0da1041621426bf49ba2962c8b84b077, + type: 3} + m_PrefabInstance: {fileID: 5840757721197820902} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &5839597563777203229 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1373534084433915, guid: 0da1041621426bf49ba2962c8b84b077, + type: 3} + m_PrefabInstance: {fileID: 5840757721197820902} + m_PrefabAsset: {fileID: 0} +--- !u!114 &4809508525869610458 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5839597563777203229} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d12a6faee939b8e48bbd7055d320572a, type: 3} + m_Name: + m_EditorClassIdentifier: + btn_Close: {fileID: 2249343523781759287} + uIEffect: 1 + txt_MaxCoin: {fileID: 3580185052173720177} + txt_currCoin: {fileID: 7221249598255347506} + txt_currCoinNum: {fileID: 3527558958553297255} + btn_Award: {fileID: 2964314431365277092} +--- !u!1 &5839842536425231742 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1622789786840728, guid: 0da1041621426bf49ba2962c8b84b077, + type: 3} + m_PrefabInstance: {fileID: 5840757721197820902} + m_PrefabAsset: {fileID: 0} +--- !u!114 &2249343523781759287 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5839842536425231742} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + 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_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 511654298408630191} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &5839877511987152453 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1657601269235107, guid: 0da1041621426bf49ba2962c8b84b077, + type: 3} + m_PrefabInstance: {fileID: 5840757721197820902} + m_PrefabAsset: {fileID: 0} +--- !u!114 &2964314431365277092 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5839877511987152453} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + 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_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 2714278672185799615} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &7221249598255347506 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3835239547167083732, guid: 0da1041621426bf49ba2962c8b84b077, + type: 3} + m_PrefabInstance: {fileID: 5840757721197820902} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/MyGame/aa/UI/Home/Sub/Hl_Act_RebateView Variant.prefab.meta b/Assets/MyGame/aa/UI/Home/Sub/Hl_Act_RebateView Variant.prefab.meta new file mode 100644 index 000000000..de2990465 --- /dev/null +++ b/Assets/MyGame/aa/UI/Home/Sub/Hl_Act_RebateView Variant.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7632b2940005e1e4ea0f2e053bb1a9dc +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_JiGuHuiLiPanel.cs b/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_JiGuHuiLiPanel.cs new file mode 100644 index 000000000..908b8871a --- /dev/null +++ b/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_JiGuHuiLiPanel.cs @@ -0,0 +1,86 @@ +using Assets.MyGame.Scripts.Net; +using Assets.MyGame.Scripts.Net.API.GameConfig_SubClass; +using Assets.MyGame.Scripts.Net.APIResponses; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class UIHome_BY_JiGuHuiLiPanel : SubUIBase +{ + public Text txt_MaxCoin;//text=每日返还上限n + public Text txt_currCoin;//text=今日可领取m + public Text txt_currCoinNum;//text=xm + public Button btn_Award;//领取按钮 + + private FishingReturnConfig returnCfg; + private FishingReturnDto returnInfo; + + public override void Awake() + { + base.Awake(); + btn_Award.interactable = false; + btn_Award.onClick.AddListener(OnClaimClick); + } + + protected override void OnShow(object args = null) + { + base.OnShow(args); + RefreshPanel(); + } + + private void RefreshPanel() + { + APIRequestList.GetFishingReturnConfig(cfg => + { + returnCfg = cfg; + APIRequestList.GetFishingReturnInfo(info => + { + returnInfo = info; + UpdatePanel(); + }); + }); + } + + private void UpdatePanel() + { + if (returnCfg == null || returnInfo == null) return; + + txt_MaxCoin.text = returnCfg.dailyMaxReturn > 0 + ? $"每日返还上限{FormatGold(returnCfg.dailyMaxReturn)}" + : "每日返还上限无上限"; + + txt_currCoin.text = $"今日可领取{FormatGold(returnInfo.canClaimGold)}"; + txt_currCoinNum.text = FormatGold(returnInfo.canClaimGold); + + btn_Award.interactable = returnCfg.isEnabled + && !returnInfo.isClaimed + && returnInfo.canClaimGold > 0; + } + + private void OnClaimClick() + { + btn_Award.interactable = false; + APIRequestList.ClaimFishingReturn(res => + { + UIManager.Instance.ShowBoardError(res.gold > 0 + ? $"领取成功，获得{FormatGold(res.gold)}金币" + : "领取成功"); + APIRequestList.GetUser(user => + { + GameManager.Instance.UpdataUserData(user); + RefreshPanel(); + }); + }); + } + + /// 金币数值格式化（万/亿单位） + private static string FormatGold(long gold) + { + if (gold >= 100000000) // 亿 + return $"{(gold / 100000000f):F1}亿"; + if (gold >= 10000) // 万 + return $"{(gold / 10000f):F1}万"; + return gold.ToString("N0"); + } +} diff --git a/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_JiGuHuiLiPanel.cs.meta b/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_JiGuHuiLiPanel.cs.meta new file mode 100644 index 000000000..43608ca3a --- /dev/null +++ b/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_JiGuHuiLiPanel.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d12a6faee939b8e48bbd7055d320572a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_ShopPanel.cs b/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_ShopPanel.cs index 6ceb935b3..3a56e18cd 100644 --- a/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_ShopPanel.cs +++ b/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_ShopPanel.cs @@ -340,12 +340,29 @@ public class UIHome_BY_ShopPanel : SubUIBase { APIRequestList.BuyProp(new BuyPropParam { propNumber = item.number, count = 1 }, (response) => { - UIManager.Instance.ShowBoardError("购买成功"); - + // 购买成功后刷新数据，再使用背包里全部VIP经验包（含之前存的） APIRequestList.GetUser(GameManager.Instance.user.id, (a) => { GameManager.Instance.UpdataUserData(a); - RefreshUI(); + + int total = GetBackPackVipExpCount(); + if (total > 0) + { + APIRequestList.UseVipExp(total, (useRes) => + { + UIManager.Instance.ShowBoardError("使用成功"); + + APIRequestList.GetUser(GameManager.Instance.user.id, (a2) => + { + GameManager.Instance.UpdataUserData(a2); + RefreshUI(); + }); + }); + } + else + { + UIManager.Instance.ShowBoardError("购买成功"); + } }); }); }); @@ -521,6 +538,19 @@ public class UIHome_BY_ShopPanel : SubUIBase } } + /// 统计背包里VIP经验类道具的总数量 + private int GetBackPackVipExpCount() + { + var user = GameManager.Instance.user; + if (user?.props == null || user.props.Count == 0) return 0; + + int total = 0; + foreach (var prop in user.props) + if (prop.type == (int)PropEnum.VIP经验) + total += prop.count; + return total; + } + private void RefreshUI() { if (GameManager.Instance?.user?.assets == null) return; diff --git a/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_VIPPanel.cs b/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_VIPPanel.cs index ca02714f1..adfc67edb 100644 --- a/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_VIPPanel.cs +++ b/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_VIPPanel.cs @@ -225,8 +225,16 @@ public class UIHome_BY_VIPPanel : SubUIBase protected override void OnHide() { base.OnHide(); + GameManager.Instance.OnUserDataChanged -= OnUserDataChanged; Destroy(this.gameObject); } + + private void OnDestroy() + { + // 兜底：防止面板被销毁后仍留在事件里（否则之后任何 UpdataUserData 都会调到已销毁的面板） + if (GameManager.Instance != null) + GameManager.Instance.OnUserDataChanged -= OnUserDataChanged; + } private void ShowGiftItems(List gifts, Transform parent) { for (int i = parent.childCount - 1; i >= 0; i--) diff --git a/Assets/MyGame/aa/UI/Home/Sub/UserInfo.prefab b/Assets/MyGame/aa/UI/Home/Sub/UserInfo.prefab index 6f4eaf438..963d62357 100644 --- a/Assets/MyGame/aa/UI/Home/Sub/UserInfo.prefab +++ b/Assets/MyGame/aa/UI/Home/Sub/UserInfo.prefab @@ -3757,7 +3757,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5187336025624228336 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/MyGame/aa/UI/Home/Sub/ZSPanel.prefab b/Assets/MyGame/aa/UI/Home/Sub/ZSPanel.prefab index d627c0ec7..1809452d3 100644 --- a/Assets/MyGame/aa/UI/Home/Sub/ZSPanel.prefab +++ b/Assets/MyGame/aa/UI/Home/Sub/ZSPanel.prefab @@ -133,6 +133,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 4298644773556292445, guid: aab7adfb6126f094f8860d975314558b, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4816861051586960627, guid: aab7adfb6126f094f8860d975314558b, type: 3} propertyPath: m_AnchorMax.y @@ -163,6 +168,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 4870890971057883554, guid: aab7adfb6126f094f8860d975314558b, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4904740237701586725, guid: aab7adfb6126f094f8860d975314558b, type: 3} propertyPath: m_AnchorMax.y diff --git a/Assets/MyGame/aa/UI/Home/Sub/ZhanLing.prefab b/Assets/MyGame/aa/UI/Home/Sub/ZhanLing.prefab index d19525bff..9d0a5e913 100644 --- a/Assets/MyGame/aa/UI/Home/Sub/ZhanLing.prefab +++ b/Assets/MyGame/aa/UI/Home/Sub/ZhanLing.prefab @@ -26160,7 +26160,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 117.685, y: -25} - m_SizeDelta: {x: 235.37, y: 50} + m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4614401808319948171 CanvasRenderer: diff --git a/Assets/MyGame/aa/UI/Home/UIHomeMain.cs b/Assets/MyGame/aa/UI/Home/UIHomeMain.cs index a5abd62a8..04863d522 100644 --- a/Assets/MyGame/aa/UI/Home/UIHomeMain.cs +++ b/Assets/MyGame/aa/UI/Home/UIHomeMain.cs @@ -46,6 +46,7 @@ public class UIHomeMain : UIBase public Button btn_VIP; public Button btn_JJJ; public Button btn_Activity; + public Button btn_JGHL; #endregion [Header("Right")] #region Right @@ -127,6 +128,10 @@ public class UIHomeMain : UIBase { subUIManager.ShowAsync(UIPanel.ActivityPenel); }); + btn_JGHL.onClick.AddListener(() => + { + subUIManager.ShowAsync(UIPanel.JiGuHuiLi); + }); #endregion #region right diff --git a/Assets/MyGame/aa/UI/Home/UIMain.asset b/Assets/MyGame/aa/UI/Home/UIMain.asset index 6d4de2c71..91ee013b3 100644 --- a/Assets/MyGame/aa/UI/Home/UIMain.asset +++ b/Assets/MyGame/aa/UI/Home/UIMain.asset @@ -16,51 +16,72 @@ MonoBehaviour: - name: "\u9009\u62E9\u623F\u95F4\u7B49\u7EA7" type: 101 address: Assets/MyGame/aa/UI/Home/Sub/SelectRoomPanel.prefab + group: 0 - name: VIP type: 151 address: Assets/MyGame/aa/UI/Home/Sub/VIPPanel.prefab + group: 0 - name: "\u4FDD\u9669\u7BB1" type: 166 address: Assets/MyGame/aa/UI/Home/Sub/SafeBox.prefab + group: 0 - name: "\u6551\u6D4E\u91D1" type: 152 address: Assets/MyGame/aa/UI/Home/Sub/JJJPanel.prefab + group: 0 - name: "\u6392\u884C\u699C" type: 164 address: Assets/MyGame/aa/UI/Home/Sub/RankPanel.prefab + group: 0 - name: "\u5546\u5E97" type: 168 address: Assets/MyGame/aa/UI/Home/Sub/ShopPanel.prefab + group: 0 - name: "\u6708\u5361" type: 161 address: Assets/MyGame/aa/UI/Home/Sub/MonthCardPanel.prefab + group: 0 - name: "\u80CC\u5305" type: 162 address: Assets/MyGame/aa/UI/Home/Sub/BackPack.prefab + group: 0 - name: "\u90AE\u4EF6" type: 165 address: Assets/MyGame/aa/UI/Home/Sub/EmailPanel.prefab + group: 0 - name: "\u5BA2\u670D" type: 167 address: Assets/MyGame/aa/UI/Home/Sub/ServicePanel.prefab + group: 0 - name: "\u516C\u544A" type: 163 address: Assets/MyGame/aa/UI/Home/Sub/ZhanLing.prefab + group: 0 - name: "\u8BBE\u7F6E" type: 199 address: Assets/MyGame/aa/UI/Home/Sub/SettingPanel.prefab + group: 0 - name: "\u70AE\u53F0" type: 181 address: Assets/MyGame/aa/UI/Home/Sub/TurretPanel.prefab + group: 0 - name: "\u6218\u795E" type: 182 address: Assets/MyGame/aa/UI/Home/Sub/ZSPanel.prefab + group: 0 - name: "\u7528\u6237\u4FE1\u606F" type: 141 address: Assets/MyGame/aa/UI/Home/Sub/UserInfo.prefab + group: 0 - name: "\u522E\u522E\u5361" type: 900 address: Assets/MyGame/aa/UI/DefaultPanel/GGL.prefab + group: 0 - name: "\u6D3B\u52A8" type: 153 address: Assets/MyGame/aa/UI/Home/Sub/ZhanLing.prefab + group: 0 + - name: "\u51FB\u9F13\u56DE\u793C" + type: 154 + address: Assets/MyGame/aa/UI/Home/Sub/Hl_Act_RebateView Variant.prefab + group: 0