天地烘炉提交

dev_chengFeng
jiaoyangna 2021-11-26 17:04:54 +08:00
parent b63b619426
commit 5542212cc1
12 changed files with 244 additions and 74 deletions

View File

@ -10888,6 +10888,118 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1881889030635060039}
m_CullTransparentMesh: 0
--- !u!1 &1885110215741331779
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8288204256815441005}
- component: {fileID: 696397435626171248}
- component: {fileID: 8343200273258605673}
- component: {fileID: 9147036965973640332}
- component: {fileID: 2445538820196278634}
m_Layer: 5
m_Name: scroll
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8288204256815441005
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1885110215741331779}
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:
- {fileID: 2593571354443773693}
m_Father: {fileID: 3849663331886650410}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -455.65002, y: 15.8}
m_SizeDelta: {x: 907.9, y: 1080.8}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &696397435626171248
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1885110215741331779}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1367256648, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Content: {fileID: 2593571354443773693}
m_Horizontal: 0
m_Vertical: 1
m_MovementType: 1
m_Elasticity: 0.1
m_Inertia: 1
m_DecelerationRate: 0.135
m_ScrollSensitivity: 1
m_Viewport: {fileID: 0}
m_HorizontalScrollbar: {fileID: 0}
m_VerticalScrollbar: {fileID: 0}
m_HorizontalScrollbarVisibility: 0
m_VerticalScrollbarVisibility: 0
m_HorizontalScrollbarSpacing: 0
m_VerticalScrollbarSpacing: 0
m_OnValueChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!114 &8343200273258605673
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1885110215741331779}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!222 &9147036965973640332
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1885110215741331779}
m_CullTransparentMesh: 0
--- !u!114 &2445538820196278634
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1885110215741331779}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
--- !u!1 &1908377789116595806
GameObject:
m_ObjectHideFlags: 0
@ -21707,7 +21819,7 @@ RectTransform:
m_Children:
- {fileID: 3975564085507874554}
- {fileID: 3121446583950298478}
- {fileID: 2593571354443773693}
- {fileID: 8288204256815441005}
- {fileID: 6149049650877901028}
- {fileID: 2561636573811736028}
m_Father: {fileID: 2423465471356683207}
@ -22437,6 +22549,7 @@ GameObject:
m_Component:
- component: {fileID: 2593571354443773693}
- component: {fileID: 4260212251028292622}
- component: {fileID: 8856333325285458253}
m_Layer: 5
m_Name: grid
m_TagString: Untagged
@ -22451,18 +22564,18 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5457833914455155806}
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_Children: []
m_Father: {fileID: 3849663331886650410}
m_RootOrder: 2
m_Father: {fileID: 8288204256815441005}
m_RootOrder: 0
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: -455.65002, y: 15.8}
m_SizeDelta: {x: 907.9, y: 1080.8}
m_Pivot: {x: 0, y: 0.5}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: -453.95, y: 0.00000030921947}
m_SizeDelta: {x: 907.9, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &4260212251028292622
MonoBehaviour:
m_ObjectHideFlags: 0
@ -22486,6 +22599,20 @@ MonoBehaviour:
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
m_ChildControlHeight: 0
--- !u!114 &8856333325285458253
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5457833914455155806}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 0
m_VerticalFit: 2
--- !u!1 &5486504090114868561
GameObject:
m_ObjectHideFlags: 0

View File

@ -4858,7 +4858,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
@ -5566,7 +5566,7 @@ 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: -3, y: 18}
m_AnchoredPosition: {x: -3, y: -7.76}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1678615009062229048
@ -20410,7 +20410,7 @@ 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: -3, y: 18}
m_AnchoredPosition: {x: -3, y: -7.76}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &2760722859159995628
@ -45881,7 +45881,7 @@ 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: -3, y: 18}
m_AnchoredPosition: {x: -3, y: -7.76}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &6135583457126003566
@ -45920,7 +45920,7 @@ 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: -3, y: 18}
m_AnchoredPosition: {x: -3, y: -7.76}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &6215982957646203541

View File

