关卡奖励随扫荡更新 商店修改
parent
c18a8ed838
commit
9d408d441c
|
|
@ -402,18 +402,18 @@ RectTransform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1164432840585794248}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
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: 864709108196817824}
|
||||
- {fileID: 852027359657086117}
|
||||
m_Father: {fileID: 907540816882869757}
|
||||
m_Father: {fileID: 7823953348506215780}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0.5}
|
||||
m_AnchorMax: {x: 0, y: 0.5}
|
||||
m_AnchoredPosition: {x: 259, y: 10}
|
||||
m_AnchoredPosition: {x: 252.41779, y: 0.42248535}
|
||||
m_SizeDelta: {x: 472, y: 49}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3355773917842071953
|
||||
|
|
@ -454,6 +454,43 @@ MonoBehaviour:
|
|||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &1424538748460661853
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7294558845035304575}
|
||||
m_Layer: 5
|
||||
m_Name: FreeBuy
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &7294558845035304575
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1424538748460661853}
|
||||
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: 4942109397581428494}
|
||||
- {fileID: 5572167065164989299}
|
||||
m_Father: {fileID: 907540816882869757}
|
||||
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: -4.7984, y: 9.5775}
|
||||
m_SizeDelta: {x: 851.2388, y: 80.845}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &1478540216373996284
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -936,6 +973,44 @@ MonoBehaviour:
|
|||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &2344179092188565134
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7823953348506215780}
|
||||
m_Layer: 5
|
||||
m_Name: NormalBuy
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &7823953348506215780
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2344179092188565134}
|
||||
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: 2087326843947954571}
|
||||
- {fileID: 6326214397254789165}
|
||||
- {fileID: 4105522015799479251}
|
||||
m_Father: {fileID: 907540816882869757}
|
||||
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: -4.7984, y: 9.5775}
|
||||
m_SizeDelta: {x: 851.2388, y: 80.845}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &2526150895983880205
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -2104,16 +2179,16 @@ RectTransform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4618625825492865265}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
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: 907540816882869757}
|
||||
m_Father: {fileID: 7294558845035304575}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
m_AnchoredPosition: {x: -78.2, y: 13.2}
|
||||
m_AnchoredPosition: {x: -62.02092, y: 3.6225157}
|
||||
m_SizeDelta: {x: 65, y: 64}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5902657061869913222
|
||||
|
|
@ -2920,17 +2995,17 @@ RectTransform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6179213196166703761}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
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: 907540816882869757}
|
||||
m_Father: {fileID: 7294558845035304575}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 241.52, y: 10.830002}
|
||||
m_SizeDelta: {x: -721.77, y: -21.65}
|
||||
m_AnchoredPosition: {x: -32, y: -1.2524986}
|
||||
m_SizeDelta: {x: -699.0088, y: 2.5049992}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6461058428181633902
|
||||
CanvasRenderer:
|
||||
|
|
@ -3124,9 +3199,8 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 4942109397581428494}
|
||||
- {fileID: 5572167065164989299}
|
||||
- {fileID: 4105522015799479251}
|
||||
- {fileID: 7294558845035304575}
|
||||
- {fileID: 7823953348506215780}
|
||||
m_Father: {fileID: 2588291914975879933}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0}
|
||||
|
|
@ -3328,6 +3402,81 @@ MonoBehaviour:
|
|||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &7649038338335498089
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 6326214397254789165}
|
||||
- component: {fileID: 6742345761427369203}
|
||||
- component: {fileID: 5812974717318318988}
|
||||
m_Layer: 5
|
||||
m_Name: ImageIcon
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &6326214397254789165
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7649038338335498089}
|
||||
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: 7823953348506215780}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
m_AnchoredPosition: {x: -62.02092, y: 3.6225157}
|
||||
m_SizeDelta: {x: 65, y: 64}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6742345761427369203
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7649038338335498089}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &5812974717318318988
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7649038338335498089}
|
||||
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: a158c4952489d464284d32db4a179f69, 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 &7740010880609459873
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -3481,6 +3630,141 @@ MonoBehaviour:
|
|||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &7893258799535732303
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2087326843947954571}
|
||||
- component: {fileID: 3025236408034601154}
|
||||
- component: {fileID: 3983632560391020606}
|
||||
m_Layer: 5
|
||||
m_Name: Text_Buy
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &2087326843947954571
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7893258799535732303}
|
||||
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: 7823953348506215780}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 246.3184, y: 1.2525177}
|
||||
m_SizeDelta: {x: -699.0088, y: 2.5049992}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3025236408034601154
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7893258799535732303}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &3983632560391020606
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7893258799535732303}
|
||||
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: "\u786E\u8BA4\u8D2D\u4E70"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: d996718f19de68245bc356be2938e063, type: 2}
|
||||
m_sharedMaterial: {fileID: -8559898196655864114, guid: d996718f19de68245bc356be2938e063,
|
||||
type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
m_fontColor32:
|
||||
serializedVersion: 2
|
||||
rgba: 4278190080
|
||||
m_fontColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
m_enableVertexGradient: 0
|
||||
m_colorMode: 3
|
||||
m_fontColorGradient:
|
||||
topLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||
topRight: {r: 1, g: 1, b: 1, a: 1}
|
||||
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||
bottomRight: {r: 1, g: 1, b: 1, 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: 36
|
||||
m_fontSizeBase: 36
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 0
|
||||
m_fontSizeMin: 18
|
||||
m_fontSizeMax: 72
|
||||
m_fontStyle: 0
|
||||
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: 0, y: 0, z: 0, 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 &8463366427667975403
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -1,10 +1,7 @@
|
|||
using cfg.LegionBattleCfg;
|
||||
using Cysharp.Threading.Tasks;
|
||||
using DG.Tweening;
|
||||
using Framework;
|
||||
using Gameplay;
|
||||
using Gameplay.LegionBattle;
|
||||
using Gameplay.Net;
|
||||
using NLDPB;
|
||||
using PhxhSDK;
|
||||
using System;
|
||||
|
|
@ -271,6 +268,11 @@ public sealed class UI_LegionBattleSettleController : UIWindow
|
|||
icon.sprite = sprite;
|
||||
textReward.text = num.ToString();
|
||||
}
|
||||
|
||||
public void Hide()
|
||||
{
|
||||
IsScaleShow = false;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -320,11 +322,21 @@ public sealed class UI_LegionBattleSettleController : UIWindow
|
|||
textScore.text = settleData.Score.ToString();
|
||||
textDead.text = settleData.Dead.ToString();
|
||||
textKill.text = settleData.Kill.ToString();
|
||||
IsScaleShow = true;
|
||||
|
||||
if (settleData.RewardID == 0)
|
||||
{
|
||||
foreach (var rewardObj in rewardItems)
|
||||
{
|
||||
rewardObj.Hide();
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
var reward = RewardManager.Instance.Get(settleData.RewardID);
|
||||
var itemList = CommonUtils.GetFilterRewardItemList(reward);
|
||||
var items = itemList.Get();
|
||||
|
||||
|
||||
for (var i = 0; i < items.Count; i++)
|
||||
{
|
||||
if (i < rewardItems.Count)
|
||||
|
|
@ -333,8 +345,6 @@ public sealed class UI_LegionBattleSettleController : UIWindow
|
|||
rewardItems[i].SetInfo(rewardInfo.Data.IconPath, rewardInfo.Count);
|
||||
}
|
||||
}
|
||||
|
||||
IsScaleShow = true;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -640,6 +640,7 @@ public class UI_LevelDetailController : UIWindow
|
|||
new(-sweepRecycleView.GetPositionByIndex(sweepCount - 1).x,
|
||||
sweepRecycleView.ScrollRect.content.anchoredPosition.y), 0.33f);
|
||||
changeSweepAction?.Invoke(isOpenSweep, sweepCount);
|
||||
rewardRecycleView.ShowList(listReward.Count);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -768,18 +769,19 @@ public class UI_LevelDetailController : UIWindow
|
|||
}
|
||||
|
||||
var rewardInfo = listReward[index];
|
||||
item.SetInfo(rewardInfo.rewardItem, rewardInfo.MaxCount, rewardInfo.hasGet, rewardInfo.rewardType, () =>
|
||||
{
|
||||
OnClick(rewardInfo.rewardItem.Data.ID);
|
||||
});
|
||||
var count = isOpenSweep && rewardInfo.rewardType != ERewardType.LevelFirstPassReward
|
||||
? sweepCount * rewardInfo.MaxCount
|
||||
: rewardInfo.MaxCount;
|
||||
item.SetInfo(rewardInfo.rewardItem, count, rewardInfo.hasGet, rewardInfo.rewardType,
|
||||
() => { OnClick(rewardInfo.rewardItem.Data.ID); });
|
||||
}
|
||||
|
||||
|
||||
private void OnClick(int itemID)
|
||||
{
|
||||
UI_ItemSourcePanelController.Open(itemID,
|
||||
() => { UIManager.Instance.CloseWindow(UINameConst.UI_BattlePassBuyLevelPanel); }, true);
|
||||
UI_ItemSourcePanelController.Open(itemID, null,true);
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 扫荡刷新
|
||||
/// </summary>
|
||||
|
|
@ -811,7 +813,7 @@ public class UI_LevelDetailController : UIWindow
|
|||
listReward.Add(rewardShowItem);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
foreach (var normalReward in levelInfo.Cfg.NormalRewardID)
|
||||
{
|
||||
Reward reward = RewardManager.Instance.Get(normalReward);
|
||||
|
|
|
|||
|
|
@ -254,9 +254,6 @@ public class ExchangePanel : ShopPanel
|
|||
selloutImg.IsScaleShow(remainSoldCount <= 0);
|
||||
if (remainSoldCount <= 0)
|
||||
{
|
||||
discountObj.IsScaleShow(false);
|
||||
price.gameObject.IsScaleShow(false);
|
||||
freeImg.IsScaleShow(false);
|
||||
itemBtn.interactable = false;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -326,7 +326,6 @@ public class GiftPanel : ShopPanel
|
|||
if (remainSoldCount <= 0)
|
||||
{
|
||||
lockObj.IsScaleShow(false);
|
||||
SetAllPriceActive(false);
|
||||
itemBtn.interactable = false;
|
||||
remainTimeObj.IsScaleShow(false);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -51,6 +51,9 @@ public class UI_GiftShopPurchaseController : UIWindow
|
|||
private RawImage rawImageGaussianBlurMask;
|
||||
private TMP_Text textComponent;
|
||||
|
||||
private GameObject normalBuy;
|
||||
private GameObject freeBuy;
|
||||
|
||||
#endregion
|
||||
|
||||
#region 类
|
||||
|
|
@ -165,6 +168,8 @@ public class UI_GiftShopPurchaseController : UIWindow
|
|||
{
|
||||
EventManager.Instance.Register(EventManager.EventName.ShopPurchaseSuccess, ShopPurchaseSuccess);
|
||||
EventManager.Instance.Register<uint>(EventManager.EventName.ItemChange, OpenGiftChest);
|
||||
normalBuy = FindObj("MainNode/Right/Button_Purchase/NormalBuy");
|
||||
freeBuy = FindObj("MainNode/Right/Button_Purchase/FreeBuy");
|
||||
|
||||
allItem = new List<ItemInfo>();
|
||||
itemLineDic = new Dictionary<int, LineItem>();
|
||||
|
|
@ -247,17 +252,30 @@ public class UI_GiftShopPurchaseController : UIWindow
|
|||
|
||||
// 礼包价格
|
||||
var price = openData.ShopItem.GetPriceCount();
|
||||
Text_Price.text = IsMoneyEnough()
|
||||
? price.ToString()
|
||||
: $" <color=#FF0000>{price}</color>";
|
||||
|
||||
// 礼包价格图标
|
||||
var priceIconPath = priceItem.CoinIconPath;
|
||||
if (!string.IsNullOrEmpty(priceIconPath))
|
||||
// 免费
|
||||
if (price <= 0)
|
||||
{
|
||||
var sprite = await AssetManager.Instance.LoadAssetAsync<Sprite>(priceIconPath);
|
||||
if (sprite != null)
|
||||
Image_Price.sprite = sprite;
|
||||
freeBuy.IsScaleShow(true);
|
||||
normalBuy.IsScaleShow(false);
|
||||
}
|
||||
else
|
||||
{
|
||||
Text_Price.text = IsMoneyEnough()
|
||||
? price.ToString()
|
||||
: $" <color=#FF0000>{price}</color>";
|
||||
|
||||
// 礼包价格图标
|
||||
var priceIconPath = priceItem.CoinIconPath;
|
||||
if (!string.IsNullOrEmpty(priceIconPath))
|
||||
{
|
||||
var sprite = await AssetManager.Instance.LoadAssetAsync<Sprite>(priceIconPath);
|
||||
if (sprite != null)
|
||||
Image_Price.sprite = sprite;
|
||||
}
|
||||
|
||||
normalBuy.IsScaleShow(true);
|
||||
freeBuy.IsScaleShow(false);
|
||||
}
|
||||
|
||||
Text_ChooseItem.text = string.Format(CommonUtils.GetLocalizeText("shop_choose_gift"), purchaseCount);
|
||||
|
|
|
|||
|
|
@ -386,7 +386,7 @@ public class GenericItem_PassReward : GenericItem
|
|||
if (rewardType == ERewardType.LevelProbablyPassReward)
|
||||
SetProbablyPassRewardInfo(rewardItem.Data, count, callback);
|
||||
else
|
||||
base.SetInfo(rewardItem.Data, rewardItem.Count, callback);
|
||||
base.SetInfo(rewardItem.Data, count, callback);
|
||||
|
||||
IsGet = isGet;
|
||||
IsFirstPass = rewardType == ERewardType.LevelFirstPassReward;
|
||||
|
|
|
|||
|
|
@ -24,10 +24,10 @@ public class UI_GiftShopPurchaseBinder
|
|||
window.Text_ItemName = window.GetComponent<TMP_Text>("MainNode/Text_ItemName");
|
||||
window.ScrollView_ItemList = window.GetComponent<RecycleView>("MainNode/Right/ScrollView_ItemList");
|
||||
window.Button_Purchase = window.GetComponent<Button>("MainNode/Right/Button_Purchase");
|
||||
window.Text_Buy = window.GetComponent<TMP_Text>("MainNode/Right/Button_Purchase/Text_Buy");
|
||||
window.Text_PriceDesc = window.GetComponent<TMP_Text>("MainNode/Right/Button_Purchase/ImageBg/Text_PriceDesc");
|
||||
window.Text_Price = window.GetComponent<TMP_Text>("MainNode/Right/Button_Purchase/ImageBg/Text_Price");
|
||||
window.Image_Price = window.GetComponent<Image>("MainNode/Right/Button_Purchase/ImageBg/Text_Price/Image_Price");
|
||||
window.Text_Buy = window.GetComponent<TMP_Text>("MainNode/Right/Button_Purchase/NormalBuy/Text_Buy");
|
||||
window.Text_PriceDesc = window.GetComponent<TMP_Text>("MainNode/Right/Button_Purchase/NormalBuy/ImageBg/Text_PriceDesc");
|
||||
window.Text_Price = window.GetComponent<TMP_Text>("MainNode/Right/Button_Purchase/NormalBuy/ImageBg/Text_Price");
|
||||
window.Image_Price = window.GetComponent<Image>("MainNode/Right/Button_Purchase/NormalBuy/ImageBg/Text_Price/Image_Price");
|
||||
window.Image_TopBlackBar = window.GetComponent<Image>("Image_TopBlackBar");
|
||||
window.Image_BottomBlackBar = window.GetComponent<Image>("Image_BottomBlackBar");
|
||||
window.TopImg = window.GetComponent<Image>("MainNode/Right/TopImg");
|
||||
|
|
|
|||
Loading…
Reference in New Issue