【家园+易经宝库】提交

dev_chengFeng
ZhangBiao 2022-01-06 18:42:20 +08:00
parent a46e3263b7
commit 54b01f4d86
3 changed files with 24 additions and 24 deletions

View File

@ -2940,7 +2940,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: -93, y: 647}
m_AnchoredPosition: {x: -90, y: 686}
m_SizeDelta: {x: 450, y: 300}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5608564664693609033
@ -3814,7 +3814,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &8801044181696536146
RectTransform:
m_ObjectHideFlags: 0
@ -4190,10 +4190,10 @@ RectTransform:
m_Father: {fileID: 4322729524025985070}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 325, y: 0}
m_SizeDelta: {x: 650, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 325, y: -55}
m_SizeDelta: {x: 650, y: 70}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1499828341711153185
MonoBehaviour:
@ -6217,7 +6217,7 @@ RectTransform:
m_GameObject: {fileID: 2556594935014367343}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.35, y: 0.35, z: 0.35}
m_LocalScale: {x: 0.4, y: 0.4, z: 0.4}
m_Children:
- {fileID: 6462035359905128780}
- {fileID: 5543262470124619058}
@ -8472,7 +8472,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: -276, y: -354}
m_AnchoredPosition: {x: -256, y: -372}
m_SizeDelta: {x: 450, y: 300}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8405509159428349271
@ -17255,7 +17255,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: 300, y: -436}
m_AnchoredPosition: {x: 304, y: -454}
m_SizeDelta: {x: 450, y: 300}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &705124627525135266
@ -19620,9 +19620,9 @@ RectTransform:
m_Father: {fileID: 4322729524025985070}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 325, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 325, y: -132}
m_SizeDelta: {x: 650, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &4252301830560688640
@ -23498,10 +23498,10 @@ RectTransform:
m_Father: {fileID: 4322729524025985070}
m_RootOrder: 1
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: 580, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 325, y: -111}
m_SizeDelta: {x: 580, y: 2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1365824058889495408
CanvasRenderer:
@ -23601,7 +23601,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: -225, y: 44}
m_AnchoredPosition: {x: -223, y: 24}
m_SizeDelta: {x: 450, y: 300}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6945343026529794531
@ -23714,7 +23714,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 148, y: 81}
m_SizeDelta: {x: 650, y: 0}
m_SizeDelta: {x: 650, y: 182}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7396113761718134804
CanvasRenderer:
@ -24588,7 +24588,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: 141, y: 197}
m_AnchoredPosition: {x: 124, y: 217}
m_SizeDelta: {x: 450, y: 300}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6553614271447279463

View File

@ -211,7 +211,7 @@ function this.GetBaoKuData()
data.reward = RewardAllConfig[v.progress].Reward
data.configId = RewardAllConfig[v.progress].Id
end
LogGreen("Id:"..v.missionId.." rewardId:"..v.progress.." ")
-- LogGreen("Id:"..v.missionId.." rewardId:"..v.progress.." ")
table.insert(finalCardDatas,data)
end
end
@ -230,7 +230,7 @@ function this.GetBaoKuData()
local data = {}
data.rewardId = v.missionId-1000
data.progress = v.progress
LogYellow("rewardId:"..data.rewardId.." data.progress:"..data.progress)
-- LogYellow("rewardId:"..data.rewardId.." data.progress:"..data.progress)
data.configId = RewardAllConfig[data.rewardId].Id
table.insert(allData,data)
end
@ -285,10 +285,10 @@ function this.GetLeftRewardData()
data[RewardConfig[i].Id].limit = RewardConfig[i].InitializeNum
end
LogYellow("#finalCardDatas:"..#finalCardDatas.." actData.selectId:"..actData.selectId)
-- LogYellow("#finalCardDatas:"..#finalCardDatas.." actData.selectId:"..actData.selectId)
for i = 1, #finalCardDatas do
if finalCardDatas[i].rewardId and finalCardDatas[i].rewardId ~= 0 and finalCardDatas[i].rewardId ~= actData.selectId then
LogYellow("i:"..i.." rewardId:"..tostring(finalCardDatas[i].rewardId) .." progress"..tonumber(data[finalCardDatas[i].rewardId].progress))
-- LogYellow("i:"..i.." rewardId:"..tostring(finalCardDatas[i].rewardId) .." progress"..tonumber(data[finalCardDatas[i].rewardId].progress))
data[finalCardDatas[i].rewardId].progress = data[finalCardDatas[i].rewardId].progress - 1
end
end

View File

@ -139,7 +139,7 @@ function this:SetSingleData(index,item,data)
-- LogRed(aData.rewardId..""..tostring(aData.progress))
if not aData then--2022/1/6 易经宝库增加层数容错
aData = {}
aData.progress = data.InitializeNum
aData.progress = 0
end
if aData.progress >= data.InitializeNum then
t3 = false