逍遥游 红点提交
parent
e95ae4724b
commit
1f05f5f8f6
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 814a374fa5248bc4f92e382b5827589b
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: a8565114765606a47bb956272df0d13e
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 095aa8f76340f854aa387f03d93db7d7
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 48cee46354d3dc145af2bf55ced3fde2
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 696df8709a12455479a651a73fe7a03b
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: cca5442cd3995a846bb82edb43d34dc5
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,88 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 85042cc6ab279fd45aff45e63617ba3a
|
||||
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: -1
|
||||
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: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 8d1def6cef689704881ac073b331b283
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,88 @@
|
|||
fileFormatVersion: 2
|
||||
guid: fe36762df3bdd83448a342d51008b637
|
||||
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: -1
|
||||
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: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 3d208273e9990494ebd0f16fe5920285
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -1907,6 +1907,8 @@ GameObject:
|
|||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 6749167481729292294}
|
||||
- component: {fileID: 8318904162734882086}
|
||||
- component: {fileID: 6753891769399292208}
|
||||
m_Layer: 5
|
||||
m_Name: redPoint
|
||||
m_TagString: Untagged
|
||||
|
|
@ -1930,9 +1932,46 @@ 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_SizeDelta: {x: 100, y: 100}
|
||||
m_AnchoredPosition: {x: 52.4, y: 91.5}
|
||||
m_SizeDelta: {x: 30, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8318904162734882086
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4107428381734209047}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &6753891769399292208
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4107428381734209047}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: f9ea4c4aff328ff4abcc21aae0a4fa10, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &4264963760793217269
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -4280,6 +4319,8 @@ GameObject:
|
|||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7182102039065137785}
|
||||
- component: {fileID: 6721444550965613927}
|
||||
- component: {fileID: 5297377081576127765}
|
||||
m_Layer: 5
|
||||
m_Name: redPoint
|
||||
m_TagString: Untagged
|
||||
|
|
@ -4303,9 +4344,46 @@ 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_SizeDelta: {x: 100, y: 100}
|
||||
m_AnchoredPosition: {x: 52.399994, y: 91.5}
|
||||
m_SizeDelta: {x: 30, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6721444550965613927
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8033203346880886019}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &5297377081576127765
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8033203346880886019}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: f9ea4c4aff328ff4abcc21aae0a4fa10, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &8121433219633590081
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -4706,6 +4784,8 @@ GameObject:
|
|||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 4283035908402714740}
|
||||
- component: {fileID: 179169981692132671}
|
||||
- component: {fileID: 1169129853179186888}
|
||||
m_Layer: 5
|
||||
m_Name: redPoint
|
||||
m_TagString: Untagged
|
||||
|
|
@ -4729,9 +4809,46 @@ 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_SizeDelta: {x: 100, y: 100}
|
||||
m_AnchoredPosition: {x: 52.399994, y: 91.5}
|
||||
m_SizeDelta: {x: 30, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &179169981692132671
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8721724692793742545}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &1169129853179186888
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8721724692793742545}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: f9ea4c4aff328ff4abcc21aae0a4fa10, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &8755262926574985647
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -437,7 +437,7 @@ function this.RegisterRedCheckFunc()
|
|||
|
||||
RPData:AddCheckFunc(RedPointType.WeekGiftPage,OperatingManager.CheckWeekGiftPageRedPoint)
|
||||
RPData:AddCheckFunc(RedPointType.MonthGiftPage,OperatingManager.CheckMonthGiftPageRedPoint)
|
||||
RPData:AddCheckFunc(RedPointType.XiaoYaoYouRedPoint, XiaoYaoManager.CheckRedPoint)
|
||||
RPData:AddCheckFunc(RedPointType.XiaoYaoYouRedPoint, XiaoYaoManager.CheckRedPoint2)
|
||||
--灵兽
|
||||
RPData:AddCheckFunc(RedPointType.Pokemon_UpLv,PokemonManager.RefreshPokemonUpLvRedPoint)
|
||||
RPData:AddCheckFunc(RedPointType.Pokemon_UpStar,PokemonManager.RefreshPokemonUpStarRedPoint)
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ function XiaoYaoLuckyTurnTablePopup:BindEvent()
|
|||
this.mask:SetActive(true)
|
||||
XiaoYaoManager.GameOperate(function(msg)
|
||||
--转起来
|
||||
LogGreen("msg.location:"..msg.location.. " msg.drop.itemlist[1].itemId: "..msg.drop.itemlist[1].itemId.." msg.drop.itemlist[1].itemNum: "..msg.drop.itemlist[1].itemNum )
|
||||
--LogGreen("msg.location:"..msg.location.. " msg.drop.itemlist[1].itemId: "..msg.drop.itemlist[1].itemId.." msg.drop.itemlist[1].itemNum: "..msg.drop.itemlist[1].itemNum )
|
||||
id = msg.drop.itemlist[1].itemId
|
||||
num = msg.drop.itemlist[1].itemNum
|
||||
this:test(msg.location)
|
||||
|
|
@ -70,7 +70,7 @@ function XiaoYaoLuckyTurnTablePopup:OnShow()
|
|||
for i,v in ipairs(rewardDataGroups) do
|
||||
table.insert(rewardDatas,rewardGroup[v].ShowItem[1])
|
||||
end
|
||||
LogGreen("rewardDatas:"..#rewardDatas)
|
||||
--LogGreen("rewardDatas:"..#rewardDatas)
|
||||
for i,v in ipairs(rewardDatas) do
|
||||
local item = _itemsList[i]
|
||||
Util.GetGameObject(item,"Red"):SetActive(false)
|
||||
|
|
@ -130,7 +130,7 @@ function XiaoYaoLuckyTurnTablePopup:tableTurnEffect(speed,itemId)
|
|||
-- 音效
|
||||
SoundManager.PlaySound(SoundConfig.Sound_zp)
|
||||
index = index + 1
|
||||
LogGreen("index == "..index)
|
||||
--LogGreen("index == "..index)
|
||||
--检测最后的奖励
|
||||
if itemId and index == itemId then
|
||||
this.turnEffect:Stop()
|
||||
|
|
|
|||
|
|
@ -35,6 +35,7 @@ function this.GetOpenMapData(func)
|
|||
_data[msg.infos[i].mapId].first=msg.infos[i].first
|
||||
end
|
||||
this.allMapData=_data
|
||||
this.CheckRedPoint2()
|
||||
if func then
|
||||
func(_data)
|
||||
end
|
||||
|
|
@ -78,15 +79,15 @@ function this.StartXiaoYao()
|
|||
if msg.pathType == 5 then
|
||||
this.InitMonsterData(msg.monster,2)
|
||||
PlayerPrefs.SetInt(string.format("%s#%s#%s",PlayerManager.uid,tostring(this.curMapId),tostring(3)),1)
|
||||
this.CheckRedPoint()
|
||||
this.CheckRedPoint2()
|
||||
elseif msg.pathType == 6 then
|
||||
this.InitLuckyTurnTables(msg)
|
||||
PlayerPrefs.SetInt(string.format("%s#%s#%s",PlayerManager.uid,tostring(this.curMapId),tostring(2)),1)
|
||||
this.CheckRedPoint()
|
||||
this.CheckRedPoint2()
|
||||
elseif msg.pathType == 4 then
|
||||
this.InitHeroData(msg.goodsInfo,2)
|
||||
PlayerPrefs.SetInt(string.format("%s#%s#%s",PlayerManager.uid,tostring(this.curMapId),tostring(1)),1)
|
||||
this.CheckRedPoint()
|
||||
this.CheckRedPoint2()
|
||||
elseif msg.pathType == 0 then
|
||||
end
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.XiaoYao.StartXiaoYao, msg)
|
||||
|
|
@ -129,10 +130,6 @@ function this.InitLuckyTurnTables(msg)
|
|||
else
|
||||
this.luckyluckyTurnTableTimes = this.luckyluckyTurnTableTimes - 1
|
||||
end
|
||||
if this.luckyluckyTurnTableTimes < 1 then
|
||||
PlayerPrefs.SetInt(string.format("%s#%s#%s",PlayerManager.uid,tostring(this.curMapId),tostring(2)),0)
|
||||
this.CheckRedPoint()
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -140,10 +137,6 @@ function this.UpdateLuckyTurnTables()
|
|||
this.luckyTurnTableRewards = {}
|
||||
this.luckyluckyTurnTableRemainTime = 0
|
||||
this.luckyluckyTurnTableTimes = 0
|
||||
if this.luckyluckyTurnTableTimes < 1 then
|
||||
PlayerPrefs.SetInt(string.format("%s#%s#%s",PlayerManager.uid,tostring(this.curMapId),tostring(2)),0)
|
||||
this.CheckRedPoint()
|
||||
end
|
||||
end
|
||||
|
||||
-- type 1初始化 2添加 hero
|
||||
|
|
@ -202,7 +195,7 @@ function this.UpdateHeroData(id)
|
|||
function this.GetHeroDataTime()
|
||||
if not this.HeroData or #this.HeroData < 1 then
|
||||
PlayerPrefs.SetInt(string.format("%s#%s#%s",PlayerManager.uid,tostring(this.curMapId),tostring(1)),0)
|
||||
this.CheckRedPoint()
|
||||
this.CheckRedPoint2()
|
||||
return 0,0
|
||||
end
|
||||
for i,v in ipairs(this.HeroData) do
|
||||
|
|
@ -263,7 +256,7 @@ function this.InitMonsterData(BackMonsterDatas,type)
|
|||
function this.GetMonsterDatas()
|
||||
if not this.MonsterData or #this.MonsterData < 1 then
|
||||
PlayerPrefs.SetInt(string.format("%s#%s#%s",PlayerManager.uid,tostring(this.curMapId),tostring(3)),0)
|
||||
this.CheckRedPoint()
|
||||
this.CheckRedPoint2()
|
||||
return nil
|
||||
end
|
||||
for i,v in ipairs(this.MonsterData) do
|
||||
|
|
@ -344,46 +337,50 @@ function this.GameOperate(func)
|
|||
end)
|
||||
end
|
||||
|
||||
function this.CheckRedPoint2()
|
||||
return this.CheckRedPoint()
|
||||
end
|
||||
|
||||
--检测逍遥游红点
|
||||
function this.CheckRedPoint(mapId,eventId)
|
||||
function this.CheckRedPoint(_mapId,_eventId)
|
||||
local eventId = _eventId and tonumber(_eventId) or 0
|
||||
local mapId = _mapId and tonumber(_mapId) or 0
|
||||
|
||||
if not ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.XiaoYaoYou) then
|
||||
return false
|
||||
end
|
||||
if eventId and eventId > 0 and mapId and mapId > 0 then
|
||||
if PlayerPrefs.GetInt(string.format("%s#%s#%s",PlayerManager.uid,tostring(mapId),tostring(eventId))) == 1 then
|
||||
if eventId == 1 and #this.GetHeroDatas() > 0 then
|
||||
return true
|
||||
elseif eventId == 2 and this.luckyluckyTurnTableTimes > 0 then
|
||||
return true
|
||||
elseif eventId == 3 and #this.GetMonsterDatas() > 0 then
|
||||
return true
|
||||
end
|
||||
return true
|
||||
else
|
||||
return false
|
||||
end
|
||||
else
|
||||
if mapId and mapId > 0 then
|
||||
if this.allMapData and this.allMapData[mapId] and this.allMapData[mapId].redPoint == 1 then
|
||||
return true
|
||||
end
|
||||
for i = 1 , 3 do
|
||||
if PlayerPrefs.GetInt(string.format("%s#%s#%s",PlayerManager.uid,tostring(mapId),tostring(i))) == 1 then
|
||||
PlayerPrefs.SetInt(string.format("%s#%s#%s",PlayerManager.uid,tostring(mapId),tostring(i)),0)
|
||||
end
|
||||
end
|
||||
this.CheckRedPoint()
|
||||
return false
|
||||
end
|
||||
end
|
||||
if BagManager.GetItemCountById(UpViewRechargeType.YunYouVle)>=PrivilegeManager.GetPrivilegeNumber(39) then
|
||||
return true
|
||||
end
|
||||
for k, v in pairs(this.allMapData) do
|
||||
elseif mapId and mapId > 0 then
|
||||
for i = 1 , 3 do
|
||||
if PlayerPrefs.GetInt(string.format("%s#%s#%s",PlayerManager.uid,tostring(k),tostring(i))) == 1 then
|
||||
if PlayerPrefs.GetInt(string.format("%s#%s#%s",PlayerManager.uid,tostring(mapId),tostring(i))) == 1 then
|
||||
return true
|
||||
end
|
||||
end
|
||||
return false
|
||||
else
|
||||
if BagManager.GetItemCountById(UpViewRechargeType.YunYouVle)>=PrivilegeManager.GetPrivilegeNumber(39) then
|
||||
return true
|
||||
end
|
||||
for k, v in pairs(this.allMapData) do
|
||||
for i = 1 , 3 do
|
||||
LogGreen(tostring(k).." "..tostring(i).." "..PlayerPrefs.GetInt(string.format("%s#%s#%s",PlayerManager.uid,tostring(k),tostring(i))))
|
||||
if v.redPoint == 1 then
|
||||
if PlayerPrefs.GetInt(string.format("%s#%s#%s",PlayerManager.uid,tostring(k),tostring(i))) == 1 then
|
||||
return true
|
||||
end
|
||||
else
|
||||
if PlayerPrefs.GetInt(string.format("%s#%s#%s",PlayerManager.uid,tostring(k),tostring(i))) == 1 then
|
||||
PlayerPrefs.SetInt(string.format("%s#%s#%s",PlayerManager.uid,tostring(k),tostring(i)),0)
|
||||
end
|
||||
end
|
||||
end
|
||||
return false
|
||||
end
|
||||
end
|
||||
return false
|
||||
end
|
||||
|
|
|
|||
|
|
@ -97,12 +97,14 @@ function this:BindEvent()
|
|||
end)
|
||||
--商店点击
|
||||
Util.AddClick(this.shopBtn, function ()
|
||||
PlayerPrefs.SetInt(string.format("%s#%s#%s",PlayerManager.uid,tostring(XiaoYaoManager.curMapId),tostring(1)),0)
|
||||
PlayerPrefs.SetInt(string.format("%s#%s#%s",PlayerManager.uid,tostring(XiaoYaoManager.curMapId),tostring(1)),0)
|
||||
XiaoYaoManager.CheckRedPoint2()
|
||||
UIManager.OpenPanel(UIName.XiaoyaoHeroGetPopup)
|
||||
end)
|
||||
--转盘点击
|
||||
Util.AddClick(this.rouleBtn, function ()
|
||||
PlayerPrefs.SetInt(string.format("%s#%s#%s",PlayerManager.uid,tostring(XiaoYaoManager.curMapId),tostring(2)),0)
|
||||
PlayerPrefs.SetInt(string.format("%s#%s#%s",PlayerManager.uid,tostring(XiaoYaoManager.curMapId),tostring(2)),0)
|
||||
XiaoYaoManager.CheckRedPoint2()
|
||||
-- local grids={{index=3,gName="ccc"},{index=5,gName="eee"},{index=2,gName="bbb"},{index=4,gName="ddd"}}
|
||||
-- table.sort(grids,function(a,b)
|
||||
-- return a.index < b.index
|
||||
|
|
@ -114,7 +116,8 @@ function this:BindEvent()
|
|||
end)
|
||||
--boss点击事件
|
||||
Util.AddClick(this.bossBtn, function ()
|
||||
PlayerPrefs.SetInt(string.format("%s#%s#%s",PlayerManager.uid,tostring(XiaoYaoManager.curMapId),tostring(3)),0)
|
||||
PlayerPrefs.SetInt(string.format("%s#%s#%s",PlayerManager.uid,tostring(XiaoYaoManager.curMapId),tostring(3)),0)
|
||||
XiaoYaoManager.CheckRedPoint2()
|
||||
UIManager.OpenPanel(UIName.XiaoYaoLuckyBossPopup)
|
||||
end)
|
||||
--奖励预览
|
||||
|
|
@ -185,32 +188,6 @@ function this:RemoveListener()
|
|||
Game.GlobalEvent:RemoveEvent(GameEvent.XiaoYao.PlayEventEffect, this.PlayEffect)
|
||||
end
|
||||
|
||||
-- --刷新界面事件入口按钮显示隐藏
|
||||
-- function this.RefreshEventBtn()
|
||||
-- this.UpdateYunYouVleShow()
|
||||
--
|
||||
|
||||
-- if XiaoYaoManager.luckyluckyTurnTableTimes > 0 and (XiaoYaoManager.luckyluckyTurnTableRemainTime - PlayerManager.serverTime > 0) then
|
||||
-- this.rouleBtn:SetActive(true)
|
||||
-- else
|
||||
-- this.rouleBtn:SetActive(false)
|
||||
-- end
|
||||
-- local temp = XiaoYaoManager.GetMonsterDatas()
|
||||
-- if temp and #temp > 0 then
|
||||
-- this.bossBtn:SetActive(true)
|
||||
-- else
|
||||
-- this.bossBtn:SetActive(false)
|
||||
-- end
|
||||
-- local temp = XiaoYaoManager.GetHeroDatas()
|
||||
-- if temp and #temp > 0 then
|
||||
-- this.shopBtn:SetActive(true)
|
||||
-- else
|
||||
-- this.shopBtn:SetActive(false)
|
||||
-- end
|
||||
-- shopLeftTimes,shopLeftTime=XiaoYaoManager.GetHeroDataTime()
|
||||
-- rouleLeftTime=XiaoYaoManager.luckyluckyTurnTableRemainTime
|
||||
-- bossLeftTime,bossLeftTime=XiaoYaoManager.GetMonsterDataReMainTimesAndTime()
|
||||
-- end
|
||||
---播放骰子动效
|
||||
function this.PlaySaiziAnim(_data)
|
||||
this.startBtn:GetComponent("Button").enabled=false
|
||||
|
|
@ -585,7 +562,9 @@ function this.DownTime()
|
|||
local couTime =shopLeftTime- PlayerManager.serverTime
|
||||
if couTime<=0 then
|
||||
-- 倒计时结束
|
||||
this.shopBtn:SetActive(false)
|
||||
this.shopBtn:SetActive(false)
|
||||
PlayerPrefs.SetInt(string.format("%s#%s#%s",PlayerManager.uid,tostring(XiaoYaoManager.curMapId),tostring(1)),0)
|
||||
XiaoYaoManager.CheckRedPoint2()
|
||||
else
|
||||
this.shopTime.text = TimeToHMS(math.floor(couTime))
|
||||
end
|
||||
|
|
@ -594,7 +573,9 @@ function this.DownTime()
|
|||
couTime =rouleLeftTime- PlayerManager.serverTime
|
||||
if couTime<=0 then
|
||||
-- 倒计时结束
|
||||
this.rouleBtn:SetActive(false)
|
||||
this.rouleBtn:SetActive(false)
|
||||
PlayerPrefs.SetInt(string.format("%s#%s#%s",PlayerManager.uid,tostring(XiaoYaoManager.curMapId),tostring(2)),0)
|
||||
XiaoYaoManager.CheckRedPoint2()
|
||||
else
|
||||
this.rouleTime.text = TimeToHMS(math.floor(couTime))
|
||||
end
|
||||
|
|
@ -603,7 +584,9 @@ function this.DownTime()
|
|||
couTime =bossLeftTime- PlayerManager.serverTime
|
||||
if couTime<=0 then
|
||||
-- 倒计时结束
|
||||
this.bossBtn:SetActive(false)
|
||||
this.bossBtn:SetActive(false)
|
||||
PlayerPrefs.SetInt(string.format("%s#%s#%s",PlayerManager.uid,tostring(XiaoYaoManager.curMapId),tostring(3)),0)
|
||||
XiaoYaoManager.CheckRedPoint2()
|
||||
else
|
||||
this.bossTime.text = TimeToHMS(math.floor(couTime))
|
||||
end
|
||||
|
|
|
|||
|
|
@ -159,10 +159,11 @@ function this.SingleDataShow(btn, go, data, index)
|
|||
XiaoYaoManager.OpenXiaoYaoMap(data.mapId)
|
||||
end
|
||||
end)
|
||||
redPoint:SetActive(XiaoYaoManager.CheckRedPoint(data.mapId))
|
||||
|
||||
-- lock:SetActive(not data.isUnLock)
|
||||
name.text=data.mapName
|
||||
if data.isUnLock then
|
||||
redPoint:SetActive(XiaoYaoManager.CheckRedPoint(data.mapId))
|
||||
Util.SetGray(go,false)
|
||||
tip.text = "云\n游\n进\n度"
|
||||
tip2.text = ""
|
||||
|
|
|
|||
Loading…
Reference in New Issue