Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
d1fd538542
Binary file not shown.
|
@ -0,0 +1,43 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: a95fc61b57483024482511a9f0354b52
|
||||||
|
AudioImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 6
|
||||||
|
defaultSettings:
|
||||||
|
loadType: 0
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 44100
|
||||||
|
compressionFormat: 1
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
platformSettingOverrides:
|
||||||
|
1:
|
||||||
|
loadType: 2
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 44100
|
||||||
|
compressionFormat: 1
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
4:
|
||||||
|
loadType: 2
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 44100
|
||||||
|
compressionFormat: 1
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
7:
|
||||||
|
loadType: 2
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 44100
|
||||||
|
compressionFormat: 1
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
forceToMono: 0
|
||||||
|
normalize: 1
|
||||||
|
preloadAudioData: 1
|
||||||
|
loadInBackground: 0
|
||||||
|
ambisonic: 0
|
||||||
|
3D: 1
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
Binary file not shown.
|
@ -0,0 +1,43 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 5d638ffe41f70954ca214c0489c8dea5
|
||||||
|
AudioImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 6
|
||||||
|
defaultSettings:
|
||||||
|
loadType: 0
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 44100
|
||||||
|
compressionFormat: 1
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
platformSettingOverrides:
|
||||||
|
1:
|
||||||
|
loadType: 2
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 44100
|
||||||
|
compressionFormat: 1
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
4:
|
||||||
|
loadType: 2
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 44100
|
||||||
|
compressionFormat: 1
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
7:
|
||||||
|
loadType: 2
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 44100
|
||||||
|
compressionFormat: 1
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
forceToMono: 0
|
||||||
|
normalize: 1
|
||||||
|
preloadAudioData: 1
|
||||||
|
loadInBackground: 0
|
||||||
|
ambisonic: 0
|
||||||
|
3D: 1
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
Binary file not shown.
|
@ -0,0 +1,43 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 607fa824c00315f4bb1129a855fb18f4
|
||||||
|
AudioImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 6
|
||||||
|
defaultSettings:
|
||||||
|
loadType: 0
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 44100
|
||||||
|
compressionFormat: 1
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
platformSettingOverrides:
|
||||||
|
1:
|
||||||
|
loadType: 2
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 44100
|
||||||
|
compressionFormat: 1
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
4:
|
||||||
|
loadType: 2
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 44100
|
||||||
|
compressionFormat: 1
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
7:
|
||||||
|
loadType: 2
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 44100
|
||||||
|
compressionFormat: 1
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
forceToMono: 0
|
||||||
|
normalize: 1
|
||||||
|
preloadAudioData: 1
|
||||||
|
loadInBackground: 0
|
||||||
|
ambisonic: 0
|
||||||
|
3D: 1
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
Binary file not shown.
|
@ -0,0 +1,43 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: b41cf89345421ae42a5f546bf16ff4a7
|
||||||
|
AudioImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 6
|
||||||
|
defaultSettings:
|
||||||
|
loadType: 0
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 44100
|
||||||
|
compressionFormat: 1
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
platformSettingOverrides:
|
||||||
|
1:
|
||||||
|
loadType: 2
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 44100
|
||||||
|
compressionFormat: 1
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
4:
|
||||||
|
loadType: 2
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 44100
|
||||||
|
compressionFormat: 1
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
7:
|
||||||
|
loadType: 2
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 44100
|
||||||
|
compressionFormat: 1
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
forceToMono: 0
|
||||||
|
normalize: 1
|
||||||
|
preloadAudioData: 1
|
||||||
|
loadInBackground: 0
|
||||||
|
ambisonic: 0
|
||||||
|
3D: 1
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
Binary file not shown.
|
@ -0,0 +1,43 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 8a86d878443205748bdb8d4918637000
|
||||||
|
AudioImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 6
|
||||||
|
defaultSettings:
|
||||||
|
loadType: 0
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 44100
|
||||||
|
compressionFormat: 1
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
platformSettingOverrides:
|
||||||
|
1:
|
||||||
|
loadType: 2
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 44100
|
||||||
|
compressionFormat: 1
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
4:
|
||||||
|
loadType: 2
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 44100
|
||||||
|
compressionFormat: 1
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
7:
|
||||||
|
loadType: 2
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 44100
|
||||||
|
compressionFormat: 1
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
forceToMono: 0
|
||||||
|
normalize: 1
|
||||||
|
preloadAudioData: 1
|
||||||
|
loadInBackground: 0
|
||||||
|
ambisonic: 0
|
||||||
|
3D: 1
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
Binary file not shown.
|
@ -0,0 +1,43 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 707a23b215f3aee44936f3d0fe8851aa
|
||||||
|
AudioImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 6
|
||||||
|
defaultSettings:
|
||||||
|
loadType: 0
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 44100
|
||||||
|
compressionFormat: 1
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
platformSettingOverrides:
|
||||||
|
1:
|
||||||
|
loadType: 2
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 44100
|
||||||
|
compressionFormat: 1
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
4:
|
||||||
|
loadType: 2
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 44100
|
||||||
|
compressionFormat: 1
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
7:
|
||||||
|
loadType: 2
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 44100
|
||||||
|
compressionFormat: 1
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
forceToMono: 0
|
||||||
|
normalize: 1
|
||||||
|
preloadAudioData: 1
|
||||||
|
loadInBackground: 0
|
||||||
|
ambisonic: 0
|
||||||
|
3D: 1
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
|
@ -622,7 +622,7 @@ RedPointType = {
|
||||||
Shop_Tab_Roam = 25350,
|
Shop_Tab_Roam = 25350,
|
||||||
---========= 商店红点
|
---========= 商店红点
|
||||||
Shop_General_Check = 253100,
|
Shop_General_Check = 253100,
|
||||||
Shop_General_Refresh = 253101,
|
-- Shop_General_Refresh = 253101,
|
||||||
Shop_Secret_Check = 253200,
|
Shop_Secret_Check = 253200,
|
||||||
Shop_Arena_Check = 253300,
|
Shop_Arena_Check = 253300,
|
||||||
Shop_Guild_Check = 253310,
|
Shop_Guild_Check = 253310,
|
||||||
|
@ -916,8 +916,9 @@ ActivityTypeDef = {
|
||||||
OnlineGift = 1, --在线奖励
|
OnlineGift = 1, --在线奖励
|
||||||
SevenDayRegister = 2, --七日登录
|
SevenDayRegister = 2, --七日登录
|
||||||
ChapterAward = 3, --章节奖励
|
ChapterAward = 3, --章节奖励
|
||||||
FirstRecharge = 4, --首充
|
-- FirstRecharge = 4, --首充
|
||||||
AccumulativeRecharge = 5, --累计充值
|
-- AccumulativeRecharge = 5, --累计充值
|
||||||
|
FirstRecharge = 5, --首充
|
||||||
GrowthReward = 6, --成长礼金
|
GrowthReward = 6, --成长礼金
|
||||||
Pray = 7, --云梦祈福
|
Pray = 7, --云梦祈福
|
||||||
TreasureOfSomeBody = 8,--孙龙的宝藏
|
TreasureOfSomeBody = 8,--孙龙的宝藏
|
||||||
|
|
|
@ -45,7 +45,7 @@ function DayRewardItem:SetValue(context,_sortingOrder)
|
||||||
-- self.receivedFlag:SetActive(false)
|
-- self.receivedFlag:SetActive(false)
|
||||||
-- --self.redPoint:SetActive(false)
|
-- --self.redPoint:SetActive(false)
|
||||||
--else
|
--else
|
||||||
local activityInfo = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.AccumulativeRecharge)
|
local activityInfo = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.FirstRecharge)
|
||||||
local AccumRecharge = 0
|
local AccumRecharge = 0
|
||||||
for _, missInfo in pairs(activityInfo.mission) do
|
for _, missInfo in pairs(activityInfo.mission) do
|
||||||
if missInfo and missInfo.progress then
|
if missInfo and missInfo.progress then
|
||||||
|
@ -79,7 +79,7 @@ function DayRewardItem:SetValue(context,_sortingOrder)
|
||||||
end
|
end
|
||||||
|
|
||||||
function DayRewardItem:OnReceivedBtnClicked()
|
function DayRewardItem:OnReceivedBtnClicked()
|
||||||
NetManager.GetActivityRewardRequest(self.context.Id,ActivityTypeDef.AccumulativeRecharge, function(drop)
|
NetManager.GetActivityRewardRequest(self.context.Id,ActivityTypeDef.FirstRecharge, function(drop)
|
||||||
UIManager.OpenPanel(UIName.RewardItemPopup, drop, 1)
|
UIManager.OpenPanel(UIName.RewardItemPopup, drop, 1)
|
||||||
ActivityGiftManager.SetActivityInfo(self.context.ActivityId, self.context.Id, 1)
|
ActivityGiftManager.SetActivityInfo(self.context.ActivityId, self.context.Id, 1)
|
||||||
self.receiveBtn.gameObject:SetActive(false)
|
self.receiveBtn.gameObject:SetActive(false)
|
||||||
|
|
|
@ -20,7 +20,7 @@ end
|
||||||
function this.GetFirstRechargeRedPointStatus()
|
function this.GetFirstRechargeRedPointStatus()
|
||||||
local redPoint = false
|
local redPoint = false
|
||||||
if ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FirstRecharge) then
|
if ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FirstRecharge) then
|
||||||
if ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.AccumulativeRecharge) then
|
if ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FirstRecharge) then
|
||||||
redPoint = redPoint or this.GetSixMoneyTabRedPointStatus()
|
redPoint = redPoint or this.GetSixMoneyTabRedPointStatus()
|
||||||
redPoint = redPoint or this.GetHundredTabRedPointStatus()
|
redPoint = redPoint or this.GetHundredTabRedPointStatus()
|
||||||
end
|
end
|
||||||
|
@ -31,7 +31,7 @@ end
|
||||||
function this.GetSixMoneyTabRedPointStatus()
|
function this.GetSixMoneyTabRedPointStatus()
|
||||||
local redPoint = false
|
local redPoint = false
|
||||||
for _, rewardInfo in ConfigPairs(activityRewardConfig) do
|
for _, rewardInfo in ConfigPairs(activityRewardConfig) do
|
||||||
if rewardInfo.ActivityId == ActivityTypeDef.AccumulativeRecharge and
|
if rewardInfo.ActivityId == ActivityTypeDef.FirstRecharge and
|
||||||
rewardInfo.Values[1][1] == IndexValueDef[1] then
|
rewardInfo.Values[1][1] == IndexValueDef[1] then
|
||||||
redPoint = redPoint or this.GetDayItemRedPoint(rewardInfo)
|
redPoint = redPoint or this.GetDayItemRedPoint(rewardInfo)
|
||||||
end
|
end
|
||||||
|
@ -42,7 +42,7 @@ end
|
||||||
function this.GetHundredTabRedPointStatus()
|
function this.GetHundredTabRedPointStatus()
|
||||||
local redPoint = false
|
local redPoint = false
|
||||||
for _, rewardInfo in ConfigPairs(activityRewardConfig) do
|
for _, rewardInfo in ConfigPairs(activityRewardConfig) do
|
||||||
if rewardInfo.ActivityId == ActivityTypeDef.AccumulativeRecharge and
|
if rewardInfo.ActivityId == ActivityTypeDef.FirstRecharge and
|
||||||
rewardInfo.Values[1][1] == IndexValueDef[2] then
|
rewardInfo.Values[1][1] == IndexValueDef[2] then
|
||||||
redPoint = redPoint or this.GetDayItemRedPoint(rewardInfo)
|
redPoint = redPoint or this.GetDayItemRedPoint(rewardInfo)
|
||||||
end
|
end
|
||||||
|
@ -51,7 +51,7 @@ function this.GetHundredTabRedPointStatus()
|
||||||
end
|
end
|
||||||
|
|
||||||
function this.GetDayItemRedPoint(context)
|
function this.GetDayItemRedPoint(context)
|
||||||
local activityInfo = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.AccumulativeRecharge)
|
local activityInfo = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.FirstRecharge)
|
||||||
local AccumRecharge = 0
|
local AccumRecharge = 0
|
||||||
for _, missInfo in pairs(activityInfo.mission) do
|
for _, missInfo in pairs(activityInfo.mission) do
|
||||||
if missInfo and missInfo.progress then
|
if missInfo and missInfo.progress then
|
||||||
|
@ -71,7 +71,7 @@ function this.GetDayItemRedPoint(context)
|
||||||
local day = GetTimePass(this.GetRechargeTime())
|
local day = GetTimePass(this.GetRechargeTime())
|
||||||
--local day = GetTimePass(math.floor(GetTimeStamp()))
|
--local day = GetTimePass(math.floor(GetTimeStamp()))
|
||||||
if context.Values[1][2] <= day then
|
if context.Values[1][2] <= day then
|
||||||
local state = ActivityGiftManager.GetActivityInfo(ActivityTypeDef.AccumulativeRecharge, context.Id).state
|
local state = ActivityGiftManager.GetActivityInfo(ActivityTypeDef.FirstRecharge, context.Id).state
|
||||||
return state ~= 1
|
return state ~= 1
|
||||||
else
|
else
|
||||||
return false
|
return false
|
||||||
|
@ -85,7 +85,7 @@ end
|
||||||
|
|
||||||
function this.GetReceiveAll()
|
function this.GetReceiveAll()
|
||||||
local condition = true
|
local condition = true
|
||||||
local activityInfo = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.AccumulativeRecharge)
|
local activityInfo = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.FirstRecharge)
|
||||||
if activityInfo then
|
if activityInfo then
|
||||||
for i = 1, #activityInfo.mission do
|
for i = 1, #activityInfo.mission do
|
||||||
local rechargeInfo = activityInfo.mission[i]
|
local rechargeInfo = activityInfo.mission[i]
|
||||||
|
@ -147,5 +147,12 @@ end
|
||||||
function this.GetRechargeTime()
|
function this.GetRechargeTime()
|
||||||
return rechargeTime
|
return rechargeTime
|
||||||
end
|
end
|
||||||
|
--设置红点存储本地
|
||||||
|
function this.PlayerPrefsSetStrItemId(val)
|
||||||
|
PlayerPrefs.SetInt(PlayerManager.uid.."FirstRechatgePace", val)
|
||||||
|
end
|
||||||
|
--获得红点信息
|
||||||
|
function this.PlayerPrefsGetStrItemId()
|
||||||
|
return PlayerPrefs.GetInt(PlayerManager.uid.."FirstRechatgePace", 0)--1 已经查看过不需要显示新红点 0 显示红点
|
||||||
|
end
|
||||||
return this
|
return this
|
|
@ -81,7 +81,7 @@ function FirstRechargePanel:BindEvent()
|
||||||
Util.AddClick(self.tenProBtn, function()
|
Util.AddClick(self.tenProBtn, function()
|
||||||
local heroId = 0
|
local heroId = 0
|
||||||
for _, rewardInfo in ConfigPairs(activityRewardConfig) do
|
for _, rewardInfo in ConfigPairs(activityRewardConfig) do
|
||||||
if rewardInfo.ActivityId == 5 then--ActivityTypeDef.AccumulativeRecharge then
|
if rewardInfo.ActivityId == ActivityTypeDef.FirstRecharge then--ActivityTypeDef.AccumulativeRecharge then
|
||||||
heroId = rewardInfo.Reward[1][1]
|
heroId = rewardInfo.Reward[1][1]
|
||||||
break
|
break
|
||||||
end
|
end
|
||||||
|
@ -111,7 +111,7 @@ end
|
||||||
function FirstRechargePanel:OnShow()
|
function FirstRechargePanel:OnShow()
|
||||||
self:OnTabChanged(self.selectTabIndex)
|
self:OnTabChanged(self.selectTabIndex)
|
||||||
--self.reChargeTips.text = string.format("已充值 %s 元", FirstRechargeManager.GetAccumRechargeValue())
|
--self.reChargeTips.text = string.format("已充值 %s 元", FirstRechargeManager.GetAccumRechargeValue())
|
||||||
local activityInfo = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.AccumulativeRecharge)
|
local activityInfo = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.FirstRecharge)
|
||||||
local AccumRecharge = 0
|
local AccumRecharge = 0
|
||||||
for _, missInfo in pairs(activityInfo.mission) do
|
for _, missInfo in pairs(activityInfo.mission) do
|
||||||
if missInfo and missInfo.progress then
|
if missInfo and missInfo.progress then
|
||||||
|
@ -147,7 +147,7 @@ end
|
||||||
function FirstRechargePanel:ShowContent(index)
|
function FirstRechargePanel:ShowContent(index)
|
||||||
local tempData = {}
|
local tempData = {}
|
||||||
for _, rewardInfo in ConfigPairs(activityRewardConfig) do
|
for _, rewardInfo in ConfigPairs(activityRewardConfig) do
|
||||||
if rewardInfo.ActivityId == ActivityTypeDef.AccumulativeRecharge and
|
if rewardInfo.ActivityId == ActivityTypeDef.FirstRecharge and
|
||||||
rewardInfo.Values[1][1] == IndexValueDef[index] then
|
rewardInfo.Values[1][1] == IndexValueDef[index] then
|
||||||
table.insert(tempData, rewardInfo)
|
table.insert(tempData, rewardInfo)
|
||||||
end
|
end
|
||||||
|
|
|
@ -1037,7 +1037,10 @@ function this:OnShow()
|
||||||
if not UIManager.IsOpen(UIName.PatFacePanel) then
|
if not UIManager.IsOpen(UIName.PatFacePanel) then
|
||||||
this.RefreshShowPatPaceActivity()
|
this.RefreshShowPatPaceActivity()
|
||||||
end
|
end
|
||||||
|
if FirstRechargeManager.isFirstRecharge == 1 and FirstRechargeManager.PlayerPrefsGetStrItemId() == 0 then
|
||||||
|
FirstRechargeManager.PlayerPrefsSetStrItemId(1)
|
||||||
|
UIManager.OpenPanel(UIName.FirstRechargePanel)
|
||||||
|
end
|
||||||
-- 设置主城小人名字
|
-- 设置主城小人名字
|
||||||
if self.playerView then
|
if self.playerView then
|
||||||
self.playerView:SetName()
|
self.playerView:SetName()
|
||||||
|
|
|
@ -104,7 +104,7 @@ function this.InitRedPointAllRelate()
|
||||||
RPData:SetParent(RedPointType.Shop_Tab_Roam, RedPointType.Shop_Page_Roam)
|
RPData:SetParent(RedPointType.Shop_Tab_Roam, RedPointType.Shop_Page_Roam)
|
||||||
-- ====== 商店功能
|
-- ====== 商店功能
|
||||||
RPData:SetParent(RedPointType.Shop_General_Check, RedPointType.Shop_Tab_General)
|
RPData:SetParent(RedPointType.Shop_General_Check, RedPointType.Shop_Tab_General)
|
||||||
RPData:SetParent(RedPointType.Shop_General_Refresh, RedPointType.Shop_Tab_General)
|
-- RPData:SetParent(RedPointType.Shop_General_Refresh, RedPointType.Shop_Tab_General)
|
||||||
RPData:SetParent(RedPointType.Shop_Secret_Check, RedPointType.Shop_Tab_Secret)
|
RPData:SetParent(RedPointType.Shop_Secret_Check, RedPointType.Shop_Tab_Secret)
|
||||||
RPData:SetParent(RedPointType.Shop_Arena_Check, RedPointType.Shop_Tab_Arena)
|
RPData:SetParent(RedPointType.Shop_Arena_Check, RedPointType.Shop_Tab_Arena)
|
||||||
RPData:SetParent(RedPointType.Shop_Guild_Check, RedPointType.Shop_Tab_Guild)
|
RPData:SetParent(RedPointType.Shop_Guild_Check, RedPointType.Shop_Tab_Guild)
|
||||||
|
@ -264,7 +264,7 @@ function this.RegisterRedCheckFunc()
|
||||||
---=== 商店相关红点
|
---=== 商店相关红点
|
||||||
RPData:AddCheckFunc(RedPointType.Arena_Shop, ShopManager.ShopRedCheck)
|
RPData:AddCheckFunc(RedPointType.Arena_Shop, ShopManager.ShopRedCheck)
|
||||||
RPData:AddCheckFunc(RedPointType.Shop_General_Check, ShopManager.ShopRedCheck)
|
RPData:AddCheckFunc(RedPointType.Shop_General_Check, ShopManager.ShopRedCheck)
|
||||||
RPData:AddCheckFunc(RedPointType.Shop_General_Refresh, ShopManager.ShopRedCheck)
|
-- RPData:AddCheckFunc(RedPointType.Shop_General_Refresh, ShopManager.ShopRedCheck)
|
||||||
RPData:AddCheckFunc(RedPointType.Shop_Secret_Check, ShopManager.ShopRedCheck)
|
RPData:AddCheckFunc(RedPointType.Shop_Secret_Check, ShopManager.ShopRedCheck)
|
||||||
RPData:AddCheckFunc(RedPointType.Shop_Arena_Check, ShopManager.ShopRedCheck)
|
RPData:AddCheckFunc(RedPointType.Shop_Arena_Check, ShopManager.ShopRedCheck)
|
||||||
RPData:AddCheckFunc(RedPointType.Shop_Roam_Check, ShopManager.ShopRedCheck)
|
RPData:AddCheckFunc(RedPointType.Shop_Roam_Check, ShopManager.ShopRedCheck)
|
||||||
|
|
|
@ -68,7 +68,6 @@ function MainShopPanel:BindEvent()
|
||||||
Util.AddClick(this.btnBack, function()
|
Util.AddClick(this.btnBack, function()
|
||||||
PlaySoundWithoutClick(SoundConfig.Sound_UICancel)
|
PlaySoundWithoutClick(SoundConfig.Sound_UICancel)
|
||||||
this:ClosePanel()
|
this:ClosePanel()
|
||||||
this.isOpenFirstRechargePanel()
|
|
||||||
end)
|
end)
|
||||||
|
|
||||||
end
|
end
|
||||||
|
@ -96,7 +95,6 @@ function MainShopPanel:OnShow()
|
||||||
if this._CurPageIndex then
|
if this._CurPageIndex then
|
||||||
this.PageTabCtrl:ChangeTab(this._CurPageIndex)
|
this.PageTabCtrl:ChangeTab(this._CurPageIndex)
|
||||||
end
|
end
|
||||||
oldAccumRecharge = this.CalculateIsFirstRecharge()
|
|
||||||
end
|
end
|
||||||
|
|
||||||
-- 层级变化时,子界面层级刷新
|
-- 层级变化时,子界面层级刷新
|
||||||
|
@ -189,21 +187,4 @@ function MainShopPanel:OnDestroy()
|
||||||
-- 清除红点
|
-- 清除红点
|
||||||
this.ClearPageRedpot()
|
this.ClearPageRedpot()
|
||||||
end
|
end
|
||||||
function this.isOpenFirstRechargePanel()
|
|
||||||
if oldAccumRecharge == 0 then
|
|
||||||
if this.CalculateIsFirstRecharge() > 0 then
|
|
||||||
UIManager.OpenPanel(UIName.FirstRechargePanel)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
function this.CalculateIsFirstRecharge()
|
|
||||||
local activityInfo = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.AccumulativeRecharge)
|
|
||||||
local AccumRecharge = 0
|
|
||||||
for _, missInfo in pairs(activityInfo.mission) do
|
|
||||||
if missInfo and missInfo.progress then
|
|
||||||
AccumRecharge = missInfo.progress
|
|
||||||
end
|
|
||||||
end
|
|
||||||
return AccumRecharge
|
|
||||||
end
|
|
||||||
return MainShopPanel
|
return MainShopPanel
|
|
@ -1020,8 +1020,8 @@ function this.ShopRedCheck(redType)
|
||||||
elseif redType == RedPointType.Shop_General_Check then
|
elseif redType == RedPointType.Shop_General_Check then
|
||||||
return this.ShopCheckRPIsShow(SHOP_TYPE.GENERAL_SHOP)
|
return this.ShopCheckRPIsShow(SHOP_TYPE.GENERAL_SHOP)
|
||||||
|
|
||||||
elseif redType == RedPointType.Shop_General_Refresh then
|
-- elseif redType == RedPointType.Shop_General_Refresh then
|
||||||
return this.ShopRefreshRPIsShow(SHOP_TYPE.GENERAL_SHOP)
|
-- return this.ShopRefreshRPIsShow(SHOP_TYPE.GENERAL_SHOP)
|
||||||
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -1040,7 +1040,7 @@ function this.CheckShopRedpot(shopType)
|
||||||
CheckRedPointStatus(RedPointType.Shop_Secret_Check)
|
CheckRedPointStatus(RedPointType.Shop_Secret_Check)
|
||||||
elseif shopType == SHOP_TYPE.GENERAL_SHOP then
|
elseif shopType == SHOP_TYPE.GENERAL_SHOP then
|
||||||
CheckRedPointStatus(RedPointType.Shop_General_Check)
|
CheckRedPointStatus(RedPointType.Shop_General_Check)
|
||||||
CheckRedPointStatus(RedPointType.Shop_General_Refresh)
|
-- CheckRedPointStatus(RedPointType.Shop_General_Refresh)
|
||||||
elseif shopType == SHOP_TYPE.BUYCOIN_SHOP then
|
elseif shopType == SHOP_TYPE.BUYCOIN_SHOP then
|
||||||
CheckRedPointStatus(RedPointType.UpView_Gold)
|
CheckRedPointStatus(RedPointType.UpView_Gold)
|
||||||
end
|
end
|
||||||
|
|
|
@ -145,9 +145,9 @@ function this:OnClose()
|
||||||
_GoodsItemList = {}
|
_GoodsItemList = {}
|
||||||
|
|
||||||
-- 红点销毁
|
-- 红点销毁
|
||||||
if self.ShopType == SHOP_TYPE.GENERAL_SHOP then
|
-- if self.ShopType == SHOP_TYPE.GENERAL_SHOP then
|
||||||
ClearRedPointObject(RedPointType.Shop_General_Refresh)
|
-- ClearRedPointObject(RedPointType.Shop_General_Refresh)
|
||||||
end
|
-- end
|
||||||
|
|
||||||
if self.ScrollView then
|
if self.ScrollView then
|
||||||
GameObject.DestroyImmediate(self.ScrollView.gameObject)
|
GameObject.DestroyImmediate(self.ScrollView.gameObject)
|
||||||
|
@ -559,13 +559,13 @@ function this:ShowShop(shopType,_sortingOrder)
|
||||||
this.sortingOrder = _sortingOrder
|
this.sortingOrder = _sortingOrder
|
||||||
-- 红点销毁
|
-- 红点销毁
|
||||||
self.refreshRedpot:SetActive(false)
|
self.refreshRedpot:SetActive(false)
|
||||||
if self.ShopType == SHOP_TYPE.GENERAL_SHOP then
|
-- if self.ShopType == SHOP_TYPE.GENERAL_SHOP then
|
||||||
ClearRedPointObject(RedPointType.Shop_General_Refresh)
|
-- ClearRedPointObject(RedPointType.Shop_General_Refresh)
|
||||||
end
|
-- end
|
||||||
-- 绑定新红点
|
-- 绑定新红点
|
||||||
if shopType == SHOP_TYPE.GENERAL_SHOP then
|
-- if shopType == SHOP_TYPE.GENERAL_SHOP then
|
||||||
BindRedPointObject(RedPointType.Shop_General_Refresh, self.refreshRedpot)
|
-- BindRedPointObject(RedPointType.Shop_General_Refresh, self.refreshRedpot)
|
||||||
end
|
-- end
|
||||||
|
|
||||||
-- 刷新显示
|
-- 刷新显示
|
||||||
self.ShopType = shopType
|
self.ShopType = shopType
|
||||||
|
|
Loading…
Reference in New Issue