@ -80,7 +80,7 @@ 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: -0.90999985, y: 114.19994}
m_AnchoredPosition: {x: 5.21, y: 114.19994}
m_SizeDelta: {x: 43.07, y: 59.43}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1925641199812895373
@ -306,7 +306,7 @@ 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: -0.90999985, y: 114.19994}
m_AnchoredPosition: {x: 5.21, y: 114.19994}
m_SizeDelta: {x: 43.07, y: 59.43}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3167309878778146257
@ -5994,7 +5994,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -0.000038214017}
m_AnchoredPosition: {x: 0, y: -0.000016443777}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 1}
--- !u!114 &1537562228229781123
@ -6068,7 +6068,7 @@ 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: -0.90999985, y: 114.19994}
m_AnchoredPosition: {x: 5.21, y: 114.19994}
m_SizeDelta: {x: 43.07, y: 59.43}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7957820441571695271

View File

@ -601,6 +601,7 @@ SHOP_TYPE = {
SHIBUKEDANG_SHOP = 75,--势不可挡商店
XUANJIMIAOSUAN_SHOP = 76,--旋即妙算商店
QIJIE_SHOP = 81,--七界商店
honglushangdian = 87,
}
PropertyTypeIconDef = {
@ -1167,6 +1168,7 @@ JumpType = {
linglongBaojing = 10067,
JiTianHaoLi = 20014, --积天豪礼
honglushop = 20274
}
NPCPosType={
@ -2368,6 +2370,8 @@ RecruitType = {
PrayerSingle = 50, --限时召唤单抽
PrayerTen = 51, --限时召唤十连
tiandihonglu = 52, --天地洪炉
}
ItemBaseType = {
Special = 1, --特殊
@ -2513,6 +2517,8 @@ PRE_REWARD_POOL_TYPE = {
TIME_LIMITED_NEW=15,--限时招募
TIME_LIMITED_NEW_UP=16,--限时招募UP
LINGLONG = 17, --玲珑宝镜
TIANDIHONGLU = 18,--天地洪炉
TIANDIHONGLU_UP = 19,--天地洪炉
}
DirectBuyType = {
XSHL = 11,--限时豪礼

View File

@ -115,7 +115,19 @@ function this:OnShow(_parent,_Data)
UpItemList = {[1] = {Reward = {showData.monsterId,1},WeightShow = itemList[i].WeightShow}}
break
end
end
end
elseif activityType == ActivityTypeDef.tiandihonglu then
UpItemList = {}
itemList = RecruitManager.GetRewardPreviewData(poolType)
local souls = RecruitManager.GetWishTailsManSoulChips()
for i = 1,#itemList do
for k,v in pairs(souls) do
if itemList[i].Reward[1] == v then
table.insert(UpItemList,itemList[i])
break
end
end
end
else
UpItemList = RecruitManager.GetRewardPreviewData(poolUpType)
itemList = RecruitManager.GetRewardPreviewData(poolType)
@ -188,6 +200,14 @@ function this:BuildRateData(actType,UpItem,upItemList)
local itemConfig=ConfigManager.TryGetConfigData(ConfigName.ItemConfig, m.Reward[1])
table.insert(rateList,{id = m.Reward[1],tag = itemConfig.Name, name=m.Reward[2],value = m.Weight,color = "BDB69C" })
end
elseif actType == ActivityTypeDef.tiandihonglu then
LogGreen("#upItemList"..#upItemList)
for n,m in ipairs(upItemList) do
local itemConfig=ConfigManager.TryGetConfigData(ConfigName.ItemConfig, m.Reward[1])
table.insert(_upRateList,{id = m.Reward[1],tag = "法宝碎片UP!", name=itemConfig.Name,value = m.Weight,color = "AD4152"})
end
LogGreen("#_upRateList"..#_upRateList)
rateList = this:RefreshNewHeroRate(upItemList,_upRateList,"法宝碎片UP!",ConfigName.HeroConfig)
end
for k,v in ipairs(this.ratePreList) do

View File

@ -39,7 +39,10 @@ function this:OnShow(_parent)
sortingOrder = _parent.sortingOrder
self.selectData = RecruitManager.GetWishTailsManSoulChips()
self.curData = TailsManSoulManager.GetTailsmanSoulDatas(6)
this:RefreshData()
end
function this:RefreshData()
for i = 1, math.max(#itemList,#self.curData) do
if not self.curData[i] then
itemList[i].go.gameObject:SetActive(false)
@ -52,15 +55,15 @@ function this:OnShow(_parent)
itemList[i].selectBtn = Util.GetGameObject(itemList[i].go, "selectBtn")
itemList[i].itemGrid = Util.GetGameObject(itemList[i].go, "itemGrid")
itemList[i].items = {}
for i = 1,4 do
itemList[i].items[i] = {}
itemList[i].items[i].go = Util.GetGameObject(itemList[i].go, "ItemPos"..i):GetComponent("Text")
itemList[i].items[i].pos = Util.GetGameObject(itemList[i].items[i].go, "pos")
itemList[i].items[i].item = SubUIManager.Open(SubUIConfig.ItemView,itemList[i].items[i].pos.transform)
itemList[i].items[i].item.transform.localPosition = Vector3.zero
itemList[i].items[i].lv = Util.GetGameObject(itemList[i].items[i].go, "lvDi/Text"):GetComponent("Text")
itemList[i].items[i].select = Util.GetGameObject(itemList[i].items[i].go, "select")
itemList[i].items[i].go.gameObject:SetActive(false)
for j = 1,4 do
itemList[i].items[j] = {}
itemList[i].items[j].go = Util.GetGameObject(itemList[i].go, "ItemPos"..j)
itemList[i].items[j].pos = Util.GetGameObject(itemList[i].items[j].go.transform, "pos")
itemList[i].items[j].item = SubUIManager.Open(SubUIConfig.ItemView,itemList[i].items[j].pos.transform)
itemList[i].items[j].item.transform:GetComponent("RectTransform").anchoredPosition3D = Vector3.zero
itemList[i].items[j].lv = Util.GetGameObject(itemList[i].items[j].go, "lvDi/Text"):GetComponent("Text")
itemList[i].items[j].select = Util.GetGameObject(itemList[i].items[j].go, "select")
itemList[i].items[j].go.gameObject:SetActive(false)
end
end
itemList[i].go.gameObject:SetActive(true)
@ -70,14 +73,16 @@ function this:OnShow(_parent)
end)
Util.AddOnceClick(itemList[i].selectBtn,function()
MsgPanel.ShowTwo(string.format("确认选择%s作为心愿",self.curData[i].name), function()end, function()
NetManager.SendRefreshTailsmanSoulData(self.curData.trumpChipList,function()
self:OnShow(_parent)
end)
self.selectData = {}
for j = 1,#self.curData[i].trumpChipList do
table.insert(self.selectData,self.curData[i].trumpChipList[j])
end
this:RefreshData()
end, "取消", "确认", "提示",false,"")
end)
for j = 1,math.max(#itemList[i].items, #self.curData.trumpChipList) do
if not self.curData.trumpChipList[j] then
for j = 1,math.max(#itemList[i].items, #self.curData[i].trumpChipList) do
if not self.curData[i].trumpChipList[j] then
itemList[i].items[j].go.gameObject:SetActive(false)
else
if not itemList[i].items[j] then
@ -90,15 +95,15 @@ function this:OnShow(_parent)
itemList[i].items[j].select = Util.GetGameObject(itemList[i].items[j].go, "select")
end
itemList[i].items[j].go.gameObject:SetActive(true)
itemList[i].items[j].item:OnOpen(false,{self.curData.trumpChipList[j],0}, 1.1, true, false, false, sortingOrder + 1)
itemList[i].items[j].lv.text = TailsManSoulManager.GetTailsmanLvById(self.curData.trumpChipList[j])
itemList[i].items[j].select.gameObject:SetActive(this:CheckIsSelect(self.curData.trumpChipList[j]))
Util.AddOnceClick(itemList[i].items[j].go,function()
itemList[i].items[j].item:OnOpen(false,{self.curData[i].trumpChipList[j],0}, 1.1, true, false, false, sortingOrder + 1)
itemList[i].items[j].lv.text = TailsManSoulManager.GetTailsmanLvById(self.curData[i].trumpChipList[j])
itemList[i].items[j].select.gameObject:SetActive(this:CheckIsSelect(self.curData[i].trumpChipList[j]))
Util.AddOnceClick(itemList[i].items[j].pos,function()
if LengthOfTable(self.selectData >= 4) then
PopupTipPanel.ShowTip("心愿碎片最多为4个")
else
this:SetIsSelect(self.curData.trumpChipList[j])
itemList[i].items[j].select.gameObject:SetActive(this:CheckIsSelect(self.curData.trumpChipList[j]))
this:SetIsSelect(self.curData[i].trumpChipList[j])
itemList[i].items[j].select.gameObject:SetActive(this:CheckIsSelect(self.curData[i].trumpChipList[j]))
end
end)
end

View File

@ -278,17 +278,7 @@ function IncarnationPanel:SetSingleData(go,data,index)
end
self.itemPreList[go].red.gameObject:SetActive(data.state == 0)
self:RefreshSingleCardPre(self.itemPreList[go].cardPre,data,true,index)
self:SetProList(data.proDesList,self.itemPreList[go].preList,self.itemPreList[go].proGrid,self.itemPreList[go].pro.gameObject)
if data.state == -1 then
self.itemPreList[go].unGetBtn.gameObject:SetActive(true)
elseif data.state == 0 then
self.itemPreList[go].activableBtn.gameObject:SetActive(true)
elseif data.state == 1 then
self.itemPreList[go].incarnationBtn.gameObject:SetActive(true)
elseif data.state == 2 then
self.itemPreList[go].incarnationningBtn.gameObject:SetActive(true)
end
self:SetProList(data.proDesList,self.itemPreList[go].preList,self.itemPreList[go].proGrid,self.itemPreList[go].pro.gameObject)
Util.AddOnceClick(self.itemPreList[go].unGetBtn,function()
end)
@ -335,6 +325,16 @@ function IncarnationPanel:SetSingleData(go,data,index)
PopupTipPanel.ShowTip("成功卸下身外化身!")
end)
end)
if data.state == -1 then
self.itemPreList[go].unGetBtn.gameObject:SetActive(true)
elseif data.state == 0 then
self.itemPreList[go].activableBtn.gameObject:SetActive(true)
elseif data.state == 1 then
self.itemPreList[go].incarnationBtn.gameObject:SetActive(true)
elseif data.state == 2 then
self.itemPreList[go].incarnationningBtn.gameObject:SetActive(true)
end
end
function IncarnationPanel:SetProList(data,preList,grid,pre)

View File

@ -240,6 +240,7 @@ function this.PlayerInfoRequest(func)
-- 服务器开启时间
PlayerManager.SetServerOpenTime(msg.serverOpenTime)
TailsManSoulManager.SetTailsmanLv(msg.FaBaoSoulInfos)
if func then
func(msg)
end
@ -6186,11 +6187,13 @@ end
function NetManager.SendRefreshTailsmanSoulData(idlist,fun)
local data = ActivityProto_pb.TrumpGachaSelectItemRequest()
data.activityId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.tiandihonglu)
LogGreen("data.activityId:"..tostring(data.activityId))
for k,v in pairs(idlist) do
LogGreen("k:"..k.." v"..tostring(v))
data.selectIds:append(v)
end
local msg = data:SerializeToString()
Network:SendMessageWithCallBack(MessageTypeProto_pb.TRUMP_GACHA_SELECT_ITEM_REQUEST, MessageTypeProto_pb.TRUMP_GACHA_SELECT_ITEM_RESPONSE, nil, function(buffer)
Network:SendMessageWithCallBack(MessageTypeProto_pb.TRUMP_GACHA_SELECT_ITEM_REQUEST, MessageTypeProto_pb.TRUMP_GACHA_SELECT_ITEM_RESPONSE, msg, function(buffer)
RecruitManager.SetWishTailsManSoulChips(idlist)
Game.GlobalEvent:DispatchEvent(GameEvent.Activity.TailsmanSoulChipChange)
if fun then
@ -6205,8 +6208,12 @@ function NetManager.SendGetTailsmanSoulData(fun)
Network:SendMessageWithCallBack(MessageTypeProto_pb.GET_TRUMP_SELECT_ITEM_REQUEST, MessageTypeProto_pb.GET_TRUMP_SELECT_ITEM_RESPONSE, msg, function(buffer)
local data = buffer:DataByte()
local msg = ActivityProto_pb.GetTrumpSelectItemResponse()
msg:ParseFromString(data)
RecruitManager.SetWishTailsManSoulChips(msg.selectIds)
msg:ParseFromString(data)
local data1 = {}
for k,v in ipairs(msg.selectIds) do
table.insert(data1,v)
end
RecruitManager.SetWishTailsManSoulChips(data1)
if fun then
fun()
end

View File

@ -843,6 +843,9 @@ local jumpDic = {
end
end)
end,
[JumpType.honglushop] = function(data)
this.JumpActivity(JumpType.honglushop, data[1])
end,
}
function this.JumpActivity(data,skipfactor)

View File

@ -41,7 +41,9 @@ end
function this.SetWishTailsManSoulChips(_datas)
this.wishTailsManSoulChips = {}
LogGreen("#_datas:"..tostring(LengthOfTable(_datas) ))
for k,v in pairs(_datas) do
LogGreen("k:"..k.." v:"..tostring(v) )
table.insert(this.wishTailsManSoulChips,v)
end
end
@ -49,6 +51,7 @@ end
function this.GetWishTailsManSoulChips()
local datas = {}
for k,v in pairs(this.wishTailsManSoulChips) do
LogGreen("k:"..k.." v:"..v)
table.insert(datas,v)
end
return datas
@ -264,7 +267,8 @@ function this.GetRewardPreviewData(type)
elseif type==PRE_REWARD_POOL_TYPE.LOTTERY_SOUL--乾坤宝盒
or type==PRE_REWARD_POOL_TYPE.LOTTERY_SOUL_UP--乾坤宝盒UP
or type==PRE_REWARD_POOL_TYPE.LING_SHOU_UP--灵兽宝阁UP
or type==PRE_REWARD_POOL_TYPE.XIANG_YAO_UP then--降妖夺宝UP
or type==PRE_REWARD_POOL_TYPE.XIANG_YAO_UP
or type==PRE_REWARD_POOL_TYPE.TIANDIHONGLU then--降妖夺宝UP
return this.GetActivityPreviewData(type)--非常驻抽卡需要检测时间
elseif type==PRE_REWARD_POOL_TYPE.LINGLONG then --限时招募--开启时间有限制的
return this.GetLINGLONGPreviewData()
@ -306,6 +310,8 @@ function this.GetActivityPreviewData(type)--非常驻抽卡奖池预览
curActivityId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.LingShouBaoGe)
elseif type==PRE_REWARD_POOL_TYPE.XIANG_YAO_UP then
curActivityId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.XiangYaoDuoBao)
elseif type==PRE_REWARD_POOL_TYPE.TIANDIHONGLU then
curActivityId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.tiandihonglu)
end
local data = nil
if curActivityId ~= nil then --活动招募
@ -316,7 +322,7 @@ function this.GetActivityPreviewData(type)--非常驻抽卡奖池预览
end
local poolId = nil
if data ~= nil then
if type == PRE_REWARD_POOL_TYPE.LOTTERY_SOUL then--限时招募,乾坤宝盒
if type == PRE_REWARD_POOL_TYPE.LOTTERY_SOUL or type == PRE_REWARD_POOL_TYPE.TIANDIHONGLU then--限时招募,乾坤宝盒
poolId = data.DiamondBoxContain[1][1]
elseif type == PRE_REWARD_POOL_TYPE.LOTTERY_SOUL_UP then--限时招募UP乾坤宝盒UP
data = ConfigManager.GetConfigDataByKey(ConfigName.LotterySpecialConfig,"Type",data.MergePool)

View File

@ -51,12 +51,10 @@ function TailsmanSoulChipLottery:InitComponent()
self.icons[i].go = Util.GetGameObject(self.center,"icons/icon"..i)
self.icons[i].icon = Util.GetGameObject(self.icons[i].go,"frame/icon"):GetComponent("Image")
self.icons[i].kuang = Util.GetGameObject(self.icons[i].go,"kuang"):GetComponent("Image")
if i < 4 then
self.icons[i].effect=Util.GetGameObject(self.icons[i].go,"UI_effect_RecruitPanel_box_open")
end
self.icons[i].effect=Util.GetGameObject(self.icons[i].go,"UI_effect_RecruitPanel_box_open")
end
self.updateTimes = Util.GetGameObject(self.btns[1].btn,"di1")
self.updateTimes = Util.GetGameObject(self.gameObject,"updateTimes")
self.updateTimesTip = Util.GetGameObject(self.updateTimes,"Text"):GetComponent("Text")
self.updateTimesTip1 = Util.GetGameObject(self.updateTimes,"Text1"):GetComponent("Text")
end
@ -71,11 +69,11 @@ function TailsmanSoulChipLottery:BindEvent()
end)
Util.AddOnceClick(self.btnReward, function()
UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.RecrutDetail,self.actConfig.HelpId,self.actType,PRE_REWARD_POOL_TYPE.LOTTERY_SOUL_UP,PRE_REWARD_POOL_TYPE.LOTTERY_SOUL)
UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.RecrutDetail,self.actConfig.HelpId,self.actType,PRE_REWARD_POOL_TYPE.TIANDIHONGLU_UP,PRE_REWARD_POOL_TYPE.TIANDIHONGLU)
end)
Util.AddOnceClick(self.btnStore, function()
--JumpManager.GoJump()
JumpManager.GoJump(40047)
end)
Util.AddOnceClick(self.btn_soul, function()
@ -220,17 +218,10 @@ function TailsmanSoulChipLottery:refreshBtnShow()
return
end
end
local state = PlayerPrefs.GetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.QianKunBoxTen)
local recrutId = n == 1 and self.singleRecruit.Id or self.tenRecruit.Id
local recrutNum = n == 1 and 1 or 10
local uiName = n == 1 and UIName.QianKunBoxBuyOnePanel or UIName.QianKunBoxBuyTenPanel
if state==0 and itemId == 16 and not isFree then
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,recrutId,function()
self:Recruit(recrutNum,recrutId,uiName)
end)
else
self:Recruit(recrutNum,recrutId,uiName)
end
self:Recruit(recrutNum,recrutId,uiName)
end)
end
end
@ -250,6 +241,7 @@ end
--五个魂印头像
function TailsmanSoulChipLottery:contentShow()
wishSoulData = RecruitManager.GetWishTailsManSoulChips()
LogGreen("self.singleRecruit.DiamondBoxContain[1][1]:"..tostring(self.singleRecruit.DiamondBoxContain[1][1]))
local iconsData = ConfigManager.GetAllConfigsDataByKey(ConfigName.LotteryRewardConfig,"Pool",self.singleRecruit.DiamondBoxContain[1][1])
if wishSoulData and #wishSoulData > 0 then
else
@ -258,14 +250,18 @@ function TailsmanSoulChipLottery:contentShow()
table.insert(li,iconsData[i].Reward[1])
end
RecruitManager.SetWishTailsManSoulChips(li)
wishSoulData = RecruitManager.GetWishTailsManSoulChips()
end
--如果没有默认数值,默认的就是表里面的请三个魂印
if wishSoulData and #wishSoulData~=0 then
if wishSoulData and #wishSoulData > 0 then
for i = 1, #self.icons do
if i<=#wishSoulData then
if i <= #wishSoulData then
self.icons[i].icon.gameObject:SetActive(true)
self.icons[i].kuang.gameObject:SetActive(true)
local id=wishSoulData[i]
LogGreen("wishSoulData[i]:"..tostring(wishSoulData[i]))
local id = wishSoulData[i]
LogGreen("id:"..tostring(id))
self.icons[i].icon.sprite = self.spLoader:LoadSprite(artConfig[itemConfig[id].ResourceID].Name)
self.icons[i].kuang.sprite = self.spLoader:LoadSprite(SoulPrintSpriteByQuantity[itemConfig[id].Quantity].circle)
--点击能查看魂印信息

View File

@ -162,7 +162,7 @@ function ShopViewNew:OnShow(_sortingOrder)
end
self.ShopType = self.actConfig.ShopData[1][1]
LogYellow("self.ShopType:"..tostring(self.ShopType))
if self.ShopType == SHOP_TYPE.QIANKUNBOX_SHOP then
if self.ShopType == SHOP_TYPE.QIANKUNBOX_SHOP or self.ShopType == SHOP_TYPE.honglushangdian then
self.parent.tabbox.gameObject:SetActive(false)
else
self.parent.tabbox.gameObject:SetActive(true)