【云游商人】提交

dev_chengFeng
ZhangBiao 2021-04-19 11:38:35 +08:00
parent 11ea817c16
commit 3005d9bf30
8 changed files with 1090 additions and 7 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1969,6 +1969,7 @@ GENERAL_POPUP_TYPE={
SheJiCheckGuild = 29, --社稷大典检查是否加入公会
YiJingBaoKuConfirm = 31,--易经宝库奖励确认
LingShouBaoGe = 33,--灵兽宝阁选择神兽
YunYouMan = 34,--云游商人选择装备
--大号通用弹窗
YiJingBaoKu = 30,--易经宝库

View File

@ -194,7 +194,6 @@ function ActivityMainPanel:OnClose()
redPointTypeList = {}
--关闭弹窗界面
for k,v in pairs(subViewList) do
LogPink("v.sub:"..tostring(v.sub))
v.sub:OnDestroy()
SubUIManager.Close(v.sub)
end

View File

@ -51,7 +51,7 @@ function this.UpdateSingleTypeData(actType)
dataList[actType].rewards[i].missionId = data.mission[i].missionId or 0--应该无变化
dataList[actType].rewards[i].progress = data.mission[i].progress or 0
dataList[actType].rewards[i].state = data.mission[i].state or 0
LogGreen("i:"..tostring(i).." missionId:"..tostring(dataList[actType].rewards[i].missionId).." progress:"..tostring(dataList[actType].rewards[i].progress).." state:"..tostring(dataList[actType].rewards[i].state).." NeedItems:"..tostring(dataList[actType].rewards[i].NeedItems).." Count:"..tostring(dataList[actType].rewards[i].Count).." ComposeType:"..tostring(dataList[actType].rewards[i].ComposeType))
LogGreen("i:"..tostring(i).." missionId:"..tostring(dataList[actType].rewards[i].missionId).." progress:"..tostring(dataList[actType].rewards[i].progress).." state:"..tostring(dataList[actType].rewards[i].state))
end
end
end

View File

@ -1,4 +1,4 @@
ItemUpstarPre = {}
local ItemUpstarPre = {}
local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig)
local parent
local curSelectId = 0
@ -25,16 +25,21 @@ function ItemUpstarPre:InitComponent()
self.itemList = {}
self.btnMaskNeed = Util.GetGameObject(self.midLayout,"itemNeed/mask")
self.btnMaskGet = Util.GetGameObject(self.midLayout,"itemGet/mask")
self.btnMaskNeedAdd = Util.GetGameObject(self.midLayout,"itemNeed/mask/Image")
end
--绑定事件(用于子类重写)
function ItemUpstarPre:BindEvent()
Util.AddClick(self.btnMaskNeed,function ()
LogGreen("打开选择框")
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.YunYouMan,self.data,function (itemId)
curSelectId = itemId
self:Refresh()
end)
end)
Util.AddClick(self.btnExchange,function ()
if curSelectId == 0 then
PopupTipPanel.ShowTips("请选择想要升级的装备!")
PopupTipPanel.ShowTip("请选择想要升级的装备!")
return
end
LogGreen("兑换")
@ -60,7 +65,7 @@ function ItemUpstarPre:SetData(_data,_parent,_sortingOrder)
end
function ItemUpstarPre:Refresh()
local needItemId = curSelectId == 0 and self.data.needItems[1] or curSelectId
local needItemId = (curSelectId == 0 or curSelectId == nil) and self.data.needItems[1] or curSelectId
local configData = ConfigManager.GetConfigData(ConfigName.ComposeBook,needItemId)
local rewardList = {configData.NeedItems[1],configData.NeedCost[1],configData.GoalItems[1]}
--设置内容
@ -78,14 +83,14 @@ end
function ItemUpstarPre:SetMask()
if curSelectId == 0 then
self.btnMaskNeed:SetActive(true)
self.btnMaskNeedAdd:SetActive(true)
self.btnMaskGet:SetActive(true)
Util.GetGameObject(self.itemList[1].gameObject,"effects"):SetActive(false)
Util.GetGameObject(self.itemList[1].gameObject,"item/icon"):SetActive(false)
Util.GetGameObject(self.itemList[3].gameObject,"effects"):SetActive(false)
Util.GetGameObject(self.itemList[3].gameObject,"item/icon"):SetActive(false)
else
self.btnMaskNeed:SetActive(false)
self.btnMaskNeedAdd:SetActive(false)
self.btnMaskGet:SetActive(false)
Util.GetGameObject(self.itemList[1].gameObject,"effects"):SetActive(true)
Util.GetGameObject(self.itemList[1].gameObject,"item/icon"):SetActive(true)

View File

@ -63,6 +63,8 @@ local contentScripts = {
[30] = {view = require("Modules/Popup/View/GeneralPopup_YiJingBaoKuConfirm"), panelName = "GeneralPopup_YiJingBaoKuConfirm",type=GENERAL_POPUP_TYPE.YiJingBaoKuConfirm},
--灵兽宝阁选择神兽
[31] = {view = require("Modules/Popup/View/GeneralPopup_LingShouBaoGe"), panelName = "GeneralPopup_LingShouBaoGe",type=GENERAL_POPUP_TYPE.LingShouBaoGe},
--云游商人选择装备
[32] = {view = require("Modules/Popup/View/GeneralPopup_YunYouMan"), panelName = "GeneralPopup_YunYouMan",type=GENERAL_POPUP_TYPE.YunYouMan},
}
--子模块预设
local contentPrefabs={}

View File

@ -0,0 +1,130 @@
----- 云游商人选择装备 -----
local this = {}
--传入父脚本模块
local parent
--传入特效层级
local sortingOrder=0
local func
local data
local selectId = 0
function this:InitComponent(gameObject)
self.titleText=Util.GetGameObject(gameObject,"TitleText"):GetComponent("Text")
self.tip=Util.GetGameObject(gameObject,"tip"):GetComponent("Text")
self.scroll = Util.GetGameObject(gameObject, "Scroll")
self.confirm = Util.GetGameObject(gameObject, "ConfirmBtn")
self.cancel = Util.GetGameObject(gameObject, "CancelBtn")
self.itemPre = Util.GetGameObject(gameObject, "itemPre")
self.mask = Util.GetGameObject(gameObject, "itemPre/item")
-- 设置循环滚动,万一内容不停地加
local rootHight = self.scroll.transform.rect.height
local width = self.scroll.transform.rect.width
self.scrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, self.scroll.transform,
self.itemPre, nil, Vector2.New(width, rootHight), 1, 5, Vector2.New(0, 35))
self.scrollView.moveTween.MomentumAmount = 1
self.scrollView.moveTween.Strength = 2
self.equipList={}
self.itemList = {}
self.maskList = {}
self.maskImageList = {}
end
function this:BindEvent()
Util.AddClick(this.confirm,function()
parent:ClosePanel()
if func then
func(selectId)
end
end)
Util.AddClick(this.cancel,function()
parent:ClosePanel()
end)
end
function this:AddListener()
end
function this:RemoveListener()
end
function this:OnShow(_parent,...)
parent=_parent
sortingOrder = _parent.sortingOrder
--不定参中包含的不定参 _args[1]为面板类型 _args[2]之后(包括)为打开面板后传入的不定参
local _args = {...}
data = _args[1]
func = _args[2]
self.equipList = BagManager.GetBagItemDataByItemType(ItemBaseType.Equip)
this:Refresh(true,true)
end
function this:Refresh(isTop,isAni)
this.titleText.text = "装备升级"
if not self.itemList then
self.itemList = {}
end
for i = 1, #self.itemList do
self.itemList[i].gameObject:SetActive(false)
end
self.scrollView:SetData(self.equipList, function (index, item)
this:ShowSingleData(item, self.equipList[index],index)
end,not isTop,not isAni)
end
function this:ShowSingleData(item,sdata,index)
local bool = false
for i = 1, #data.needItems do
if sdata.itemConfig.Id == data.needItems[i] then
bool = true
end
end
if bool then
this.tip.text = "请选择您要升级的装备"
self.tip.gameObject:GetComponent("RectTransform").localPosition = Vector3.New(0,232,0)
local itemtrans = Util.GetGameObject(item,"item")
local itemmask = Util.GetGameObject(item,"mask")
local maskImage = Util.GetGameObject(item,"mask/Image")
maskImage:SetActive(false)
if not self.itemList[index] then
self.itemList[index] = SubUIManager.Open(SubUIConfig.ItemView,itemtrans.transform)
self.itemList[index].gameObject:SetActive(false)
end
self.itemList[index]:OnOpen(false, {sdata.itemConfig.Id,sdata.num}, 1,false,false,false,sortingOrder)
self.itemList[index].gameObject:SetActive(true)
self.maskList[index] = itemmask
self.maskImageList[index] = maskImage
else
self.tip.text = "暂无可升级的装备"
self.tip.gameObject:GetComponent("RectTransform").localPosition = Vector3.zero
end
self.maskImageList[index]:SetActive(selectId == sdata.itemConfig.Id)
Util.AddOnceClick(self.maskList[index],function ()
for i = 1, #self.maskImageList do
self.maskImageList[i]:SetActive(false)
end
if selectId == sdata.itemConfig.Id then
self.maskImageList[index]:SetActive(false)
selectId = 0
else
self.maskImageList[index]:SetActive(true)
selectId = sdata.itemConfig.Id
end
end)
end
function this:OnClose()
self.equipList={}
self.itemList = {}
self.maskList = {}
self.maskImageList = {}
end
function this:OnDestroy()
end
return this

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: b6924c50cc46af1419e32eec33c557b6
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant: