Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
Before Width: | Height: | Size: 43 KiB After Width: | Height: | Size: 37 KiB |
Before Width: | Height: | Size: 33 KiB After Width: | Height: | Size: 31 KiB |
Before Width: | Height: | Size: 38 KiB After Width: | Height: | Size: 36 KiB |
Before Width: | Height: | Size: 36 KiB After Width: | Height: | Size: 35 KiB |
Before Width: | Height: | Size: 40 KiB After Width: | Height: | Size: 38 KiB |
Before Width: | Height: | Size: 37 KiB After Width: | Height: | Size: 34 KiB |
Before Width: | Height: | Size: 38 KiB After Width: | Height: | Size: 34 KiB |
Before Width: | Height: | Size: 31 KiB After Width: | Height: | Size: 31 KiB |
After Width: | Height: | Size: 24 KiB |
|
@ -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:
|
After Width: | Height: | Size: 26 KiB |
|
@ -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:
|
|
@ -2438,7 +2438,7 @@ GameObject:
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 0
|
m_IsActive: 1
|
||||||
--- !u!224 &3485081933269307159
|
--- !u!224 &3485081933269307159
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -2455,7 +2455,7 @@ RectTransform:
|
||||||
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: 1}
|
||||||
m_AnchorMax: {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_SizeDelta: {x: 58, y: 58}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &1573136561530535208
|
--- !u!222 &1573136561530535208
|
||||||
|
@ -20217,7 +20217,7 @@ GameObject:
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 0
|
m_IsActive: 1
|
||||||
--- !u!224 &4891219356403018510
|
--- !u!224 &4891219356403018510
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -20234,7 +20234,7 @@ 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: 0}
|
m_AnchoredPosition: {x: 0, y: 93.2}
|
||||||
m_SizeDelta: {x: 300, y: 76}
|
m_SizeDelta: {x: 300, y: 76}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &8330201010160231290
|
--- !u!222 &8330201010160231290
|
||||||
|
@ -20265,7 +20265,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: d97c3f743cbc9254fa76d653f78830a3, type: 3}
|
m_Sprite: {fileID: 21300000, guid: 4a65cf25620b755458a89499d5e05d3b, type: 3}
|
||||||
m_Type: 0
|
m_Type: 0
|
||||||
m_PreserveAspect: 0
|
m_PreserveAspect: 0
|
||||||
m_FillCenter: 1
|
m_FillCenter: 1
|
||||||
|
@ -21596,7 +21596,7 @@ 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: -2.7, y: -0.000012398}
|
m_AnchoredPosition: {x: -2.7, y: 11.199987}
|
||||||
m_SizeDelta: {x: 62.12, y: 222}
|
m_SizeDelta: {x: 62.12, y: 222}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &4412609738691989485
|
--- !u!222 &4412609738691989485
|
||||||
|
@ -49105,7 +49105,7 @@ GameObject:
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 0
|
m_IsActive: 1
|
||||||
--- !u!224 &8855666515029751127
|
--- !u!224 &8855666515029751127
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -49122,7 +49122,7 @@ RectTransform:
|
||||||
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: 1}
|
||||||
m_AnchorMax: {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_SizeDelta: {x: 26, y: 26}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &3975621365474609331
|
--- !u!222 &3975621365474609331
|
||||||
|
@ -63729,7 +63729,7 @@ GameObject:
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 0
|
m_IsActive: 1
|
||||||
--- !u!224 &5913985668708773166
|
--- !u!224 &5913985668708773166
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -63746,7 +63746,7 @@ 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: 0}
|
m_AnchoredPosition: {x: 0, y: 93.2}
|
||||||
m_SizeDelta: {x: 300, y: 76}
|
m_SizeDelta: {x: 300, y: 76}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &7081964043404323979
|
--- !u!222 &7081964043404323979
|
||||||
|
@ -63777,7 +63777,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: 79f6183b43cb8104e893b7caeaedf21f, type: 3}
|
m_Sprite: {fileID: 21300000, guid: bddaf413d083a5b45a9172b36095490a, type: 3}
|
||||||
m_Type: 0
|
m_Type: 0
|
||||||
m_PreserveAspect: 0
|
m_PreserveAspect: 0
|
||||||
m_FillCenter: 1
|
m_FillCenter: 1
|
||||||
|
@ -79295,8 +79295,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: -115.2, y: 7.8}
|
m_AnchoredPosition: {x: -115.2, y: 47.9}
|
||||||
m_SizeDelta: {x: 230.4, y: 149.3}
|
m_SizeDelta: {x: 230.4, y: 229.6}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &508266023133700516
|
--- !u!222 &508266023133700516
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
|
|
@ -1858,6 +1858,7 @@ FUNC_OPNE_STATE = {
|
||||||
COMPOUND_HERO = "COMPOUND_HERO",
|
COMPOUND_HERO = "COMPOUND_HERO",
|
||||||
POKEMON = "COMPOUND_HERO",
|
POKEMON = "COMPOUND_HERO",
|
||||||
TianShuMiJuan = "TianShuMiJuan",
|
TianShuMiJuan = "TianShuMiJuan",
|
||||||
|
LUCKYTURN = "LUCKYTURN",
|
||||||
}
|
}
|
||||||
|
|
||||||
-- 开放功能ID作为索引键值,索引对应的字符串
|
-- 开放功能ID作为索引键值,索引对应的字符串
|
||||||
|
@ -1887,6 +1888,7 @@ FUNC_OPEN_STR = {
|
||||||
[FUNCTION_OPEN_TYPE.COMPOUND_HERO] = FUNC_OPNE_STATE.COMPOUND_HERO,
|
[FUNCTION_OPEN_TYPE.COMPOUND_HERO] = FUNC_OPNE_STATE.COMPOUND_HERO,
|
||||||
[FUNCTION_OPEN_TYPE.POKEMON] = FUNC_OPNE_STATE.POKEMON,
|
[FUNCTION_OPEN_TYPE.POKEMON] = FUNC_OPNE_STATE.POKEMON,
|
||||||
[FUNCTION_OPEN_TYPE.tianshumijuan] = FUNC_OPNE_STATE.TianShuMiJuan,
|
[FUNCTION_OPEN_TYPE.tianshumijuan] = FUNC_OPNE_STATE.TianShuMiJuan,
|
||||||
|
[FUNCTION_OPEN_TYPE.LUCKYTURN] = FUNC_OPNE_STATE.LUCKYTURN,
|
||||||
}
|
}
|
||||||
|
|
||||||
-- 地图中图标对应的ID
|
-- 地图中图标对应的ID
|
||||||
|
|
|
@ -1140,6 +1140,7 @@ function GetTimeStamp()
|
||||||
return PlayerManager.serverTime
|
return PlayerManager.serverTime
|
||||||
end
|
end
|
||||||
|
|
||||||
|
--- 获取当前时间到下一个n点的时间长度
|
||||||
--- 获取当前时间到一天中某时的剩余时间(24小时制)
|
--- 获取当前时间到一天中某时的剩余时间(24小时制)
|
||||||
function CalculateSecondsNowTo_N_OClock(n)
|
function CalculateSecondsNowTo_N_OClock(n)
|
||||||
local curTimeStemp = GetTimeStamp()
|
local curTimeStemp = GetTimeStamp()
|
||||||
|
|
|
@ -368,7 +368,8 @@ function this.BtnClick(id)
|
||||||
--LogGreen("点击进入森罗时候的层数"..MapTrialManager.curTowerLevel)
|
--LogGreen("点击进入森罗时候的层数"..MapTrialManager.curTowerLevel)
|
||||||
|
|
||||||
if ActTimeCtrlManager.SingleFuncState(id) then
|
if ActTimeCtrlManager.SingleFuncState(id) then
|
||||||
CarbonManager.difficulty = 2
|
CarbonManager.difficulty = CARBON_TYPE.TRIAL
|
||||||
|
CarbonManager.carbonType = CARBON_TYPE.TRIAL
|
||||||
local trialDataConfig = ConfigManager.GetConfig(ConfigName.TrialConfig)
|
local trialDataConfig = ConfigManager.GetConfig(ConfigName.TrialConfig)
|
||||||
MapManager.curCarbonType =CarBonTypeId.TRIAL
|
MapManager.curCarbonType =CarBonTypeId.TRIAL
|
||||||
NetManager.MapInfoRequest(MapManager.curCarbonType, function(msg)
|
NetManager.MapInfoRequest(MapManager.curCarbonType, function(msg)
|
||||||
|
|
|
@ -155,7 +155,7 @@ function this:InitComponent()
|
||||||
[FUNCTION_OPEN_TYPE.COMPOUND_HERO] = this:AddFuncItem(this.btnCompoundHero, 0),--神将合成、置换
|
[FUNCTION_OPEN_TYPE.COMPOUND_HERO] = this:AddFuncItem(this.btnCompoundHero, 0),--神将合成、置换
|
||||||
[FUNCTION_OPEN_TYPE.POKEMON] = this:AddFuncItem(this.btnPokemon, -1200),--神将合成、置换
|
[FUNCTION_OPEN_TYPE.POKEMON] = this:AddFuncItem(this.btnPokemon, -1200),--神将合成、置换
|
||||||
[FUNCTION_OPEN_TYPE.tianshumijuan] = this:AddFuncItem(this.btnTianShuMiJuan, 0),
|
[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 = {
|
this.operateNewText = {
|
||||||
|
@ -169,7 +169,7 @@ function this:InitComponent()
|
||||||
[FUNCTION_OPEN_TYPE.COMPOUND_HERO] = this:InsertNewText(this.btnCompoundHero),--神将合成、置换
|
[FUNCTION_OPEN_TYPE.COMPOUND_HERO] = this:InsertNewText(this.btnCompoundHero),--神将合成、置换
|
||||||
[FUNCTION_OPEN_TYPE.POKEMON] = this:InsertNewText(this.btnPokemon),--神将合成、置换
|
[FUNCTION_OPEN_TYPE.POKEMON] = this:InsertNewText(this.btnPokemon),--神将合成、置换
|
||||||
[FUNCTION_OPEN_TYPE.tianshumijuan] = this:InsertNewText(this.btnTianShuMiJuan),
|
[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.rpCompoundHero = Util.GetGameObject(this.btnCompoundHero, "redPoint")--神将合成、置换
|
||||||
this.rpPokemon = Util.GetGameObject(this.btnPokemon, "redPoint")--灵兽
|
this.rpPokemon = Util.GetGameObject(this.btnPokemon, "redPoint")--灵兽
|
||||||
this.rpbtnTianShuMiJuan = Util.GetGameObject(this.btnTianShuMiJuan, "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)
|
-- UIManager.OpenPanel(UIName.LuckyTurnTablePanel)
|
||||||
-- this.ScenceBtnClick(FUNCTION_OPEN_TYPE.LUCKYTURN)
|
-- this.ScenceBtnClick(FUNCTION_OPEN_TYPE.LUCKYTURN)
|
||||||
JumpManager.GoJump(1027)
|
JumpManager.GoJump(1027)
|
||||||
|
this.ScenceBtnClick(FUNCTION_OPEN_TYPE.LUCKYTURN)
|
||||||
end)
|
end)
|
||||||
this.BindRedPoint()
|
this.BindRedPoint()
|
||||||
end
|
end
|
||||||
|
@ -611,6 +612,7 @@ function this.BindRedPoint()
|
||||||
BindRedPointObject(RedPointType.PokemonMainCity, this.rpPokemon)
|
BindRedPointObject(RedPointType.PokemonMainCity, this.rpPokemon)
|
||||||
BindRedPointObject(RedPointType.HongMeng,this.HongMengRedPoint)
|
BindRedPointObject(RedPointType.HongMeng,this.HongMengRedPoint)
|
||||||
BindRedPointObject(RedPointType.TianShuMiJuan,this.rpbtnTianShuMiJuan)
|
BindRedPointObject(RedPointType.TianShuMiJuan,this.rpbtnTianShuMiJuan)
|
||||||
|
BindRedPointObject(RedPointType.LuckyTurn,this.rpbtnXingYunTanBao)
|
||||||
BindRedPointObject(RedPointType.FifteenDayGift,this.rpFifteenDayGift)
|
BindRedPointObject(RedPointType.FifteenDayGift,this.rpFifteenDayGift)
|
||||||
BindRedPointObject(RedPointType.Huaxutan,this.rpCompoundHero)
|
BindRedPointObject(RedPointType.Huaxutan,this.rpCompoundHero)
|
||||||
BindRedPointObject(RedPointType.RightUp2,this.rpRightUp2)
|
BindRedPointObject(RedPointType.RightUp2,this.rpRightUp2)
|
||||||
|
@ -631,6 +633,7 @@ function this.ClearRedPoint()
|
||||||
ClearRedPointObject(RedPointType.Vientiane, this.rpColorfulWorld)
|
ClearRedPointObject(RedPointType.Vientiane, this.rpColorfulWorld)
|
||||||
ClearRedPointObject(RedPointType.PokemonMainCity, this.rpPokemon)
|
ClearRedPointObject(RedPointType.PokemonMainCity, this.rpPokemon)
|
||||||
ClearRedPointObject(RedPointType.TianShuMiJuan,this.rpbtnTianShuMiJuan)
|
ClearRedPointObject(RedPointType.TianShuMiJuan,this.rpbtnTianShuMiJuan)
|
||||||
|
ClearRedPointObject(RedPointType.LuckyTurn,this.rpbtnXingYunTanBao)
|
||||||
ClearRedPointObject(RedPointType.FifteenDayGift,this.rpFifteenDayGift)
|
ClearRedPointObject(RedPointType.FifteenDayGift,this.rpFifteenDayGift)
|
||||||
ClearRedPointObject(RedPointType.Huaxutan,this.rpCompoundHero)
|
ClearRedPointObject(RedPointType.Huaxutan,this.rpCompoundHero)
|
||||||
ClearRedPointObject(RedPointType.RightUp2,this.rpRightUp2)
|
ClearRedPointObject(RedPointType.RightUp2,this.rpRightUp2)
|
||||||
|
|
|
@ -177,7 +177,13 @@ function CommonActPage:RefreshTime()
|
||||||
self.localTimer = nil
|
self.localTimer = nil
|
||||||
end
|
end
|
||||||
self.time:SetActive(true)
|
self.time:SetActive(true)
|
||||||
local freshTime = self.ActData.endTime - GetTimeStamp()
|
local freshTime
|
||||||
|
if self.actType == ActivityTypeDef.AccumulativeRechargeExper then
|
||||||
|
freshTime = CalculateSecondsNowTo_N_OClock(24)
|
||||||
|
else
|
||||||
|
freshTime = self.ActData.endTime - GetTimeStamp()
|
||||||
|
end
|
||||||
|
|
||||||
local update = function()
|
local update = function()
|
||||||
if self.actConfig.ShowTime == 1 then
|
if self.actConfig.ShowTime == 1 then
|
||||||
self.timeText.text = Language[10023]..TimeToFelaxible(freshTime)
|
self.timeText.text = Language[10023]..TimeToFelaxible(freshTime)
|
||||||
|
|
|
@ -90,7 +90,7 @@ local TypeUpdateFunc = {
|
||||||
if configData.ShowArt == FUNCTION_OPEN_TYPE.EXPERT then
|
if configData.ShowArt == FUNCTION_OPEN_TYPE.EXPERT then
|
||||||
this.GetExpertData(2,ActivityTypeDef.AccumulativeRechargeExper)
|
this.GetExpertData(2,ActivityTypeDef.AccumulativeRechargeExper)
|
||||||
else
|
else
|
||||||
this.GetMissionData(2,ActivityTypeDef.AccumulativeRechargeExper)
|
this.GetMissionData(1,ActivityTypeDef.AccumulativeRechargeExper)
|
||||||
end
|
end
|
||||||
end,
|
end,
|
||||||
[ActivityTypeDef.UpLvAct] = function ()---日累计充值
|
[ActivityTypeDef.UpLvAct] = function ()---日累计充值
|
||||||
|
@ -204,7 +204,8 @@ function this.GetMissionData(indexType,actType)
|
||||||
curData.rewards[i].state = 1
|
curData.rewards[i].state = 1
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
LogGreen("actRewardConfigs[j].Reward :"..#actRewardConfigs[j].Reward )
|
curData.rewards[i].title = string.format("累计充值金额:%s元",curData.rewards[i].value)
|
||||||
|
curData.rewards[i].buyInfo = string.format("(%s/%s)",curData.rewards[i].progress,curData.rewards[i].value)
|
||||||
curData.rewards[i].shows = actRewardConfigs[j].Reward
|
curData.rewards[i].shows = actRewardConfigs[j].Reward
|
||||||
curData.rewards[i].jump = actRewardConfigs[j].Jump[1]
|
curData.rewards[i].jump = actRewardConfigs[j].Jump[1]
|
||||||
end
|
end
|
||||||
|
|
|
@ -79,7 +79,6 @@ end
|
||||||
--添加事件监听(用于子类重写)
|
--添加事件监听(用于子类重写)
|
||||||
function MissionPre:AddListener()
|
function MissionPre:AddListener()
|
||||||
end
|
end
|
||||||
|
|
||||||
--移除事件监听(用于子类重写)
|
--移除事件监听(用于子类重写)
|
||||||
function MissionPre:RemoveListener()
|
function MissionPre:RemoveListener()
|
||||||
|
|
||||||
|
@ -155,7 +154,7 @@ function MissionPre:SetContent1()
|
||||||
-- self.scrollView.transform.localPosition = Vector3.New(-370,7,0)
|
-- self.scrollView.transform.localPosition = Vector3.New(-370,7,0)
|
||||||
self.upLayout.gameObject:SetActive(false)
|
self.upLayout.gameObject:SetActive(false)
|
||||||
if self.actConfig then
|
if self.actConfig then
|
||||||
if self.actConfig.ActiveType == ActivityTypeDef.DynamicAct_recharge then
|
if self.actConfig.ActiveType == ActivityTypeDef.DynamicAct_recharge or self.actConfig.ActiveType == ActivityTypeDef.AccumulativeRechargeExper then
|
||||||
-- self.scrollView.transform.localPosition = Vector3.New(-370,-9,0)
|
-- self.scrollView.transform.localPosition = Vector3.New(-370,-9,0)
|
||||||
self.upLayout.gameObject:SetActive(true)
|
self.upLayout.gameObject:SetActive(true)
|
||||||
self:SetType1("累计充值",self.data.value,Language[10477].."("..(self.data.progress > self.data.value and self.data.value or self.data.progress) .."/"..self.data.value..")")
|
self:SetType1("累计充值",self.data.value,Language[10477].."("..(self.data.progress > self.data.value and self.data.value or self.data.progress) .."/"..self.data.value..")")
|
||||||
|
@ -185,6 +184,9 @@ function MissionPre:SetIcon1(_itemdata)
|
||||||
self.btnGet:GetComponent("Button").enabled = _itemdata.state ~= 2
|
self.btnGet:GetComponent("Button").enabled = _itemdata.state ~= 2
|
||||||
self.btnGetText.text = type[_itemdata.state].text
|
self.btnGetText.text = type[_itemdata.state].text
|
||||||
if _itemdata.state ~= 0 then
|
if _itemdata.state ~= 0 then
|
||||||
|
if _itemdata.state == 2 then
|
||||||
|
self.buyInfo.text = ""
|
||||||
|
end
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
if _itemdata.type and _itemdata.type > 0 then
|
if _itemdata.type and _itemdata.type > 0 then
|
||||||
|
|