每日累充修改 魂印描述修改

wangzhenxing 2022-11-09 17:55:54 +08:00
parent 3df404296c
commit b39188841a
3 changed files with 139 additions and 64 deletions

View File

@ -619,8 +619,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -399.258, y: 36}
m_SizeDelta: {x: 81.84, y: 657.3}
m_AnchoredPosition: {x: -399.258, y: -52}
m_SizeDelta: {x: 81.8, y: 833.3}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2407937911512814976
MonoBehaviour:
@ -1018,12 +1018,13 @@ RectTransform:
- {fileID: 7944016472393893859}
- {fileID: 3435773343199518887}
- {fileID: 1937467392759674615}
- {fileID: 7438501248280487076}
m_Father: {fileID: 5560347858770598648}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: -499.7, y: -207.64}
m_AnchoredPosition: {x: -286.8, y: -190}
m_SizeDelta: {x: 82, y: 213.29}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3023659987410006798
@ -1115,6 +1116,85 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
--- !u!1 &3609916302687914418
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7438501248280487076}
- component: {fileID: 8430205233688018}
- component: {fileID: 3257978523702218994}
m_Layer: 0
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7438501248280487076
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3609916302687914418}
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: 2545290923758964436}
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.03, y: -3.13}
m_SizeDelta: {x: 60.06, y: 159.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8430205233688018
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3609916302687914418}
m_CullTransparentMesh: 0
--- !u!114 &3257978523702218994
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3609916302687914418}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.98823535, g: 0.7843138, b: 0.38823533, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 40
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1.2
m_Text: "30\u5143"
--- !u!1 &3694849207738348854
GameObject:
m_ObjectHideFlags: 0
@ -1360,7 +1440,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &3435773343199518887
RectTransform:
m_ObjectHideFlags: 0

View File

@ -8,7 +8,8 @@ local activityRewardConfig = ConfigManager.GetConfig(ConfigName.ActivityRewardCo
local TabBox = require("Modules/Common/TabBox")
local BTNS = {
[1] = {bg1 = "b_baibao_andi",bg2 = "b_baibao_liangdi",text1 = "c_czfl_6yuan",text2 = "c_czfl_6yuan2",showType = 48,actType = ActivityTypeDef.chaozhifanli,goodsType = GoodsTypeDef.chaozhifanli,redpoint= RedPointType.chaozhifanli6,price = 6},
[2] = {bg1 = "b_baibao_andi",bg2 = "b_baibao_liangdi",text1 = "c_czfl_18yuan",text2 = "c_czfl_18yuan",showType = 49,actType = ActivityTypeDef.chaozhifanli30,goodsType = GoodsTypeDef.chaozhifanli,redpoint= RedPointType.chaozhifanli30,price = 18},
[2] = {bg1 = "b_baibao_andi",bg2 = "b_baibao_liangdi",text1 = "c_czfl_18yuan",text2 = "c_czfl_18yuan",showType = 49,actType = 111,goodsType = GoodsTypeDef.chaozhifanli,redpoint= RedPointType.chaozhifanli30,price = 12},
[3] = {bg1 = "b_baibao_andi",bg2 = "b_baibao_liangdi",text1 = "c_czfl_18yuan",text2 = "c_czfl_18yuan",showType = 49,actType = ActivityTypeDef.chaozhifanli30,goodsType = GoodsTypeDef.chaozhifanli,redpoint= RedPointType.chaozhifanli30,price = 30},
}
local curPage = 1
local redList = {}
@ -48,14 +49,15 @@ end
function this.PageTabAdapter(tab, index, status)
local select = Util.GetGameObject(tab, "select")
local title = Util.GetGameObject(tab, "title"):GetComponent("Image")
local title = Util.GetGameObject(tab, "Text"):GetComponent("Text")
local red = Util.GetGameObject(tab, "red")
if status == "select" then
select.gameObject:SetActive(true)
title.sprite = this.spLoader:LoadSprite(BTNS[index].text1)
title.text = BTNS[index].price..""
else
select.gameObject:SetActive(false)
title.sprite = this.spLoader:LoadSprite(BTNS[index].text2)
title.text = BTNS[index].price..""
end
BindRedPointObject(BTNS[index].redpoint,red)
redList[BTNS[index].redpoint] = red
@ -105,16 +107,12 @@ function PremiumRebatePanel:Refresh(isTop,isAni)
table.sort(this.actData.mission,function(a,b)
return a.missionId < b.missionId
end)
LogError("this.actData.activityId=="..this.actData.activityId)
--this.giftData = DynamicActivityManager.GetGiftDataByType({{DataType.Direct,BTNS[curPage].goodsType,BTNS[curPage].showType}})
this.actConfigData = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityRewardConfig,"ActivityId",this.actData.activityId)
local missionConfig = ConfigManager.GetConfigDataByDoubleKey(ConfigName.ActivityRewardConfig,"ActivityId",this.actData.activityId,"Sort",this.actData.value + 1)
local missionData = ActivityGiftManager.GetActivityInfo(this.actData.activityId,missionConfig.Id)
if missionData.state == 1 or
(missionData.state == 0 and missionData.progress >= activityRewardConfig[missionConfig.Id].Values[1][1]) then
this.leftTime.text = string.format("每日仅需充值%s 累计天数:%s/15",MoneyUtil.GetMoneyUnitNameWithMoney(BTNS[curPage].price),this.actData.value + 1)
else
this.leftTime.text = string.format("每日仅需充值%s 累计天数:%s/15",MoneyUtil.GetMoneyUnitNameWithMoney(BTNS[curPage].price),this.actData.value)
end
this.leftTime.text = "每档位每日限购一次"
this:SetRewardShow(isTop,isAni)
this:SetTime()
end
@ -154,6 +152,7 @@ function PremiumRebatePanel:ShowSingleHero(go,_data,index)
local btnProgressText = Util.GetGameObject(go, "btnGet/progress"):GetComponent("Text")
local btnImg = Util.GetGameObject(go, "btnGet"):GetComponent("Image")
local red = Util.GetGameObject(btnImg.gameObject, "red")
LogError("_data.missionId===".._data.missionId)
local missionConfigData = activityRewardConfig[_data.missionId]
if missionConfigData then
go.gameObject:SetActive(true)
@ -161,68 +160,63 @@ function PremiumRebatePanel:ShowSingleHero(go,_data,index)
go.gameObject:SetActive(false)
return
end
btnProgressText.text = string.format("%s/%s",_data.progress,missionConfigData.Values[1][1])
btnProgressText.gameObject:SetActive(true)
title.text = missionConfigData.ContentsShow
--btnProgressText.text = string.format("%s/%s",_data.progress,missionConfigData.Values[1][1])
btnProgressText.gameObject:SetActive(false)
if not this.itemViewList[go] then
this.itemViewList[go] = {}
end
for k,v in ipairs(this.itemViewList[go]) do
v.gameObject:SetActive(false)
end
for i = 1, #missionConfigData.Reward do
if not this.itemViewList[go][i] then
this.itemViewList[go][i] = SubUIManager.Open(SubUIConfig.ItemView,grid.transform)
this.itemViewList[go][i].gameObject:SetActive(false)
local recharge=ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig,missionConfigData.Values[1][1])
title.text = recharge.Name
if recharge then
for i = 1, #recharge.BaseReward do
local reward=recharge.BaseReward[i]
if not this.itemViewList[go][i] then
this.itemViewList[go][i] = SubUIManager.Open(SubUIConfig.ItemView,grid.transform)
this.itemViewList[go][i].gameObject:SetActive(false)
end
if tonumber(reward)~=0 and tonumber(reward[1])~=0 then
this.itemViewList[go][i]:OnOpen(false, {reward[1],reward[2],reward[3]}, 0.65,false,false,false,this.sortingOrder)
this.itemViewList[go][i].gameObject:SetActive(true)
end
end
this.itemViewList[go][i]:OnOpen(false, {missionConfigData.Reward[i][1],missionConfigData.Reward[i][2],missionConfigData.Reward[i][3]}, 0.65,false,false,false,this.sortingOrder)
this.itemViewList[go][i].gameObject:SetActive(true)
end
btnText.gameObject:SetActive(true)
red.gameObject:SetActive(false)
btnImg.sprite = this.spLoader:LoadSprite("s_slbz_1anniuhuangse")
btnText.text = "前往"--_data.data.price
if _data.state == 0 and index <= this.actData.value + 1 then
if _data.state == 0 then --不可购买
Util.SetGray(btnGet,true)
btnText.text = recharge.Price
btnText.text = recharge.Price..""
elseif _data.state == 1 then --可购买
Util.SetGray(btnGet,false)
if _data.progress >= missionConfigData.Values[1][1] then
btnText.text = "领取"--_data.data.price
red.gameObject:SetActive(true)
btnImg.sprite = this.spLoader:LoadSprite("s_slbz_1anniuongse")
Util.AddOnceClick(btnGet,function ()
-- PayManager.Pay(_data.data.shopData.goodsId, function(id)
-- FirstRechargeManager.RefreshAccumRechargeValue(_data.data.shopData.goodsId)
-- OperatingManager.SetHadBuyGoodsId({_data.data.shopData.goodsId})
-- ActivityGiftManager.SetActivityInfo(this.actData.activityId, _data.missionId, 1)
-- _data.state = 1
-- self:ShowSingleHero(go,_data,index)
-- end)
NetManager.GetActivityRewardRequest(_data.missionId, this.actData.activityId, function(_drop)
ActivityGiftManager.SetActivityInfo(this.actData.activityId, _data.missionId, 1)
_data.state = 1
self:ShowSingleHero(go,_data,index)
CheckRedPointStatus(BTNS[curPage].redpoint)
UIManager.OpenPanel(UIName.RewardItemPopup, _drop, 1,function()
end)
end)
end)
else
Util.AddOnceClick(btnGet,function ()
JumpManager.GoJump(36008)
end)
end
elseif _data.state == 1 then
Util.SetGray(btnGet,true)
btnText.text = "已领取"
btnProgressText.gameObject:SetActive(false)
Util.AddOnceClick(btnGet,function ()
end)
else
Util.SetGray(btnGet,true)
Util.AddOnceClick(btnGet,function ()
PopupTipPanel.ShowTip(string.format("累计充值超值返利%s天时可领取",index))
end)
btnText.text = recharge.Price..""
elseif _data.state==2 then --已购买
-- body
Util.SetGray(btnGet,false)
btnText.text = "已购买"
end
Util.AddOnceClick(btnGet,function ()
if _data.state==0 then
--PopupTipPanel.ShowTip("购买上一档礼包后可购买")
elseif _data.state==1 then
PayManager.Pay(recharge.Id, function(id)
_data.state = 2
self:ShowSingleHero(go,_data,index)
end)
elseif _data.state==2 then
PopupTipPanel.ShowTip("已购买")
end
end)
end
function PremiumRebatePanel:SetTime()

View File

@ -231,8 +231,9 @@ function SoulPrintPopUp:RefreshShow(type)
if equipConfig[soulId] then --魂印效果
local txt = ""
if equipConfig[soulId].PassiveSkill then
self.effectText.text = GetLanguageStrById(passiveSkillConfig[equipConfig[soulId].PassiveSkill[1]].Desc)
local pass=equipConfig[soulId].PassiveSkill
if pass and tonumber(pass[1])~=nil and tonumber(pass[1])~=0 then
self.effectText.text = GetLanguageStrById(passiveSkillConfig[pass[1]].Desc)
else
for index, value in ipairs(equipConfig[soulId].Property) do --propertyconfig
if index > 1 then