主城推送礼包修改,挂机界面地方大小修改
parent
4e74858e66
commit
86782b5253
|
|
@ -12,22 +12,22 @@ ANIMATION = {
|
|||
|
||||
MapFloatingConfig = {
|
||||
[0] = {name = "live2d_npc_mao_difang",
|
||||
scale = Vector3.New(0.85, 0.85, 0.85),
|
||||
scale = Vector3.New(0.23, 0.23, 0.23),
|
||||
position = Vector3.New(0, -10, 0)},
|
||||
[1] = {name = "live2d_npc_mao_difang",
|
||||
scale = Vector3.New(0.85, 0.85, 0.85),
|
||||
scale = Vector3.New(0.23, 0.23, 0.23),
|
||||
position = Vector3.New(0, -10, 0)},
|
||||
[2] = {name = "live2d_npc_mao_difang",
|
||||
scale = Vector3.New(0.1, 0.1, 0.1),
|
||||
scale = Vector3.New(0.23, 0.23, 0.23),
|
||||
position = Vector3.New(0, 40, 0)},
|
||||
[3] = {name = "live2d_npc_mao_difang",
|
||||
scale = Vector3.New(0.1, 0.1, 0.1),
|
||||
scale = Vector3.New(0.23, 0.23, 0.23),
|
||||
position = Vector3.New(0, 32, 0)},
|
||||
[4] = {name = "live2d_npc_mao_difang",
|
||||
scale = Vector3.New(1, 1, 1),
|
||||
scale = Vector3.New(0.23, 0.23, 0.23),
|
||||
position = Vector3.New(-130, -5,0)},
|
||||
[5] = {name = "live2d_npc_mao_difang",
|
||||
scale = Vector3.New(0.85, 0.85, 0.85),
|
||||
scale = Vector3.New(0.23, 0.23, 0.23),
|
||||
position = Vector3.New(0, -10, 0)},
|
||||
[6] = {name = "live2d_npc_mao_difang",
|
||||
scale = Vector3.New(0.2, 0.2, 0.2),
|
||||
|
|
@ -43,7 +43,7 @@ MapFloatingConfig = {
|
|||
|
||||
position = Vector3.New(0, -26,0)},
|
||||
[10] = {name = "live2d_npc_mao_difang",
|
||||
scale = Vector3.New(0.8, 0.8, 0.8),
|
||||
scale = Vector3.New(0.23, 0.23, 0.23),
|
||||
position = Vector3.New(0, -14, 0)},
|
||||
[11] = {name = "r_Map_NewEvent_004",
|
||||
scale = Vector3.New(1, 1, 1),
|
||||
|
|
@ -52,7 +52,7 @@ MapFloatingConfig = {
|
|||
scale = Vector3.New(0.08, 0.08, 0.08),
|
||||
position = Vector3.New(0, 40, 0)},
|
||||
[13] = {name = "live2d_npc_mao_difang",
|
||||
scale = Vector3.New(0.8, 0.8, 0.8),
|
||||
scale = Vector3.New(0.25, 0.25, 0.25),
|
||||
position = Vector3.New(0, -28, 0)},
|
||||
[14] = {name = "r_Map_NewEvent_011",--buff宝剑
|
||||
scale = Vector3.New(1.2, 1.2, 1.2),
|
||||
|
|
@ -63,8 +63,8 @@ MapFloatingConfig = {
|
|||
[16] = {name = "r_Map_NewEvent_013",--buff六芒星
|
||||
scale = Vector3.New(1.2, 1.2, 1.2),
|
||||
position = Vector3.New(0, 48, 0)},
|
||||
[17] = {name = "live2d_r_Map_NewEvent_015",--数独NPC
|
||||
scale = Vector3.New(0.1, 0.1, 0.1),
|
||||
[17] = {name = "live2d_npc_mao_difang",--数独NPC
|
||||
scale = Vector3.New(0.23, 0.23, 0.23),
|
||||
position = Vector3.New(0, 40, 0)},
|
||||
[18] = {name = "live2d_tiangongboss",--转盘NPC
|
||||
scale = Vector3.New(0.1, 0.1, 0.1),
|
||||
|
|
|
|||
|
|
@ -946,18 +946,26 @@ function this.GetInfoList(showData)
|
|||
end
|
||||
local giftList2 = {}
|
||||
for i = 1,#showData[1] do
|
||||
local infoList2 = ConfigManager.GetAllConfigsDataByKey(ConfigName.RechargeCommodityConfig,"ShowType",showData[1][i])
|
||||
for i = 1, #infoList2 do
|
||||
table.insert(giftList2,infoList2[i])
|
||||
local infoList2 = ConfigManager.TryGetAllConfigsDataByKey(ConfigName.RechargeCommodityConfig,"ShowType",showData[1][i])
|
||||
if infoList2 then
|
||||
for i = 1, #infoList2 do
|
||||
table.insert(giftList2,infoList2[i])
|
||||
end
|
||||
else
|
||||
LogError("没有ShowType的推送礼包====="..showData[1][i])
|
||||
end
|
||||
|
||||
end
|
||||
for index, value in pairs(infoList) do
|
||||
for i = 1, #giftList2 do
|
||||
if giftList2[i].Id == value.goodsId and value.dynamicBuyTimes > 0 then
|
||||
table.insert(giftList,value)
|
||||
if infoList then
|
||||
for index, value in pairs(infoList) do
|
||||
for i = 1, #giftList2 do
|
||||
if giftList2[i].Id == value.goodsId and value.dynamicBuyTimes > 0 then
|
||||
table.insert(giftList,value)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
return giftList
|
||||
end
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue