Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop

dev_chengFeng
jiaoyangna 2020-07-17 11:38:26 +08:00
commit d1fd538542
21 changed files with 299 additions and 49 deletions

View File

@ -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:

View File

@ -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:

View File

@ -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:

View File

@ -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:

View File

@ -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:

View File

@ -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:

View File

@ -622,7 +622,7 @@ RedPointType = {
Shop_Tab_Roam = 25350,
---========= 商店红点
Shop_General_Check = 253100,
Shop_General_Refresh = 253101,
-- Shop_General_Refresh = 253101,
Shop_Secret_Check = 253200,
Shop_Arena_Check = 253300,
Shop_Guild_Check = 253310,
@ -916,8 +916,9 @@ ActivityTypeDef = {
OnlineGift = 1, --在线奖励
SevenDayRegister = 2, --七日登录
ChapterAward = 3, --章节奖励
FirstRecharge = 4, --首充
AccumulativeRecharge = 5, --累计充值
-- FirstRecharge = 4, --首充
-- AccumulativeRecharge = 5, --累计充值
FirstRecharge = 5, --首充
GrowthReward = 6, --成长礼金
Pray = 7, --云梦祈福
TreasureOfSomeBody = 8,--孙龙的宝藏

View File

@ -45,7 +45,7 @@ function DayRewardItem:SetValue(context,_sortingOrder)
-- self.receivedFlag:SetActive(false)
-- --self.redPoint:SetActive(false)
--else
local activityInfo = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.AccumulativeRecharge)
local activityInfo = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.FirstRecharge)
local AccumRecharge = 0
for _, missInfo in pairs(activityInfo.mission) do
if missInfo and missInfo.progress then
@ -79,7 +79,7 @@ function DayRewardItem:SetValue(context,_sortingOrder)
end
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)
ActivityGiftManager.SetActivityInfo(self.context.ActivityId, self.context.Id, 1)
self.receiveBtn.gameObject:SetActive(false)

View File

@ -20,7 +20,7 @@ end
function this.GetFirstRechargeRedPointStatus()
local redPoint = false
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.GetHundredTabRedPointStatus()
end
@ -31,7 +31,7 @@ end
function this.GetSixMoneyTabRedPointStatus()
local redPoint = false
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
redPoint = redPoint or this.GetDayItemRedPoint(rewardInfo)
end
@ -42,7 +42,7 @@ end
function this.GetHundredTabRedPointStatus()
local redPoint = false
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
redPoint = redPoint or this.GetDayItemRedPoint(rewardInfo)
end
@ -51,7 +51,7 @@ function this.GetHundredTabRedPointStatus()
end
function this.GetDayItemRedPoint(context)
local activityInfo = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.AccumulativeRecharge)
local activityInfo = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.FirstRecharge)
local AccumRecharge = 0
for _, missInfo in pairs(activityInfo.mission) do
if missInfo and missInfo.progress then
@ -71,7 +71,7 @@ function this.GetDayItemRedPoint(context)
local day = GetTimePass(this.GetRechargeTime())
--local day = GetTimePass(math.floor(GetTimeStamp()))
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
else
return false
@ -85,7 +85,7 @@ end
function this.GetReceiveAll()
local condition = true
local activityInfo = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.AccumulativeRecharge)
local activityInfo = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.FirstRecharge)
if activityInfo then
for i = 1, #activityInfo.mission do
local rechargeInfo = activityInfo.mission[i]
@ -147,5 +147,12 @@ end
function this.GetRechargeTime()
return rechargeTime
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

View File

@ -81,7 +81,7 @@ function FirstRechargePanel:BindEvent()
Util.AddClick(self.tenProBtn, function()
local heroId = 0
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]
break
end
@ -111,7 +111,7 @@ end
function FirstRechargePanel:OnShow()
self:OnTabChanged(self.selectTabIndex)
--self.reChargeTips.text = string.format("已充值 %s 元", FirstRechargeManager.GetAccumRechargeValue())
local activityInfo = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.AccumulativeRecharge)
local activityInfo = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.FirstRecharge)
local AccumRecharge = 0
for _, missInfo in pairs(activityInfo.mission) do
if missInfo and missInfo.progress then
@ -147,7 +147,7 @@ end
function FirstRechargePanel:ShowContent(index)
local tempData = {}
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
table.insert(tempData, rewardInfo)
end

View File

@ -1037,7 +1037,10 @@ function this:OnShow()
if not UIManager.IsOpen(UIName.PatFacePanel) then
this.RefreshShowPatPaceActivity()
end
if FirstRechargeManager.isFirstRecharge == 1 and FirstRechargeManager.PlayerPrefsGetStrItemId() == 0 then
FirstRechargeManager.PlayerPrefsSetStrItemId(1)
UIManager.OpenPanel(UIName.FirstRechargePanel)
end
-- 设置主城小人名字
if self.playerView then
self.playerView:SetName()

View File

@ -104,7 +104,7 @@ function this.InitRedPointAllRelate()
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_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_Arena_Check, RedPointType.Shop_Tab_Arena)
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.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_Arena_Check, ShopManager.ShopRedCheck)
RPData:AddCheckFunc(RedPointType.Shop_Roam_Check, ShopManager.ShopRedCheck)

View File

@ -68,7 +68,6 @@ function MainShopPanel:BindEvent()
Util.AddClick(this.btnBack, function()
PlaySoundWithoutClick(SoundConfig.Sound_UICancel)
this:ClosePanel()
this.isOpenFirstRechargePanel()
end)
end
@ -96,7 +95,6 @@ function MainShopPanel:OnShow()
if this._CurPageIndex then
this.PageTabCtrl:ChangeTab(this._CurPageIndex)
end
oldAccumRecharge = this.CalculateIsFirstRecharge()
end
-- 层级变化时,子界面层级刷新
@ -189,21 +187,4 @@ function MainShopPanel:OnDestroy()
-- 清除红点
this.ClearPageRedpot()
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

View File

@ -1020,8 +1020,8 @@ function this.ShopRedCheck(redType)
elseif redType == RedPointType.Shop_General_Check then
return this.ShopCheckRPIsShow(SHOP_TYPE.GENERAL_SHOP)
elseif redType == RedPointType.Shop_General_Refresh then
return this.ShopRefreshRPIsShow(SHOP_TYPE.GENERAL_SHOP)
-- elseif redType == RedPointType.Shop_General_Refresh then
-- return this.ShopRefreshRPIsShow(SHOP_TYPE.GENERAL_SHOP)
end
end
@ -1040,7 +1040,7 @@ function this.CheckShopRedpot(shopType)
CheckRedPointStatus(RedPointType.Shop_Secret_Check)
elseif shopType == SHOP_TYPE.GENERAL_SHOP then
CheckRedPointStatus(RedPointType.Shop_General_Check)
CheckRedPointStatus(RedPointType.Shop_General_Refresh)
-- CheckRedPointStatus(RedPointType.Shop_General_Refresh)
elseif shopType == SHOP_TYPE.BUYCOIN_SHOP then
CheckRedPointStatus(RedPointType.UpView_Gold)
end

View File

@ -145,9 +145,9 @@ function this:OnClose()
_GoodsItemList = {}
-- 红点销毁
if self.ShopType == SHOP_TYPE.GENERAL_SHOP then
ClearRedPointObject(RedPointType.Shop_General_Refresh)
end
-- if self.ShopType == SHOP_TYPE.GENERAL_SHOP then
-- ClearRedPointObject(RedPointType.Shop_General_Refresh)
-- end
if self.ScrollView then
GameObject.DestroyImmediate(self.ScrollView.gameObject)
@ -559,13 +559,13 @@ function this:ShowShop(shopType,_sortingOrder)
this.sortingOrder = _sortingOrder
-- 红点销毁
self.refreshRedpot:SetActive(false)
if self.ShopType == SHOP_TYPE.GENERAL_SHOP then
ClearRedPointObject(RedPointType.Shop_General_Refresh)
end
-- if self.ShopType == SHOP_TYPE.GENERAL_SHOP then
-- ClearRedPointObject(RedPointType.Shop_General_Refresh)
-- end
-- 绑定新红点
if shopType == SHOP_TYPE.GENERAL_SHOP then
BindRedPointObject(RedPointType.Shop_General_Refresh, self.refreshRedpot)
end
-- if shopType == SHOP_TYPE.GENERAL_SHOP then
-- BindRedPointObject(RedPointType.Shop_General_Refresh, self.refreshRedpot)
-- end
-- 刷新显示
self.ShopType = shopType