root
/
miduo_client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/china/dev-c' into china/dev

dev_chengFeng
gaoxin 2021-04-26 20:49:43 +08:00
parent 357a27c100 cf1cf818e2
commit 854c11affc
7 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/ManagedResources/Prefabs/UI/NewActivity/ConRechargePage.prefab
View File

@ -34,8 +34,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: 0, y: -398.7}
m_SizeDelta: {x: 1040, y: 842.2}
m_AnchoredPosition: {x: 0, y: -375.7}
m_SizeDelta: {x: 1040, y: 796.1}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2720652094624033988
CanvasRenderer:

4
Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua
View File

@ -286,6 +286,8 @@ end
-- 初始化
function this.InitPanelData()
this.dmg2:SetActive(fightType == BATTLE_TYPE.XINJIANG)
this.dmg3:SetActive(fightType == BATTLE_TYPE.TASUILINGXIAO)
if fightType == BATTLE_TYPE.GUILD_BOSS and fightType == BATTLE_TYPE.GUILD_CAR_DELAY then
this.myDamage = 0
this.myDamageLevel = 0
@ -299,7 +301,6 @@ function this.InitPanelData()
end)
end
elseif fightType == BATTLE_TYPE.XINJIANG then
this.dmg2:SetActive(fightType == BATTLE_TYPE.XINJIANG)
boxList[1]:SetActive(true)
this.myDamage = 0
this.myDamageLevel = 0
@ -319,7 +320,6 @@ function this.InitPanelData()
local actData = CommonActPageManager.GetData(ActivityTypeDef.TaSuiLingXiao)
local boxs = ConfigManager.GetConfigDataByKey(ConfigName.NewHeroConfig,"Id",actData.activityId).BoxList
local maxDmg = actData.value
this.dmg3:SetActive(fightType == BATTLE_TYPE.TASUILINGXIAO)
this.myDamage = 0
this.myDamageLevel = 0
this.dmg3Text.text = string.format("0/%s",boxs[1][1])

4
Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua
View File

@ -489,9 +489,9 @@ function this.GetGiftDataByType(ShopData)
if ShopData[i][1] == DataType.Direct and RECHARGEABLE then
local topspeedData = this.ResetShopData(OperatingManager.GetGiftGoodsInfoList(ShopData[i][2]), ShopData[i][3], ShopData[i][1])
for i = 1, #topspeedData do
if lv >= topspeedData[i].data.shopItemData.LevelLinit[1] and lv <= topspeedData[i].data.shopItemData.LevelLinit[2] then
-- if lv >= topspeedData[i].data.shopItemData.LevelLinit[1] and lv <= topspeedData[i].data.shopItemData.LevelLinit[2] then
table.insert(shopData,topspeedData[i])
end
-- end
end
elseif ShopData[i][1] == DataType.Shop then
local topspeedData = this.ResetShopData(ShopManager.GetShopDataByType(ShopData[i][2]).storeItem, ShopData[i][2], ShopData[i][1])

17
Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua
View File

@ -67,14 +67,23 @@ function this.GetFrontPatFaceAllDataTabs()
end
--检测所有拍脸
function this.GetPatFaceAllDataTabs()
local curAllDatas = {}
local backData = this.GetBackPatFaceDaqta()
-- LogGreen("backData "..#backData)
local FrontData = this.GetFrontPatFaceAllDataTabs()
if FrontData and #FrontData > 0 then
for i = 1, #FrontData do
table.insert(backData,FrontData[i])
-- LogGreen("FrontData "..#FrontData)
if backData and #backData > 0 then
for i = 1, #backData do
table.insert(curAllDatas,backData[i])
end
end
return backData
if FrontData and #FrontData > 0 then
for i = 1, #FrontData do
table.insert(curAllDatas,FrontData[i])
end
end
-- LogGreen("curAllDatas "..#curAllDatas)
return curAllDatas
end
function this.PatFaceSpecialMonitorOpenRules(v,patFaceAllData,type,starUpGiftNum)
--1等级 2关卡 3特劝等级 4功能开启时 5活动开启时 6公会战状态 7条件触发(事件)

3
Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua
View File

@ -108,14 +108,13 @@ function this.GetExpertData(indexType,actType)
if curData.rewards[i].missionId == actRewardConfigs[j].Id then
if indexType == 3 then -- 3 积天豪礼
curData.rewards[i].otherData.Values = actRewardConfigs[j].Values[1][2]
curData.rewards[i].otherData.info = string.format("%s/%s",curData.rewards[i].otherData.Values,curData.rewards[i].otherData.Values)
curData.rewards[i].otherData.info = ""
if curData.rewards[i].state == 1 then
curData.rewards[i].otherData.state = 2
elseif curData.rewards[i].progress == 1 then
curData.rewards[i].otherData.state = 0
else
curData.rewards[i].otherData.state = 1
curData.rewards[i].otherData.info = string.format("%s/%s",curData.rewards[i].progress,curData.rewards[i].otherData.Values)
end
else --日累计充值 达人
if actType == ActivityTypeDef.AccumulativeRechargeExper then

3
Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua
View File

@ -141,7 +141,8 @@ function this.GetGiftGoodsInfoList(type)
end
local newGiftGoodsInfoList = {}
for k,v in pairs(giftGoodsInfoList[type]) do
if rechargeConfig[v.goodsId] and PlayerManager.level >= rechargeConfig[v.goodsId].LevelLinit[1] and PlayerManager.level <= rechargeConfig[v.goodsId].LevelLinit[2] then
--and PlayerManager.level >= rechargeConfig[v.goodsId].LevelLinit[1] and PlayerManager.level <= rechargeConfig[v.goodsId].LevelLinit[2]
if rechargeConfig[v.goodsId] then
table.insert(newGiftGoodsInfoList,v)
end
end

4
Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua
View File

@ -170,7 +170,9 @@ end
--- 根据是否购买了显示信息
function UpperMonthCard:SetBuyState()
local isActive = VipManager.GetMonthCardOpenState()
local isBought = OperatingManager.IsBaseBuy(self.chargerBaseType)
-- local isBought = OperatingManager.IsBaseBuy(self.chargerBaseType)
local canBuyNum = OperatingManager.GetLeftBuyTime(self.chargerBaseType, self.baseType)
local isBought = canBuyNum and canBuyNum <= 0
self.boughtPanel:SetActive(isBought)
self.buyPanel:SetActive(not isBought)
Util.SetGray(self.btnBuy, not isActive)