Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c

# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
dev_chengFeng
jiaoyangna 2021-05-28 16:01:35 +08:00
commit d165c87724
24 changed files with 1551 additions and 859 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 43 KiB

After

Width:  |  Height:  |  Size: 37 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 38 KiB

After

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 36 KiB

After

Width:  |  Height:  |  Size: 35 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 40 KiB

After

Width:  |  Height:  |  Size: 38 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 37 KiB

After

Width:  |  Height:  |  Size: 34 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 38 KiB

After

Width:  |  Height:  |  Size: 34 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: bddaf413d083a5b45a9172b36095490a
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 2
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 57
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 51e712c29914ce040b3ecf745bfc73d3
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: 4a65cf25620b755458a89499d5e05d3b
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 2
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 57
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 3409d63726dd45a4697dfbc0b4fb69f2
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -2438,7 +2438,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &3485081933269307159
RectTransform:
m_ObjectHideFlags: 0
@ -2455,7 +2455,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 60, y: -45}
m_AnchoredPosition: {x: 32, y: -25}
m_SizeDelta: {x: 58, y: 58}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1573136561530535208
@ -7174,7 +7174,7 @@ ParticleSystem:
--- !u!199 &3612650515471756776
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -14365,7 +14365,7 @@ ParticleSystem:
--- !u!199 &2077135144819501974
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -20141,7 +20141,7 @@ ParticleSystem:
--- !u!199 &5382233283546536858
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -20217,7 +20217,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &4891219356403018510
RectTransform:
m_ObjectHideFlags: 0
@ -20234,7 +20234,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: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 93.2}
m_SizeDelta: {x: 300, y: 76}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8330201010160231290
@ -20265,7 +20265,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: d97c3f743cbc9254fa76d653f78830a3, type: 3}
m_Sprite: {fileID: 21300000, guid: 4a65cf25620b755458a89499d5e05d3b, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -21596,7 +21596,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: -2.7, y: -0.000012398}
m_AnchoredPosition: {x: -2.7, y: 11.199987}
m_SizeDelta: {x: 62.12, y: 222}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4412609738691989485
@ -28023,7 +28023,7 @@ ParticleSystem:
--- !u!199 &4678487443364567018
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -32821,7 +32821,7 @@ ParticleSystem:
--- !u!199 &3301434479282110283
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -38606,7 +38606,7 @@ ParticleSystem:
--- !u!199 &8426323061574149814
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -43752,7 +43752,7 @@ ParticleSystem:
--- !u!199 &3988090302360095373
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -49029,7 +49029,7 @@ ParticleSystem:
--- !u!199 &5461926455895321923
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -49105,7 +49105,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &8855666515029751127
RectTransform:
m_ObjectHideFlags: 0
@ -49122,7 +49122,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 60, y: -45}
m_AnchoredPosition: {x: 14.900002, y: -18.600006}
m_SizeDelta: {x: 26, y: 26}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3975621365474609331
@ -54249,7 +54249,7 @@ ParticleSystem:
--- !u!199 &6960492284779320589
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -60534,7 +60534,7 @@ ParticleSystem:
--- !u!199 &4261467272199160834
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -63729,7 +63729,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &5913985668708773166
RectTransform:
m_ObjectHideFlags: 0
@ -63746,7 +63746,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: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 93.2}
m_SizeDelta: {x: 300, y: 76}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7081964043404323979
@ -63777,7 +63777,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 79f6183b43cb8104e893b7caeaedf21f, type: 3}
m_Sprite: {fileID: 21300000, guid: bddaf413d083a5b45a9172b36095490a, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -67497,7 +67497,7 @@ RectTransform:
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -79.999985, y: -0.000061035156}
m_SizeDelta: {x: 160, y: 0}
m_SizeDelta: {x: 180, y: 0}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &5480043022987940638
CanvasRenderer:
@ -72553,7 +72553,7 @@ ParticleSystem:
--- !u!199 &1706209193022837301
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -77712,7 +77712,7 @@ ParticleSystem:
--- !u!199 &2319946449668926234
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -79295,8 +79295,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: -115.2, y: 7.8}
m_SizeDelta: {x: 230.4, y: 149.3}
m_AnchoredPosition: {x: -115.2, y: 47.9}
m_SizeDelta: {x: 230.4, y: 229.6}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &508266023133700516
CanvasRenderer:
@ -84102,7 +84102,7 @@ ParticleSystem:
--- !u!199 &8234207848460451360
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -89168,7 +89168,7 @@ ParticleSystem:
--- !u!199 &3615746855071839570
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}

