【寻宝】加锁
parent
223c23f4bd
commit
a6d16c13e5
Binary file not shown.
After Width: | Height: | Size: 14 KiB |
|
@ -0,0 +1,88 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: ee4c210c371746647b90319fad34e582
|
||||||
|
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: 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: 1b93a933024200a46b17ce3e0fc669c6
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
spritePackingTag: RoleInfoAtlas
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
Binary file not shown.
After Width: | Height: | Size: 15 KiB |
|
@ -0,0 +1,88 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: baf272346cd0cb744827ad5c6c6918f5
|
||||||
|
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: 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: 38bfbd7f50b91874cb529c8dcbdb26c1
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
spritePackingTag: RoleInfoAtlas
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
|
@ -334,10 +334,10 @@ RectTransform:
|
||||||
m_Father: {fileID: 6231715520568056958}
|
m_Father: {fileID: 6231715520568056958}
|
||||||
m_RootOrder: 1
|
m_RootOrder: 1
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
m_AnchoredPosition: {x: 90.01, y: -25}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 45, y: 45}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &8950520823065959504
|
--- !u!222 &8950520823065959504
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -540,10 +540,10 @@ RectTransform:
|
||||||
m_Father: {fileID: 6231715520568056958}
|
m_Father: {fileID: 6231715520568056958}
|
||||||
m_RootOrder: 5
|
m_RootOrder: 5
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
m_AnchoredPosition: {x: 265.93, y: -25}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 45, y: 45}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &6664246258907241857
|
--- !u!222 &6664246258907241857
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -1226,8 +1226,8 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: -0.00006866455, y: -2.9999943}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 50, y: 49}
|
m_SizeDelta: {x: 159.3, y: 147.3}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &8355385185974677893
|
--- !u!222 &8355385185974677893
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -1257,7 +1257,7 @@ MonoBehaviour:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
m_Sprite: {fileID: 21300000, guid: 0c5a06f37c6ccfe488ddec26ead85809, type: 3}
|
m_Sprite: {fileID: 21300000, guid: ee4c210c371746647b90319fad34e582, type: 3}
|
||||||
m_Type: 0
|
m_Type: 0
|
||||||
m_PreserveAspect: 0
|
m_PreserveAspect: 0
|
||||||
m_FillCenter: 1
|
m_FillCenter: 1
|
||||||
|
@ -1300,8 +1300,8 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 0, y: -3}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 50, y: 49}
|
m_SizeDelta: {x: 159.3, y: 147.3}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &1021206959409228131
|
--- !u!222 &1021206959409228131
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -1331,7 +1331,7 @@ MonoBehaviour:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
m_Sprite: {fileID: 21300000, guid: 40863c3bcc0b2a44aaa70185a494ec0a, type: 3}
|
m_Sprite: {fileID: 21300000, guid: baf272346cd0cb744827ad5c6c6918f5, type: 3}
|
||||||
m_Type: 0
|
m_Type: 0
|
||||||
m_PreserveAspect: 0
|
m_PreserveAspect: 0
|
||||||
m_FillCenter: 1
|
m_FillCenter: 1
|
||||||
|
@ -1674,8 +1674,8 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 62, y: -23.14}
|
m_AnchoredPosition: {x: 75, y: -20.64}
|
||||||
m_SizeDelta: {x: 106.4, y: 104.3}
|
m_SizeDelta: {x: 127, y: 124.44}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &1727709791038661959
|
--- !u!222 &1727709791038661959
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -2273,10 +2273,10 @@ RectTransform:
|
||||||
m_Father: {fileID: 6231715520568056958}
|
m_Father: {fileID: 6231715520568056958}
|
||||||
m_RootOrder: 2
|
m_RootOrder: 2
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
m_AnchoredPosition: {x: 133.98999, y: -25}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 45, y: 45}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &5136663928961788941
|
--- !u!222 &5136663928961788941
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -8939,10 +8939,10 @@ RectTransform:
|
||||||
m_Father: {fileID: 6231715520568056958}
|
m_Father: {fileID: 6231715520568056958}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
m_AnchoredPosition: {x: 46.03, y: -25}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 45, y: 45}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &5280488458091641116
|
--- !u!222 &5280488458091641116
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -9386,7 +9386,7 @@ RectTransform:
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 2, y: -20}
|
m_SizeDelta: {x: 2, y: -20}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
@ -9745,7 +9745,7 @@ RectTransform:
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
@ -9898,10 +9898,10 @@ RectTransform:
|
||||||
m_Father: {fileID: 6231715520568056958}
|
m_Father: {fileID: 6231715520568056958}
|
||||||
m_RootOrder: 3
|
m_RootOrder: 3
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
m_AnchoredPosition: {x: 177.97, y: -25}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 45, y: 45}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &3571723350804515401
|
--- !u!222 &3571723350804515401
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -14793,10 +14793,10 @@ RectTransform:
|
||||||
m_Father: {fileID: 6231715520568056958}
|
m_Father: {fileID: 6231715520568056958}
|
||||||
m_RootOrder: 4
|
m_RootOrder: 4
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
m_AnchoredPosition: {x: 221.95, y: -25}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 45, y: 45}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &8806476941630947315
|
--- !u!222 &8806476941630947315
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
|
|
@ -261,6 +261,7 @@ USERMISSIONINFO_STATE_FIELD = protobuf.FieldDescriptor();
|
||||||
USERMISSIONINFO_TYPE_FIELD = protobuf.FieldDescriptor();
|
USERMISSIONINFO_TYPE_FIELD = protobuf.FieldDescriptor();
|
||||||
USERMISSIONINFO_TAKETIMES_FIELD = protobuf.FieldDescriptor();
|
USERMISSIONINFO_TAKETIMES_FIELD = protobuf.FieldDescriptor();
|
||||||
USERMISSIONINFO_HEROID_FIELD = protobuf.FieldDescriptor();
|
USERMISSIONINFO_HEROID_FIELD = protobuf.FieldDescriptor();
|
||||||
|
USERMISSIONINFO_LOCK_FIELD = protobuf.FieldDescriptor();
|
||||||
VIPBASEINFO = protobuf.Descriptor();
|
VIPBASEINFO = protobuf.Descriptor();
|
||||||
VIPBASEINFO_VIPLEVEL_FIELD = protobuf.FieldDescriptor();
|
VIPBASEINFO_VIPLEVEL_FIELD = protobuf.FieldDescriptor();
|
||||||
VIPBASEINFO_HADTAKELEVELBOX_FIELD = protobuf.FieldDescriptor();
|
VIPBASEINFO_HADTAKELEVELBOX_FIELD = protobuf.FieldDescriptor();
|
||||||
|
@ -3060,11 +3061,21 @@ USERMISSIONINFO_HEROID_FIELD.default_value = {}
|
||||||
USERMISSIONINFO_HEROID_FIELD.type = 9
|
USERMISSIONINFO_HEROID_FIELD.type = 9
|
||||||
USERMISSIONINFO_HEROID_FIELD.cpp_type = 9
|
USERMISSIONINFO_HEROID_FIELD.cpp_type = 9
|
||||||
|
|
||||||
|
USERMISSIONINFO_LOCK_FIELD.name = "lock"
|
||||||
|
USERMISSIONINFO_LOCK_FIELD.full_name = ".rpc.protocols.UserMissionInfo.lock"
|
||||||
|
USERMISSIONINFO_LOCK_FIELD.number = 7
|
||||||
|
USERMISSIONINFO_LOCK_FIELD.index = 6
|
||||||
|
USERMISSIONINFO_LOCK_FIELD.label = 1
|
||||||
|
USERMISSIONINFO_LOCK_FIELD.has_default_value = false
|
||||||
|
USERMISSIONINFO_LOCK_FIELD.default_value = 0
|
||||||
|
USERMISSIONINFO_LOCK_FIELD.type = 5
|
||||||
|
USERMISSIONINFO_LOCK_FIELD.cpp_type = 1
|
||||||
|
|
||||||
USERMISSIONINFO.name = "UserMissionInfo"
|
USERMISSIONINFO.name = "UserMissionInfo"
|
||||||
USERMISSIONINFO.full_name = ".rpc.protocols.UserMissionInfo"
|
USERMISSIONINFO.full_name = ".rpc.protocols.UserMissionInfo"
|
||||||
USERMISSIONINFO.nested_types = {}
|
USERMISSIONINFO.nested_types = {}
|
||||||
USERMISSIONINFO.enum_types = {}
|
USERMISSIONINFO.enum_types = {}
|
||||||
USERMISSIONINFO.fields = {USERMISSIONINFO_MISSIONID_FIELD, USERMISSIONINFO_PROGRESS_FIELD, USERMISSIONINFO_STATE_FIELD, USERMISSIONINFO_TYPE_FIELD, USERMISSIONINFO_TAKETIMES_FIELD, USERMISSIONINFO_HEROID_FIELD}
|
USERMISSIONINFO.fields = {USERMISSIONINFO_MISSIONID_FIELD, USERMISSIONINFO_PROGRESS_FIELD, USERMISSIONINFO_STATE_FIELD, USERMISSIONINFO_TYPE_FIELD, USERMISSIONINFO_TAKETIMES_FIELD, USERMISSIONINFO_HEROID_FIELD, USERMISSIONINFO_LOCK_FIELD}
|
||||||
USERMISSIONINFO.is_extendable = false
|
USERMISSIONINFO.is_extendable = false
|
||||||
USERMISSIONINFO.extensions = {}
|
USERMISSIONINFO.extensions = {}
|
||||||
VIPBASEINFO_VIPLEVEL_FIELD.name = "vipLevel"
|
VIPBASEINFO_VIPLEVEL_FIELD.name = "vipLevel"
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -426,6 +426,9 @@ MISSINGROOMSENDHEROREQUEST_HEROIDS_FIELD = protobuf.FieldDescriptor();
|
||||||
MISSINGROOMSENDHEROREQUEST_MISSIONID_FIELD = protobuf.FieldDescriptor();
|
MISSINGROOMSENDHEROREQUEST_MISSIONID_FIELD = protobuf.FieldDescriptor();
|
||||||
MISSINGROOMACCELERATEREQUEST = protobuf.Descriptor();
|
MISSINGROOMACCELERATEREQUEST = protobuf.Descriptor();
|
||||||
MISSINGROOMACCELERATEREQUEST_MISSIONID_FIELD = protobuf.FieldDescriptor();
|
MISSINGROOMACCELERATEREQUEST_MISSIONID_FIELD = protobuf.FieldDescriptor();
|
||||||
|
MISSINGROOMLOCKREQUEST = protobuf.Descriptor();
|
||||||
|
MISSINGROOMLOCKREQUEST_MISSIONID_FIELD = protobuf.FieldDescriptor();
|
||||||
|
MISSINGROOMLOCKREQUEST_LOCK_FIELD = protobuf.FieldDescriptor();
|
||||||
SEXCHANGEREQUEST = protobuf.Descriptor();
|
SEXCHANGEREQUEST = protobuf.Descriptor();
|
||||||
SEXCHANGEREQUEST_SEX_FIELD = protobuf.FieldDescriptor();
|
SEXCHANGEREQUEST_SEX_FIELD = protobuf.FieldDescriptor();
|
||||||
SEXCHANGERESPONSE = protobuf.Descriptor();
|
SEXCHANGERESPONSE = protobuf.Descriptor();
|
||||||
|
@ -4357,6 +4360,33 @@ MISSINGROOMACCELERATEREQUEST.enum_types = {}
|
||||||
MISSINGROOMACCELERATEREQUEST.fields = {MISSINGROOMACCELERATEREQUEST_MISSIONID_FIELD}
|
MISSINGROOMACCELERATEREQUEST.fields = {MISSINGROOMACCELERATEREQUEST_MISSIONID_FIELD}
|
||||||
MISSINGROOMACCELERATEREQUEST.is_extendable = false
|
MISSINGROOMACCELERATEREQUEST.is_extendable = false
|
||||||
MISSINGROOMACCELERATEREQUEST.extensions = {}
|
MISSINGROOMACCELERATEREQUEST.extensions = {}
|
||||||
|
MISSINGROOMLOCKREQUEST_MISSIONID_FIELD.name = "missionId"
|
||||||
|
MISSINGROOMLOCKREQUEST_MISSIONID_FIELD.full_name = ".rpc.protocols.MissingRoomLockRequest.missionId"
|
||||||
|
MISSINGROOMLOCKREQUEST_MISSIONID_FIELD.number = 1
|
||||||
|
MISSINGROOMLOCKREQUEST_MISSIONID_FIELD.index = 0
|
||||||
|
MISSINGROOMLOCKREQUEST_MISSIONID_FIELD.label = 1
|
||||||
|
MISSINGROOMLOCKREQUEST_MISSIONID_FIELD.has_default_value = false
|
||||||
|
MISSINGROOMLOCKREQUEST_MISSIONID_FIELD.default_value = 0
|
||||||
|
MISSINGROOMLOCKREQUEST_MISSIONID_FIELD.type = 5
|
||||||
|
MISSINGROOMLOCKREQUEST_MISSIONID_FIELD.cpp_type = 1
|
||||||
|
|
||||||
|
MISSINGROOMLOCKREQUEST_LOCK_FIELD.name = "lock"
|
||||||
|
MISSINGROOMLOCKREQUEST_LOCK_FIELD.full_name = ".rpc.protocols.MissingRoomLockRequest.lock"
|
||||||
|
MISSINGROOMLOCKREQUEST_LOCK_FIELD.number = 2
|
||||||
|
MISSINGROOMLOCKREQUEST_LOCK_FIELD.index = 1
|
||||||
|
MISSINGROOMLOCKREQUEST_LOCK_FIELD.label = 1
|
||||||
|
MISSINGROOMLOCKREQUEST_LOCK_FIELD.has_default_value = false
|
||||||
|
MISSINGROOMLOCKREQUEST_LOCK_FIELD.default_value = 0
|
||||||
|
MISSINGROOMLOCKREQUEST_LOCK_FIELD.type = 5
|
||||||
|
MISSINGROOMLOCKREQUEST_LOCK_FIELD.cpp_type = 1
|
||||||
|
|
||||||
|
MISSINGROOMLOCKREQUEST.name = "MissingRoomLockRequest"
|
||||||
|
MISSINGROOMLOCKREQUEST.full_name = ".rpc.protocols.MissingRoomLockRequest"
|
||||||
|
MISSINGROOMLOCKREQUEST.nested_types = {}
|
||||||
|
MISSINGROOMLOCKREQUEST.enum_types = {}
|
||||||
|
MISSINGROOMLOCKREQUEST.fields = {MISSINGROOMLOCKREQUEST_MISSIONID_FIELD, MISSINGROOMLOCKREQUEST_LOCK_FIELD}
|
||||||
|
MISSINGROOMLOCKREQUEST.is_extendable = false
|
||||||
|
MISSINGROOMLOCKREQUEST.extensions = {}
|
||||||
SEXCHANGEREQUEST_SEX_FIELD.name = "sex"
|
SEXCHANGEREQUEST_SEX_FIELD.name = "sex"
|
||||||
SEXCHANGEREQUEST_SEX_FIELD.full_name = ".rpc.protocols.SexChangeRequest.sex"
|
SEXCHANGEREQUEST_SEX_FIELD.full_name = ".rpc.protocols.SexChangeRequest.sex"
|
||||||
SEXCHANGEREQUEST_SEX_FIELD.number = 1
|
SEXCHANGEREQUEST_SEX_FIELD.number = 1
|
||||||
|
@ -4735,6 +4765,7 @@ LuckWheelIndication = protobuf.Message(LUCKWHEELINDICATION)
|
||||||
MailDelRequest = protobuf.Message(MAILDELREQUEST)
|
MailDelRequest = protobuf.Message(MAILDELREQUEST)
|
||||||
MailReadRequest = protobuf.Message(MAILREADREQUEST)
|
MailReadRequest = protobuf.Message(MAILREADREQUEST)
|
||||||
MissingRoomAccelerateRequest = protobuf.Message(MISSINGROOMACCELERATEREQUEST)
|
MissingRoomAccelerateRequest = protobuf.Message(MISSINGROOMACCELERATEREQUEST)
|
||||||
|
MissingRoomLockRequest = protobuf.Message(MISSINGROOMLOCKREQUEST)
|
||||||
MissingRoomRefreshResponse = protobuf.Message(MISSINGROOMREFRESHRESPONSE)
|
MissingRoomRefreshResponse = protobuf.Message(MISSINGROOMREFRESHRESPONSE)
|
||||||
MissingRoomSendHeroRequest = protobuf.Message(MISSINGROOMSENDHEROREQUEST)
|
MissingRoomSendHeroRequest = protobuf.Message(MISSINGROOMSENDHEROREQUEST)
|
||||||
MissionUpdateListIndication = protobuf.Message(MISSIONUPDATELISTINDICATION)
|
MissionUpdateListIndication = protobuf.Message(MISSIONUPDATELISTINDICATION)
|
||||||
|
|
|
@ -9,7 +9,7 @@ local CombatControl = ConfigManager.GetConfig(ConfigName.CombatControl)
|
||||||
local SpiritAnimalSkill = ConfigManager.GetConfig(ConfigName.SpiritAnimalSkill)
|
local SpiritAnimalSkill = ConfigManager.GetConfig(ConfigName.SpiritAnimalSkill)
|
||||||
local FakeBattleNew = ConfigManager.GetConfig(ConfigName.FakeBattleNew)
|
local FakeBattleNew = ConfigManager.GetConfig(ConfigName.FakeBattleNew)
|
||||||
local FEAConfig = require("Modules/Battle/Config/FightEffectAudioConfig")
|
local FEAConfig = require("Modules/Battle/Config/FightEffectAudioConfig")
|
||||||
|
local curFightData = nil
|
||||||
local function pairsByKeys(t)
|
local function pairsByKeys(t)
|
||||||
local a = {}
|
local a = {}
|
||||||
for n in pairs(t) do
|
for n in pairs(t) do
|
||||||
|
@ -451,6 +451,7 @@ function this.GetBattleServerData(msg, isFightPlayer)
|
||||||
fightId = msg.fightData.fightId,
|
fightId = msg.fightData.fightId,
|
||||||
}
|
}
|
||||||
LogYellow("收到的战斗ID = "..msg.fightData.fightId)
|
LogYellow("收到的战斗ID = "..msg.fightData.fightId)
|
||||||
|
curFightData = data
|
||||||
return data
|
return data
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -989,7 +990,16 @@ function this.RequestBattleDataByFightId(fightId, func)
|
||||||
end, nil, nil, nil)
|
end, nil, nil, nil)
|
||||||
|
|
||||||
end
|
end
|
||||||
|
--普通战斗回访
|
||||||
|
function this.BattleBackFun(doneFunc,battle_type)
|
||||||
|
if curFightData then
|
||||||
|
-- local fightData = BattleManager.GetBattleServerData({fightData = curFightData}, 1)
|
||||||
|
if UIManager.GetOpenPanel(UIName.BattlePanel) then
|
||||||
|
UIManager.ClosePanel(UIName.BattlePanel)
|
||||||
|
end
|
||||||
|
local battlePanel = UIManager.OpenPanel(UIName.BattlePanel, curFightData, battle_type and battle_type or BATTLE_TYPE.BACK, doneFunc)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -86,7 +86,7 @@ function FindTreasureMainPanel:BindEvent()
|
||||||
for i = 1, #missionInfo do
|
for i = 1, #missionInfo do
|
||||||
if missionInfo[i].state ~= 2 then
|
if missionInfo[i].state ~= 2 then
|
||||||
if ConfigManager.GetConfigData(ConfigName.MazeTreasure,math.floor(missionInfo[i].missionId%10000)).TaskType >= 4
|
if ConfigManager.GetConfigData(ConfigName.MazeTreasure,math.floor(missionInfo[i].missionId%10000)).TaskType >= 4
|
||||||
and #missionInfo[i].heroId <= 0 then
|
and #missionInfo[i].heroId <= 0 and missionInfo[i].lock == 0 then
|
||||||
isShowTwo = true
|
isShowTwo = true
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -280,7 +280,6 @@ end
|
||||||
|
|
||||||
--活动奖励2
|
--活动奖励2
|
||||||
function FindTreasureMainPanel:ActivityRewardSingleShow(_activityRewardGo,rewardData)
|
function FindTreasureMainPanel:ActivityRewardSingleShow(_activityRewardGo,rewardData)
|
||||||
rewardData.lockState = 1
|
|
||||||
local activityRewardGo = _activityRewardGo--findTreasureGrid[index]
|
local activityRewardGo = _activityRewardGo--findTreasureGrid[index]
|
||||||
activityRewardGo:SetActive(true)
|
activityRewardGo:SetActive(true)
|
||||||
local sConFigData = ConfigManager.GetConfigData(ConfigName.MazeTreasure,math.floor(rewardData.missionId%10000))
|
local sConFigData = ConfigManager.GetConfigData(ConfigName.MazeTreasure,math.floor(rewardData.missionId%10000))
|
||||||
|
@ -345,8 +344,8 @@ function FindTreasureMainPanel:ActivityRewardSingleShow(_activityRewardGo,reward
|
||||||
consumeObj:SetActive(rewardData.state == 0 and rewardData.heroId and #rewardData.heroId <= 0)
|
consumeObj:SetActive(rewardData.state == 0 and rewardData.heroId and #rewardData.heroId <= 0)
|
||||||
quickGetButton:SetActive(rewardData.state == 0 and rewardData.heroId and #rewardData.heroId > 0 )
|
quickGetButton:SetActive(rewardData.state == 0 and rewardData.heroId and #rewardData.heroId > 0 )
|
||||||
lockBtn:SetActive(rewardData.state == 0 and rewardData.heroId and #rewardData.heroId <= 0)
|
lockBtn:SetActive(rewardData.state == 0 and rewardData.heroId and #rewardData.heroId <= 0)
|
||||||
lockLockImage:SetActive(rewardData.lockState == 1)
|
lockLockImage:SetActive(rewardData.lock == 1)
|
||||||
lockOpenImage:SetActive(rewardData.lockState == 0)
|
lockOpenImage:SetActive(rewardData.lock == 0)
|
||||||
consumeObjImage.sprite = Util.LoadSprite(GetResourcePath(ConfigManager.GetConfigData(ConfigName.ItemConfig,sConFigData.TakeItem[1]).ResourceID))
|
consumeObjImage.sprite = Util.LoadSprite(GetResourcePath(ConfigManager.GetConfigData(ConfigName.ItemConfig,sConFigData.TakeItem[1]).ResourceID))
|
||||||
|
|
||||||
local isJian = PrivilegeManager.GetSerData(155) ~= nil--PrivilegeManager.GetPrivilegeRemainValue(PRIVILEGE_TYPE.FINDTREASURE_EXPERT) > 0
|
local isJian = PrivilegeManager.GetSerData(155) ~= nil--PrivilegeManager.GetPrivilegeRemainValue(PRIVILEGE_TYPE.FINDTREASURE_EXPERT) > 0
|
||||||
|
@ -377,17 +376,17 @@ function FindTreasureMainPanel:ActivityRewardSingleShow(_activityRewardGo,reward
|
||||||
end)
|
end)
|
||||||
|
|
||||||
Util.AddOnceClick(lockBtn, function()
|
Util.AddOnceClick(lockBtn, function()
|
||||||
-- NetManager.FindTreasureMissingRoomAccelerateRequest(rewardData.missionId, function()
|
if rewardData.lock == 0 then
|
||||||
--刷新界面
|
rewardData.lock = 1
|
||||||
-- TaskManager.RefreshFindTreasureStatrData(rewardData.missionId,1)
|
else
|
||||||
if rewardData.lockState == 0 then
|
rewardData.lock = 0
|
||||||
rewardData.lockState = 1
|
end
|
||||||
else
|
NetManager.MissingRoomLockRequest(rewardData.missionId,rewardData.lock, function()
|
||||||
rewardData.lockState = 0
|
--刷新界面
|
||||||
end
|
TaskManager.RefreshFindTreasureStatrData2(rewardData.missionId,rewardData.lock)
|
||||||
LogPink("rewardData.lockState "..rewardData.lockState)
|
LogPink("rewardData.lock "..rewardData.lock)
|
||||||
self:ActivityRewardSingleShow(activityRewardGo,rewardData)
|
self:ActivityRewardSingleShow(activityRewardGo,rewardData)
|
||||||
-- end)
|
end)
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
--刷新倒计时显示
|
--刷新倒计时显示
|
||||||
|
@ -456,8 +455,12 @@ function FindTreasureMainPanel:MissionInfoSort(missionInfo)
|
||||||
table.sort(missionInfo, function(a, b)
|
table.sort(missionInfo, function(a, b)
|
||||||
if a.state == b.state then
|
if a.state == b.state then
|
||||||
if #a.heroId > 0 and #b.heroId > 0 or #a.heroId <= 0 and #b.heroId <= 0 then
|
if #a.heroId > 0 and #b.heroId > 0 or #a.heroId <= 0 and #b.heroId <= 0 then
|
||||||
return ConfigManager.GetConfigData(ConfigName.MazeTreasure,math.floor(a.missionId%10000)).TaskType >
|
if a.lock == b.lock then
|
||||||
ConfigManager.GetConfigData(ConfigName.MazeTreasure,math.floor(b.missionId%10000)).TaskType
|
return ConfigManager.GetConfigData(ConfigName.MazeTreasure,math.floor(a.missionId%10000)).TaskType >
|
||||||
|
ConfigManager.GetConfigData(ConfigName.MazeTreasure,math.floor(b.missionId%10000)).TaskType
|
||||||
|
else
|
||||||
|
return a.lock > b.lock
|
||||||
|
end
|
||||||
else
|
else
|
||||||
return #a.heroId < #b.heroId
|
return #a.heroId < #b.heroId
|
||||||
end
|
end
|
||||||
|
|
|
@ -4720,4 +4720,16 @@ function this.NewGeneralAttackRequest(activityId,privilageTypeId,func)
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
--迷宫寻宝加锁
|
||||||
|
function this.MissingRoomLockRequest(missionId,lock,func)
|
||||||
|
local data = PlayerInfoProto_pb.MissingRoomLockRequest()
|
||||||
|
data.missionId = missionId
|
||||||
|
data.lock = lock
|
||||||
|
local msg = data:SerializeToString()
|
||||||
|
Network:SendMessageWithCallBack(MessageTypeProto_pb.MISSING_ROOM_LOCK_REQUEST, MessageTypeProto_pb.MISSING_ROOM_LOCK_RESPONSE, msg, function(buffer)
|
||||||
|
if func then
|
||||||
|
func()
|
||||||
|
end
|
||||||
|
end)
|
||||||
|
end
|
||||||
return this
|
return this
|
|
@ -44,6 +44,8 @@ function RewardItemPopup:InitComponent()
|
||||||
this.btnMapBack = Util.GetGameObject(self.gameObject, "ScrollView/Content/bg/btnBack")
|
this.btnMapBack = Util.GetGameObject(self.gameObject, "ScrollView/Content/bg/btnBack")
|
||||||
-- 战斗结果按钮
|
-- 战斗结果按钮
|
||||||
this.btnResult = Util.GetGameObject(self.gameObject, "ScrollView/Content/bg/btnResult")
|
this.btnResult = Util.GetGameObject(self.gameObject, "ScrollView/Content/bg/btnResult")
|
||||||
|
this.btnBattleBack = Util.GetGameObject(self.gameObject, "ScrollView/Content/bg/btnBattleBack")
|
||||||
|
-- 战斗回放按钮
|
||||||
-- 任意位置继续
|
-- 任意位置继续
|
||||||
this.btnGoOn = Util.GetGameObject(self.gameObject, "btnBack/Image")
|
this.btnGoOn = Util.GetGameObject(self.gameObject, "btnBack/Image")
|
||||||
|
|
||||||
|
@ -65,6 +67,7 @@ function RewardItemPopup:InitComponent()
|
||||||
-- 战斗结果按钮
|
-- 战斗结果按钮
|
||||||
this.btnResultMax = Util.GetGameObject(self.gameObject, "bg/btnResult")
|
this.btnResultMax = Util.GetGameObject(self.gameObject, "bg/btnResult")
|
||||||
this.btnMapBackMax = Util.GetGameObject(self.gameObject, "bg/btnBack")
|
this.btnMapBackMax = Util.GetGameObject(self.gameObject, "bg/btnBack")
|
||||||
|
-- this.btnBattleBackMax = Util.GetGameObject(self.gameObject, "bg/btnBattleBack")
|
||||||
|
|
||||||
--车迟斗法 显示
|
--车迟斗法 显示
|
||||||
this.guildCarDelay = Util.GetGameObject(self.gameObject, "ScrollView/Content/bg/guildCarDelay")
|
this.guildCarDelay = Util.GetGameObject(self.gameObject, "ScrollView/Content/bg/guildCarDelay")
|
||||||
|
@ -108,6 +111,9 @@ function RewardItemPopup:BindEvent()
|
||||||
Util.AddClick(this.btnResultMax, function ()
|
Util.AddClick(this.btnResultMax, function ()
|
||||||
UIManager.OpenPanel(UIName.DamageResultPanel, 1)
|
UIManager.OpenPanel(UIName.DamageResultPanel, 1)
|
||||||
end)
|
end)
|
||||||
|
Util.AddClick(this.btnBattleBack, function ()
|
||||||
|
BattleManager.BattleBackFun()
|
||||||
|
end)
|
||||||
end
|
end
|
||||||
--界面打开时调用(用于子类重写)
|
--界面打开时调用(用于子类重写)
|
||||||
--bagType 1 正常背包 2 地图临时背包
|
--bagType 1 正常背包 2 地图临时背包
|
||||||
|
@ -135,6 +141,7 @@ function RewardItemPopup:OnOpen(...)
|
||||||
end
|
end
|
||||||
local haveRecord = BattleRecordManager.isHaveRecord()
|
local haveRecord = BattleRecordManager.isHaveRecord()
|
||||||
this.btnResult:SetActive(haveRecord and args[5])
|
this.btnResult:SetActive(haveRecord and args[5])
|
||||||
|
this.btnBattleBack:SetActive(haveRecord and args[5])
|
||||||
this.btnResultMax:SetActive(haveRecord and args[5])
|
this.btnResultMax:SetActive(haveRecord and args[5])
|
||||||
|
|
||||||
-- 设置背景遮罩的显隐
|
-- 设置背景遮罩的显隐
|
||||||
|
|
|
@ -32,7 +32,8 @@ function this.InitTypeTaskList(_userMissionList)
|
||||||
userMissionList.type = _userMissionList[i].type
|
userMissionList.type = _userMissionList[i].type
|
||||||
userMissionList.takeTimes = _userMissionList[i].takeTimes
|
userMissionList.takeTimes = _userMissionList[i].takeTimes
|
||||||
userMissionList.heroId = _userMissionList[i].heroId
|
userMissionList.heroId = _userMissionList[i].heroId
|
||||||
-- LogRed("任务 类型:"..userMissionList.type.." ID:"..userMissionList.missionId.." 状态:"..userMissionList.state)
|
userMissionList.lock = _userMissionList[i].lock
|
||||||
|
-- LogRed("任务 类型:"..userMissionList.type.." ID:"..userMissionList.missionId.." 状态:"..userMissionList.state.." lock "..userMissionList.lock)
|
||||||
if not TypeTaskData[_userMissionList[i].type] then
|
if not TypeTaskData[_userMissionList[i].type] then
|
||||||
TypeTaskData[_userMissionList[i].type] = {}
|
TypeTaskData[_userMissionList[i].type] = {}
|
||||||
end
|
end
|
||||||
|
@ -64,6 +65,7 @@ function this.SetTypeTaskList(type, data)
|
||||||
t.type = data[i].type
|
t.type = data[i].type
|
||||||
t.takeTimes = data[i].takeTimes
|
t.takeTimes = data[i].takeTimes
|
||||||
t.heroId = data[i].heroId
|
t.heroId = data[i].heroId
|
||||||
|
t.lock = data[i].lock
|
||||||
table.insert(TypeTaskData[type], t)
|
table.insert(TypeTaskData[type], t)
|
||||||
LogRed(Language[11982]..data[i].type..Language[11983]..data[i].missionId..Language[11984]..data[i].state)
|
LogRed(Language[11982]..data[i].type..Language[11983]..data[i].missionId..Language[11984]..data[i].state)
|
||||||
end
|
end
|
||||||
|
@ -149,7 +151,7 @@ function this.SetMissionIdState(type, Id, state)
|
||||||
end
|
end
|
||||||
|
|
||||||
--(后台推送刷新调用)
|
--(后台推送刷新调用)
|
||||||
function this.SetTypeTaskInfo(type, Id, state, progress, takeTimes,heroId)
|
function this.SetTypeTaskInfo(type, Id, state, progress, takeTimes,heroId,lock)
|
||||||
-- LogError("任务 "..type.." id:"..Id.." state:"..state.." progress "..progress)
|
-- LogError("任务 "..type.." id:"..Id.." state:"..state.." progress "..progress)
|
||||||
if not TypeTaskData[type] then
|
if not TypeTaskData[type] then
|
||||||
TypeTaskData[type] = {}
|
TypeTaskData[type] = {}
|
||||||
|
@ -164,6 +166,7 @@ function this.SetTypeTaskInfo(type, Id, state, progress, takeTimes,heroId)
|
||||||
type = type,
|
type = type,
|
||||||
takeTimes = takeTimes,
|
takeTimes = takeTimes,
|
||||||
heroId = heroId,
|
heroId = heroId,
|
||||||
|
lock = lock,
|
||||||
})
|
})
|
||||||
else
|
else
|
||||||
--部分数据刷新
|
--部分数据刷新
|
||||||
|
@ -178,6 +181,7 @@ function this.SetTypeTaskInfo(type, Id, state, progress, takeTimes,heroId)
|
||||||
taskInfo.state = state
|
taskInfo.state = state
|
||||||
taskInfo.progress = progress
|
taskInfo.progress = progress
|
||||||
taskInfo.takeTimes = takeTimes
|
taskInfo.takeTimes = takeTimes
|
||||||
|
taskInfo.lock = lock
|
||||||
--taskInfo.heroId = heroId
|
--taskInfo.heroId = heroId
|
||||||
--taskInfo.heroId = {}
|
--taskInfo.heroId = {}
|
||||||
--for i = 1, #heroId do
|
--for i = 1, #heroId do
|
||||||
|
@ -199,7 +203,7 @@ function this.RefreshTypeTaskInfo(taskInfoList)
|
||||||
for i = 1, #taskInfoList do
|
for i = 1, #taskInfoList do
|
||||||
local taskInfo = taskInfoList[i]
|
local taskInfo = taskInfoList[i]
|
||||||
-- Log("服务器推送任务刷新type:"..taskInfo.type.."missionId:"..taskInfo.missionId.."state:"..taskInfo.state.."progress:"..taskInfo.progress.."takeTimes:"..taskInfo.takeTimes)
|
-- Log("服务器推送任务刷新type:"..taskInfo.type.."missionId:"..taskInfo.missionId.."state:"..taskInfo.state.."progress:"..taskInfo.progress.."takeTimes:"..taskInfo.takeTimes)
|
||||||
this.SetTypeTaskInfo(taskInfo.type, taskInfo.missionId, taskInfo.state, taskInfo.progress, taskInfo.takeTimes,taskInfo.heroId)
|
this.SetTypeTaskInfo(taskInfo.type, taskInfo.missionId, taskInfo.state, taskInfo.progress, taskInfo.takeTimes,taskInfo.heroId,taskInfo.lock)
|
||||||
end
|
end
|
||||||
Game.GlobalEvent:DispatchEvent(GameEvent.MissionDaily.OnMissionDailyChanged)
|
Game.GlobalEvent:DispatchEvent(GameEvent.MissionDaily.OnMissionDailyChanged)
|
||||||
Game.GlobalEvent:DispatchEvent(GameEvent.DynamicTask.OnMissionChange)
|
Game.GlobalEvent:DispatchEvent(GameEvent.DynamicTask.OnMissionChange)
|
||||||
|
@ -330,6 +334,7 @@ function this.RefreshFindTreasureData(msg)
|
||||||
type = msg.infos[i].type,
|
type = msg.infos[i].type,
|
||||||
takeTimes = msg.infos[i].takeTimes,
|
takeTimes = msg.infos[i].takeTimes,
|
||||||
heroId = msg.infos[i].heroId,
|
heroId = msg.infos[i].heroId,
|
||||||
|
lock = msg.infos[i].lock,
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -358,6 +363,15 @@ function this.RefreshFindTreasureStatrData(missionId,state)
|
||||||
Game.GlobalEvent:DispatchEvent(GameEvent.FindTreasure.RefreshFindTreasureRedPot)
|
Game.GlobalEvent:DispatchEvent(GameEvent.FindTreasure.RefreshFindTreasureRedPot)
|
||||||
CheckRedPointStatus(RedPointType.SecretTer_FindTreasure)
|
CheckRedPointStatus(RedPointType.SecretTer_FindTreasure)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
--迷宫寻宝前端派遣自行赋值
|
||||||
|
function this.RefreshFindTreasureStatrData2(missionId,lockState)
|
||||||
|
for _, taskInfo in pairs(TypeTaskData[TaskTypeDef.FindTreasure]) do
|
||||||
|
if taskInfo.missionId == missionId then
|
||||||
|
taskInfo.lock = lockState
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
--刷新下可领取状态
|
--刷新下可领取状态
|
||||||
function this.SetFindTreasureDataState()
|
function this.SetFindTreasureDataState()
|
||||||
for _, taskInfo in pairs(TypeTaskData[TaskTypeDef.FindTreasure]) do
|
for _, taskInfo in pairs(TypeTaskData[TaskTypeDef.FindTreasure]) do
|
||||||
|
|
Loading…
Reference in New Issue