View File

@ -1192,7 +1192,7 @@ ActivityTypeDef = {
DynamicAct = 20000,--主题活动任务
DynamicAct_TimeLimitShop = 20001,--主题活动限时商市
DynamicAct_Treasure = 20002,--主题活动珍奇宝阁
LimitUpHero = 20003, --限时up活动 (祈愿)
TreasureStore = 6000,--百宝商会
YiJingBaoKu = 8000,--易经宝库
@ -1858,6 +1858,7 @@ FUNC_OPNE_STATE = {
COMPOUND_HERO = "COMPOUND_HERO",
POKEMON = "COMPOUND_HERO",
TianShuMiJuan = "TianShuMiJuan",
LUCKYTURN = "LUCKYTURN",
}
-- 开放功能ID作为索引键值索引对应的字符串
@ -1887,6 +1888,7 @@ FUNC_OPEN_STR = {
[FUNCTION_OPEN_TYPE.COMPOUND_HERO] = FUNC_OPNE_STATE.COMPOUND_HERO,
[FUNCTION_OPEN_TYPE.POKEMON] = FUNC_OPNE_STATE.POKEMON,
[FUNCTION_OPEN_TYPE.tianshumijuan] = FUNC_OPNE_STATE.TianShuMiJuan,
[FUNCTION_OPEN_TYPE.LUCKYTURN] = FUNC_OPNE_STATE.LUCKYTURN,
}
-- 地图中图标对应的ID

View File

@ -438,6 +438,7 @@ SubUIConfig = {
[15] = {name = "page2",assetName = "page2",script = "Modules/DynamicActivity/SheJiDaDian"}, --社稷大典
[16] = {name = "TimeLimitUpHero",assetName = "TimeLimitUpHero",script = "Modules/DynamicActivity/TimeLimitUpHero"}, --限时召唤
--[16] = {name = "page3",assetName = "page3",script = "Modules/DynamicActivity/TimeLimitedCall"}, --限时召唤
[17] = {name = "page4",assetName = "page4",script = "Modules/DynamicActivity/QianKunBox"},--乾坤宝盒
[18] = {name = "page9",assetName = "page9",script = "Modules/DynamicActivity/YiJingBaoKu"},--易经宝库
[19] = {name = "page10",assetName = "page10",script = "Modules/DynamicActivity/ShengYiTianJiang"},--神衣天降

View File

@ -138,9 +138,10 @@ function this.InitActivityServerData(msg, isUpdate)
this.CheckMoneyProgress(v)
this.mission[v.activityId] = v
LogYellow("刷新活动数据activityId" .. v.activityId .. " value" .. v.value)
-- LogYellow("刷新活动数据activityId" .. v.activityId .. " value" .. v.value)
for n, m in ipairs(v.mission) do
LogGreen(" 刷新活动数据missionId" .. m.missionId .. " state" .. m.state .. " progress" .. m.progress)
-- LogGreen(" 刷新活动数据missionId" .. m.missionId .. " state" .. m.state .. " progress" .. m.progress)
if (v.activityId == ActivityTypeDef.OnlineGift) then
this.onlineOpen = true
this.onlineGetRewardState[m.missionId] = m.state

View File

@ -53,7 +53,7 @@ end
function this.CheckRedPoint()
local dailyActInfo = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.DailyRecharge)
for i = 1, #dailyActInfo.mission do
if this.ReceivedEnabled(dailyActInfo.mission[i].missionId) then
if this.ReceivedEnabled(dailyActInfo.mission[i].missionId) and dailyActInfo.mission[i].state == 0 then
return true
end
end

View File

@ -80,22 +80,22 @@ end
--绑定事件(用于子类重写)
function TimeLimitUpHero:BindEvent()
Util.AddOnceClick(self.helpBtn, function()
UIManager.OpenPanel(UIName.HelpPopup,self.actConfig.HelpId,self.helpPosition.x,self.helpPosition.y)
UIManager.OpenPanel(UIName.HelpPopup,Setting.QAId,self.helpPosition.x,self.helpPosition.y)
end)
Util.AddOnceClick(self.btnActivity, function()
UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.RecrutDetail,self.actConfig.HelpId,self.actId,PRE_REWARD_POOL_TYPE.TIME_LIMITED_UP,PRE_REWARD_POOL_TYPE.TIME_LIMITED)
UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.RecrutDetail,Setting.QAId,20003,PRE_REWARD_POOL_TYPE.TIME_LIMITED_UP,PRE_REWARD_POOL_TYPE.TIME_LIMITED,curHeroId,self.actId)
end)
end
--添加事件监听(用于子类重写)
function TimeLimitUpHero:AddListener()
Game.GlobalEvent:AddEvent(GameEvent.Activity.ContinueRechargeRefresh,self.OnUPHeroChange,self)
Game.GlobalEvent:AddEvent(GameEvent.Activity.TimeLimitUpHeroChange,self.OnUPHeroChange,self)
end
--移除事件监听(用于子类重写)
function TimeLimitUpHero:RemoveListener()
Game.GlobalEvent:RemoveEvent(GameEvent.Activity.ContinueRechargeRefresh,self.OnUPHeroChange,self)
Game.GlobalEvent:RemoveEvent(GameEvent.Activity.TimeLimitUpHeroChange,self.OnUPHeroChange,self)
end
--up的英雄改变
@ -173,9 +173,6 @@ function TimeLimitUpHero:RefreshGetHeroTimes()
local curTimes = PrivilegeManager.GetPrivilegeUsedTimes(self.maxtimesId)
self.upper.text= "今日召唤上限:"..curTimes.."/"..privilegeConfig[self.maxtimesId].Condition[1][2]--特权上限
self.timeupdate.gameObject:SetActive(true)
if self.freeTimesId and self.freeTimesId > 0 then
freeTime = PrivilegeManager.GetPrivilegeRemainValue(self.freeTimesId)
LogError("self freetimes "..freeTime)
@ -292,7 +289,7 @@ function TimeLimitUpHero:Recruit(actId,type)
if not oneFunc then
LogError(" one func ==nil")
end
-- UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero,actId,1,{RecruitType.TimeLimitSingle,RecruitType.TimeLimitTen},oneFunc2)
UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero[1],actId,1,{RecruitType.TimeLimitSingle,RecruitType.TimeLimitTen},oneFunc2)
end
CheckRedPointStatus(RedPointType.TimeLimited)
end,self.freeTimesId)

View File

@ -6,7 +6,10 @@ local parent
local sortingOrder=0
local activityId = 0
local activityType = 0
local heroID =0
local itemConfig=ConfigManager.GetConfig(ConfigName.ItemConfig)
local artResourcesConfig=ConfigManager.GetConfig(ConfigName.ArtResourcesConfig)
local pool=ConfigManager.GetConfig(ConfigName.WishActivityPool)
function this:InitComponent(gameObject)
this.title = Util.GetGameObject(gameObject,"title"):GetComponent("Text")
this.tip = Util.GetGameObject(gameObject,"tip"):GetComponent("Text")
@ -66,11 +69,21 @@ function this:OnShow(_parent,...)
local poolUpType = args[3] or 0
local poolType = args[4] or 0
heroID = args[5]
local activityId = args[6]
LogGreen("poolUpType:"..poolUpType.." poolType:"..poolType)
local UpItemList=RecruitManager.GetRewardPreviewData(poolUpType)
local itemList = RecruitManager.GetRewardPreviewData(poolType)
local _upRateList,rateList = this:BuildRateData(activityType,itemList,UpItemList)
this:ReFreshUpItem(UpItemList,_upRateList)
if activityType == ActivityTypeDef.LimitUpHero and heroID then
local heroConfig=ConfigManager.TryGetConfigData(ConfigName.HeroConfig,heroID)
if heroConfig then
this:ShowUpItem(heroConfig,activityId)
end
else
local UpItemList=RecruitManager.GetRewardPreviewData(poolUpType)
local itemList = RecruitManager.GetRewardPreviewData(poolType)
local _upRateList,rateList = this:BuildRateData(activityType,itemList,UpItemList)
this:ReFreshUpItem(UpItemList,_upRateList)
end
end
function this:ReFreshUpItem(UpItem,rateList)
@ -96,6 +109,70 @@ function this:ReFreshUpItem(UpItem,rateList)
end
end
--限时up英雄
function this:ShowUpItem(config,actId)
local hero=SubUIManager.Open(SubUIConfig.ItemView,this.itemGrid.transform)
local wishUpConfig=ConfigManager.TryGetConfigDataByKey(ConfigName.WishActivityUp,"ActivityId",actId)
local num=0
for i = 1, #wishUpConfig.UpList do
if wishUpConfig.UpList[i][1]==heroID then
num=wishUpConfig.UpList[i][3]
end
end
hero:OnOpen(false,{config.Id,1},1.1,true)
hero.name:GetComponent("Text").text="<color=#EDB64C>"..string.format("%.2f", (num/100000)*100) .."%</color>"
hero.gameObject:SetActive(true)
for k,v in ipairs(this.ratePreList) do
v.go.gameObject:SetActive(false)
end
-- table.sort(pool,function(a,b)
-- return a.GetRate>b.GetRate
-- end)
local rateList={}
local hero={tag="5星神将UP",name=config.ReadingName,value=num,Color=1}
--local aaa=ConfigManager.GetConfigData(ConfigName.WishActivityPool,2)
--LogError("aaa==="..aaa.GetRate)
for key, value in ConfigPairs(pool) do
local id=value.ItemId[1]
local itemConfig=ConfigManager.TryGetConfigData(ConfigName.ItemConfig,id)
local data={tag=itemConfig.Name,name=value.ItemId[2],value=value.GetRate,Color=0}
table.insert(rateList,data)
end
table.sort(rateList,function(a,b)
return a.value>b.value
end)
table.insert(rateList,1,hero)
for n,m in ipairs(rateList) do
if not this.ratePreList[n] then
this.ratePreList[n] = {}
this.ratePreList[n].go = newObjToParent(this.pre,this.grid)
this.ratePreList[n].star = Util.GetGameObject(this.ratePreList[n].go,"star"):GetComponent("Text")
this.ratePreList[n].name = Util.GetGameObject(this.ratePreList[n].go,"name"):GetComponent("Text")
this.ratePreList[n].rate = Util.GetGameObject(this.ratePreList[n].go,"rate"):GetComponent("Text")
end
this.ratePreList[n].go.gameObject:SetActive(true)
this.ratePreList[n].star.text=m.tag
if m.Color==1 then
this.ratePreList[n].star.color=Color.New(0.67, 0.25,0.32, 1)
this.ratePreList[n].name.color=Color.New(0.67, 0.25,0.32, 1)
this.ratePreList[n].rate.color=Color.New(0.67, 0.25,0.32, 1)
else
this.ratePreList[n].star.color=Color.New(0.66, 0.62,0.54, 1)
this.ratePreList[n].name.color=Color.New(0.66, 0.62,0.54, 1)
this.ratePreList[n].rate.color=Color.New(0.66, 0.62,0.54, 1)
end
this.ratePreList[n].name.text=m.name
this.ratePreList[n].rate.text=string.format("%.2f",(m.value/100000)*100).."%"
end
end
function this:BuildRateData(actType,UpItem,upItemList)
local rateList = {}
local _upRateList = {}

View File

@ -1,12 +1,4 @@
--local LuckyTurnTablePanel= quick_class("LuckyTurnTablePanel")
--local this = LuckyTurnTablePanel
--function LuckyTurnTablePanel:ctor(mainPanel, gameObject)
-- self.mainPanel = mainPanel
-- self.gameObject = gameObject
-- self:InitComponent(gameObject)
-- self:BindEvent()
--end
require("Base/BasePanel")
require("Base/BasePanel")
LuckyTurnTablePanel = Inherit(BasePanel)
local this = LuckyTurnTablePanel
@ -105,14 +97,16 @@ function LuckyTurnTablePanel:InitComponent(gameObject)
for i=1,5 do
this.rewardBoxList[i]=Util.GetGameObject(this.rewardBox,"Item"..i)
end
this.rewardPanel=Util.GetGameObject(this.slider,"RewardPanel")--幸运值奖励预览面板
this.itemViewParent=Util.GetGameObject(this.rewardPanel,"ItemViewParent")--item父物体
this.rewardPanelMaskBtn=Util.GetGameObject(this.rewardPanel,"Mask")--幸运值奖励预览遮罩按钮
this.rewardItemView=SubUIManager.Open(SubUIConfig.ItemView,this.itemViewParent.transform)
-- this.rewardPanel=Util.GetGameObject(this.slider,"RewardPanel")--幸运值奖励预览面板
-- this.itemViewParent=Util.GetGameObject(this.rewardPanel,"ItemViewParent")--item父物体
-- this.rewardPanelMaskBtn=Util.GetGameObject(this.rewardPanel,"Mask")--幸运值奖励预览遮罩按钮
-- this.rewardItemView=SubUIManager.Open(SubUIConfig.ItemView,this.itemViewParent.transform)
-- 奖励预览
this.btnPreview = Util.GetGameObject(self.gameObject, "Panel/Top/btnPreview")
this.maxTimes = Util.GetGameObject(self.gameObject, "Panel/maxTimes"):GetComponent("Text")
this.itemRewardList = {}
end
---绑定事件(用于子类重写)
@ -143,10 +137,10 @@ function LuckyTurnTablePanel:BindEvent()
this.SwitchTreasureType(TreasureType.Advanced)
end)
--幸运值奖励预览遮罩按钮
Util.AddClick(this.rewardPanelMaskBtn, function()
this.rewardPanelMaskBtn.gameObject:SetActive(false)
this.rewardPanel.gameObject:SetActive(false)
end)
-- Util.AddClick(this.rewardPanelMaskBtn, function()
-- this.rewardPanelMaskBtn.gameObject:SetActive(false)
-- this.rewardPanel.gameObject:SetActive(false)
-- end)
Util.AddClick(this.btnPreview, function()
UIManager.OpenPanel(UIName.RewardPreviewPopup, LuckyTurnTableManager.curTreasureType == TreasureType.Lucky and PRE_REWARD_POOL_TYPE.LUCK_FIND or PRE_REWARD_POOL_TYPE.UPPER_LUCK_FIND)
@ -199,7 +193,7 @@ end
function LuckyTurnTablePanel:OnClose()
--Log("==YSP== 关闭幸运转盘")
RedpotManager.CheckRedPointStatus(RedPointType.LuckyTurn)
this.rewardPanel.gameObject:SetActive(false)
-- this.rewardPanel.gameObject:SetActive(false)
if this.thread then
coroutine.stop(this.thread)
this.thread=nil
@ -228,7 +222,8 @@ end
function LuckyTurnTablePanel:OnDestroy()
this.spLoader:Destroy()
this.itemViewList=nil
this.rewardItemView=nil
this.itemRewardList = {}
-- this.rewardItemView=nil
SubUIManager.Close(this.upView)
end
@ -742,8 +737,16 @@ end
function this.SetRewardBox()
if LuckyTurnTableManager.curTreasureType==TreasureType.Lucky then
for i = 1, 5 do
this.rewardBoxList[i]:GetComponent("Image").sprite=SetIcon(this.spLoader, LuckyTurnTableManager.boxReward_One[i].Reward[1][1])
Util.GetGameObject(this.rewardBoxList[i],"Value"):GetComponent("Text").text=LuckyTurnTableManager.boxReward_One[i].Values[1][1]
local BG = Util.GetGameObject(this.rewardBoxList[i],"BG"):GetComponent("Image")
BG.sprite = SetIcon(this.spLoader, LuckyTurnTableManager.boxReward_One[i].Reward[1][1])
Util.GetGameObject(this.rewardBoxList[i],"Value"):GetComponent("Text").text =LuckyTurnTableManager.boxReward_One[i].Values[1][1]
Util.GetGameObject(this.rewardBoxList[i],"Num/Text"):GetComponent("Text").text =LuckyTurnTableManager.boxReward_One[i].Reward[1][2]
if not this.itemRewardList[i] then
this.itemRewardList[i] = SubUIManager.Open(SubUIConfig.ItemView,BG.transform)
end
this.itemRewardList[i]:OnOpen(false, LuckyTurnTableManager.boxReward_One[i].Reward[1],1, false, false, false, sortingOrder)
this.itemRewardList[i].gameObject:SetActive(false)
--显示奖盒红点
if LuckyTurnTableManager.value_1>=LuckyTurnTableManager.boxReward_One[i].Values[1][1] then
@ -751,8 +754,7 @@ function this.SetRewardBox()
Util.GetGameObject(this.rewardBoxList[i],"redPoint"):SetActive(true)
end
end
Util.AddOnceClick(this.rewardBoxList[i], function()
Util.AddOnceClick(BG.gameObject, function()
--Log("==YSP==点击幸运探宝奖励盒"..i)
RedpotManager.CheckRedPointStatus(RedPointType.LuckyTurn)
--如果幸运值达到奖励要求值
@ -765,25 +767,34 @@ function this.SetRewardBox()
this.RrFreshInfo()
end)
else--奖励已领取 可预览
this.OpenRewardPreview(LuckyTurnTableManager.boxReward_One,i)
this.itemRewardList[i]:OnBtnCkickEvent(LuckyTurnTableManager.boxReward_One[i].Reward[1][1])
end
else
--奖励不可领,可预览
this.OpenRewardPreview(LuckyTurnTableManager.boxReward_One,i)
this.itemRewardList[i]:OnBtnCkickEvent(LuckyTurnTableManager.boxReward_One[i].Reward[1][1])
end
end)
end
elseif LuckyTurnTableManager.curTreasureType==TreasureType.Advanced then
for i = 1, 5 do
this.rewardBoxList[i]:GetComponent("Image").sprite=SetIcon(this.spLoader, LuckyTurnTableManager.boxReward_Two[i].Reward[1][1])
local BG = Util.GetGameObject(this.rewardBoxList[i],"BG"):GetComponent("Image")
BG.sprite = SetIcon(this.spLoader, LuckyTurnTableManager.boxReward_Two[i].Reward[1][1])
Util.GetGameObject(this.rewardBoxList[i],"Value"):GetComponent("Text").text=LuckyTurnTableManager.boxReward_Two[i].Values[1][1]
Util.GetGameObject(this.rewardBoxList[i],"Num/Text"):GetComponent("Text").text =LuckyTurnTableManager.boxReward_Two[i].Reward[1][2]
if not this.itemRewardList[i] then
this.itemRewardList[i] = SubUIManager.Open(SubUIConfig.ItemView,BG.transform)
end
this.itemRewardList[i]:OnOpen(false, LuckyTurnTableManager.boxReward_Two[i].Reward[1],1, false, false, false, sortingOrder)
this.itemRewardList[i].gameObject:SetActive(false)
--显示红点
if LuckyTurnTableManager.value_2>=LuckyTurnTableManager.boxReward_Two[i].Values[1][1] then
if LuckyTurnTableManager.GetRewardState(31,LuckyTurnTableManager.boxReward_Two[i].Id)==0 then
Util.GetGameObject(this.rewardBoxList[i],"redPoint"):SetActive(true)
end
end
Util.AddOnceClick(this.rewardBoxList[i], function()
Util.AddOnceClick(BG.gameObject, function()
--Log("==YSP==点击高级探宝奖励盒"..i)
RedpotManager.CheckRedPointStatus(RedPointType.LuckyTurn)
if LuckyTurnTableManager.value_2>=LuckyTurnTableManager.boxReward_Two[i].Values[1][1] then
@ -794,10 +805,10 @@ function this.SetRewardBox()
this.RrFreshInfo()
end)
else
this.OpenRewardPreview(LuckyTurnTableManager.boxReward_Two,i)
this.itemRewardList[i]:OnBtnCkickEvent(LuckyTurnTableManager.boxReward_Two[i].Reward[1][1])
end
else
this.OpenRewardPreview(LuckyTurnTableManager.boxReward_Two,i)
this.itemRewardList[i]:OnBtnCkickEvent(LuckyTurnTableManager.boxReward_Two[i].Reward[1][1])
end
end)
end
@ -805,35 +816,35 @@ function this.SetRewardBox()
end
---奖盒滑动条奖励背景切换
function this.RewardBgProgress()
for i = 1, 4 do
local bg=Util.GetGameObject(this.rewardBoxList[i],"BG"):GetComponent("Image")
if LuckyTurnTableManager.curTreasureType==TreasureType.Lucky then
if LuckyTurnTableManager.value_1>=LuckyTurnTableManager.boxReward_One[i].Values[1][1] then
bg.sprite=this.spLoader:LoadSprite(RewardName[2])
else
bg.sprite=this.spLoader:LoadSprite(RewardName[1])
end
elseif LuckyTurnTableManager.curTreasureType==TreasureType.Advanced then
if LuckyTurnTableManager.value_2>=LuckyTurnTableManager.boxReward_Two[i].Values[1][1] then
bg.sprite=this.spLoader:LoadSprite(RewardName[2])
else
bg.sprite=this.spLoader:LoadSprite(RewardName[1])
end
end
bg:SetNativeSize()
end
end
-- function this.RewardBgProgress()
-- for i = 1, 4 do
-- local bg=Util.GetGameObject(this.rewardBoxList[i],"BG"):GetComponent("Image")
-- if LuckyTurnTableManager.curTreasureType==TreasureType.Lucky then
-- if LuckyTurnTableManager.value_1>=LuckyTurnTableManager.boxReward_One[i].Values[1][1] then
-- bg.sprite=this.spLoader:LoadSprite(RewardName[2])
-- else
-- bg.sprite=this.spLoader:LoadSprite(RewardName[1])
-- end
-- elseif LuckyTurnTableManager.curTreasureType==TreasureType.Advanced then
-- if LuckyTurnTableManager.value_2>=LuckyTurnTableManager.boxReward_Two[i].Values[1][1] then
-- bg.sprite=this.spLoader:LoadSprite(RewardName[2])
-- else
-- bg.sprite=this.spLoader:LoadSprite(RewardName[1])
-- end
-- end
-- bg:SetNativeSize()
-- end
-- end
---设置奖盒预览信息 并打开面板
function this.OpenRewardPreview(boxReward,i)
--设置奖励预览信息 并打开面板
local tab={boxReward[i].Reward[1][1],boxReward[i].Reward[1][2]}
this.rewardItemView:OnOpen(false, {tab[1],tab[2]},1, false, false, false, sortingOrder)
-- function this.OpenRewardPreview(boxReward,i)
-- --设置奖励预览信息 并打开面板
-- local tab={boxReward[i].Reward[1][1],boxReward[i].Reward[1][2]}
-- this.rewardItemView:OnOpen(false, {tab[1],tab[2]},1, false, false, false, sortingOrder)
this.rewardPanelMaskBtn.gameObject:SetActive(true)
this.rewardPanel.gameObject:SetActive(true)
end
-- -- this.rewardPanelMaskBtn.gameObject:SetActive(true)
-- -- this.rewardPanel.gameObject:SetActive(true)
-- end
---刷新幸运值
function this.RefreshLuckyValue()
@ -869,7 +880,7 @@ function this.RrFreshInfo()
this.RefreshLuckyValue()
this.CheckRedPoint()
this.SetRewardBox()
this.RewardBgProgress()
-- this.RewardBgProgress()
RedpotManager.CheckRedPointStatus(RedPointType.LuckyTurn)
end

View File

@ -155,7 +155,7 @@ function this:InitComponent()
[FUNCTION_OPEN_TYPE.COMPOUND_HERO] = this:AddFuncItem(this.btnCompoundHero, 0),--神将合成、置换
[FUNCTION_OPEN_TYPE.POKEMON] = this:AddFuncItem(this.btnPokemon, -1200),--神将合成、置换
[FUNCTION_OPEN_TYPE.tianshumijuan] = this:AddFuncItem(this.btnTianShuMiJuan, 0),
-- [FUNCTION_OPEN_TYPE.LUCKYTURN] = this:AddFuncItem(this.btnXingYunTanBao, 0),--幸运探宝
[FUNCTION_OPEN_TYPE.LUCKYTURN] = this:AddFuncItem(this.btnXingYunTanBao, 0),--幸运探宝
}
this.operateNewText = {
@ -169,7 +169,7 @@ function this:InitComponent()
[FUNCTION_OPEN_TYPE.COMPOUND_HERO] = this:InsertNewText(this.btnCompoundHero),--神将合成、置换
[FUNCTION_OPEN_TYPE.POKEMON] = this:InsertNewText(this.btnPokemon),--神将合成、置换
[FUNCTION_OPEN_TYPE.tianshumijuan] = this:InsertNewText(this.btnTianShuMiJuan),
-- [FUNCTION_OPEN_TYPE.LUCKYTURN] = this:InsertNewText(this.btnXingYunTanBao),--幸运探宝
[FUNCTION_OPEN_TYPE.LUCKYTURN] = this:InsertNewText(this.btnXingYunTanBao),--幸运探宝
}
-- 红点
@ -185,7 +185,7 @@ function this:InitComponent()
this.rpCompoundHero = Util.GetGameObject(this.btnCompoundHero, "redPoint")--神将合成、置换
this.rpPokemon = Util.GetGameObject(this.btnPokemon, "redPoint")--灵兽
this.rpbtnTianShuMiJuan = Util.GetGameObject(this.btnTianShuMiJuan, "redPoint")--灵兽
-- this.rpbtnXingYunTanBao = Util.GetGameObject(this.btnXingYunTanBao, "redPoint")--幸运探宝
this.rpbtnXingYunTanBao = Util.GetGameObject(this.btnXingYunTanBao, "redPoint")--幸运探宝
@ -557,6 +557,7 @@ function this:BindEvent()
-- UIManager.OpenPanel(UIName.LuckyTurnTablePanel)
-- this.ScenceBtnClick(FUNCTION_OPEN_TYPE.LUCKYTURN)
JumpManager.GoJump(1027)
this.ScenceBtnClick(FUNCTION_OPEN_TYPE.LUCKYTURN)
end)
this.BindRedPoint()
end
@ -611,6 +612,7 @@ function this.BindRedPoint()
BindRedPointObject(RedPointType.PokemonMainCity, this.rpPokemon)
BindRedPointObject(RedPointType.HongMeng,this.HongMengRedPoint)
BindRedPointObject(RedPointType.TianShuMiJuan,this.rpbtnTianShuMiJuan)
BindRedPointObject(RedPointType.LuckyTurn,this.rpbtnXingYunTanBao)
BindRedPointObject(RedPointType.FifteenDayGift,this.rpFifteenDayGift)
BindRedPointObject(RedPointType.Huaxutan,this.rpCompoundHero)
BindRedPointObject(RedPointType.RightUp2,this.rpRightUp2)
@ -631,6 +633,7 @@ function this.ClearRedPoint()
ClearRedPointObject(RedPointType.Vientiane, this.rpColorfulWorld)
ClearRedPointObject(RedPointType.PokemonMainCity, this.rpPokemon)
ClearRedPointObject(RedPointType.TianShuMiJuan,this.rpbtnTianShuMiJuan)
ClearRedPointObject(RedPointType.LuckyTurn,this.rpbtnXingYunTanBao)
ClearRedPointObject(RedPointType.FifteenDayGift,this.rpFifteenDayGift)
ClearRedPointObject(RedPointType.Huaxutan,this.rpCompoundHero)
ClearRedPointObject(RedPointType.RightUp2,this.rpRightUp2)
@ -779,8 +782,8 @@ function this.SetRightBarSize()
local str = PlayerPrefs.GetInt(PlayerManager.uid.."MainRightBarSetting")
if not str or str == 0 then
this.RightUp2bgSize.sizeDelta = Vector3.New(160,320,0)
this.RightUp2rectSize.sizeDelta = Vector3.New(160,220,0)
this.RightUp2bgSize.sizeDelta = Vector3.New(180,320,0)
this.RightUp2rectSize.sizeDelta = Vector3.New(180,220,0)
this.RightUp2btnImg.rotation = Quaternion.Euler(Vector3.New(0,0,-90))
else
this.RightUp2bgSize.sizeDelta = this.RightUp2gridSize.sizeDelta + Vector3.New(0,100,0)
@ -799,8 +802,8 @@ function this.SetRightBarSize()
--底图拉伸
DoTween.To(DG.Tweening.Core.DOGetter_float( function () return 220 end),
DG.Tweening.Core.DOSetter_float(function (t)
this.RightUp2rectSize.sizeDelta = Vector3.New(160,t,0)
this.RightUp2bgSize.sizeDelta = Vector3.New(160,t + 100,0)
this.RightUp2rectSize.sizeDelta = Vector3.New(180,t,0)
this.RightUp2bgSize.sizeDelta = Vector3.New(180,t + 100,0)
end), this.RightUp2gridSize.sizeDelta.y, 0.3):SetEase(Ease.Linear)
else
PlayerPrefs.SetInt(PlayerManager.uid.."MainRightBarSetting",0)
@ -812,8 +815,8 @@ function this.SetRightBarSize()
--底图拉伸
DoTween.To(DG.Tweening.Core.DOGetter_float( function () return this.RightUp2gridSize.sizeDelta.y end),
DG.Tweening.Core.DOSetter_float(function (t)
this.RightUp2rectSize.sizeDelta = Vector3.New(160,t,0)
this.RightUp2bgSize.sizeDelta = Vector3.New(160,t + 100,0)
this.RightUp2rectSize.sizeDelta = Vector3.New(180,t,0)
this.RightUp2bgSize.sizeDelta = Vector3.New(180,t + 100,0)
end), 220, 0.3):SetEase(Ease.Linear)
end
end)

View File

@ -29,7 +29,7 @@ function this:BindEvent()
end)
Util.AddClick(this.confirmBtn,function()
NetManager.ChoiceHeroRewardRequest(args[1],currHeroId,function()
Game.GlobalEvent:DispatchEvent(GameEvent.Activity.ContinueRechargeRefresh,currHeroId)
Game.GlobalEvent:DispatchEvent(GameEvent.Activity.TimeLimitUpHeroChange,currHeroId)
parent:ClosePanel()
end)