【灵脉秘境】提交

dev_chengFeng
ZhangBiao 2021-11-19 15:38:41 +08:00
parent 42842f88bf
commit c8d4cadb2b
27 changed files with 4419 additions and 3227 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 92 KiB

View File

@ -0,0 +1,99 @@
fileFormatVersion: 2
guid: 077dcb9d692767b4dbbc78782f96ad54
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: 56
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 75d693f8a7609b4429d73fb76c9136be
vertices: []
indices:
edges: []
weights: []
spritePackingTag: LingMaiMiJingAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -46,7 +46,7 @@ TextureImporter:
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteBorder: {x: 15, y: 0, z: 15, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
@ -80,6 +80,17 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- 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: []

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 16 KiB

View File

@ -46,7 +46,7 @@ TextureImporter:
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteBorder: {x: 0, y: 10, z: 0, w: 90}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
@ -80,6 +80,17 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- 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: []

Binary file not shown.

After

Width:  |  Height:  |  Size: 129 KiB

View File

@ -0,0 +1,99 @@
fileFormatVersion: 2
guid: d1b422455711b1340a6245105093011b
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: 56
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 897086dec085fb3469557ffccb60dd17
vertices: []
indices:
edges: []
weights: []
spritePackingTag: LingMaiMiJingAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

View File

@ -0,0 +1,99 @@
fileFormatVersion: 2
guid: 462534ade7e3fb14684e8aaf93e74b11
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: 56
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 94656b4b8220da448aecba6ef6f1e7ed
vertices: []
indices:
edges: []
weights: []
spritePackingTag: TagAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 129 KiB

View File

@ -0,0 +1,99 @@
fileFormatVersion: 2
guid: 50cb3b3ec5603cf48b795097b352e5f8
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: 56
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 234c52166ea503542912f9866d33b7ce
vertices: []
indices:
edges: []
weights: []
spritePackingTag: TagAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -41,7 +41,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@ -85,7 +85,7 @@ TextureImporter:
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 33
textureFormat: 56
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
@ -123,7 +123,7 @@ TextureImporter:
indices:
edges: []
weights: []
spritePackingTag:
spritePackingTag: TagAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 MiB

View File

@ -73,7 +73,18 @@ TextureImporter:
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 56
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
@ -91,7 +102,7 @@ TextureImporter:
indices:
edges: []
weights: []
spritePackingTag: LingMaiMiJingAtlas
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:

View File

@ -12463,6 +12463,86 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3051639498548854135}
m_CullTransparentMesh: 0
--- !u!1 &3054476718419607774
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7474746264921668471}
- component: {fileID: 3851393274314891079}
- component: {fileID: 4597638099901205811}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7474746264921668471
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3054476718419607774}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2308366672277717031}
m_RootOrder: 0
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: -6.9, y: 19.6}
m_SizeDelta: {x: 290, y: 92.1}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3851393274314891079
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3054476718419607774}
m_CullTransparentMesh: 0
--- !u!114 &4597638099901205811
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3054476718419607774}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1}
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 35
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 10
m_MaxSize: 51
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u6682\u65E0\u8BB0\u5F55"
LanguageIndex: 11519
--- !u!1 &3094497865488657464
GameObject:
m_ObjectHideFlags: 0
@ -13902,7 +13982,7 @@ RectTransform:
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: 860, y: 44}
m_SizeDelta: {x: 860, y: 38}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &29714517192058151
CanvasRenderer:
@ -14066,6 +14146,81 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!1 &3916647083690255190
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5998725787780644444}
- component: {fileID: 2762100461216322547}
- component: {fileID: 1559847353474546961}
m_Layer: 5
m_Name: Empty
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &5998725787780644444
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3916647083690255190}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 100}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 2308366672277717031}
m_Father: {fileID: 7851887698058460466}
m_RootOrder: 3
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: 84, y: 0.000061035156}
m_SizeDelta: {x: 354, y: 470}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2762100461216322547
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3916647083690255190}
m_CullTransparentMesh: 0
--- !u!114 &1559847353474546961
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3916647083690255190}
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: 0
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: e1eb5a78b93294840889587d72740102, 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 &3994761993221714232
GameObject:
m_ObjectHideFlags: 0
@ -19320,6 +19475,81 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "\u6682\u65E0\u6BD4\u8D5B\u6570\u636E"
LanguageIndex: 10146
--- !u!1 &5685282479663111727
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2308366672277717031}
- component: {fileID: 7430131331850631422}
- component: {fileID: 766070388516466302}
m_Layer: 5
m_Name: Bg
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2308366672277717031
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5685282479663111727}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 7474746264921668471}
m_Father: {fileID: 5998725787780644444}
m_RootOrder: 0
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: -239.59998, y: 90.5}
m_SizeDelta: {x: 402, y: 234}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7430131331850631422
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5685282479663111727}
m_CullTransparentMesh: 0
--- !u!114 &766070388516466302
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5685282479663111727}
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: 0
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: 88785b6606f773e43bfb8d365c2689ab, 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 &5703461998259437921
GameObject:
m_ObjectHideFlags: 0
@ -22674,8 +22904,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 510, y: 0}
m_SizeDelta: {x: 680, y: 44}
m_AnchoredPosition: {x: 530, y: 0}
m_SizeDelta: {x: 680, y: 38}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &1862047479130278938
CanvasRenderer:
@ -23391,6 +23621,7 @@ RectTransform:
- {fileID: 5061193482142901442}
- {fileID: 4660998134609300112}
- {fileID: 5784819166342683563}
- {fileID: 5998725787780644444}
m_Father: {fileID: 2423465471356683207}
m_RootOrder: 18
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -24236,9 +24467,9 @@ RectTransform:
m_Father: {fileID: 5784819166342683563}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 80, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 100, y: -22}
m_SizeDelta: {x: 200, y: 44}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5339714057364727546
@ -24276,7 +24507,7 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 0
m_MaxSize: 50
m_Alignment: 4
m_Alignment: 1
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0

View File

@ -17563,7 +17563,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: -526.50006, y: 0.000061035156}
m_AnchoredPosition: {x: 100, y: 0}
m_SizeDelta: {x: 160, y: 18.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6142720432508358875

View File

@ -37692,7 +37692,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: -1
m_Text: -10
--- !u!1 &7093571060650879715
GameObject:
m_ObjectHideFlags: 0

View File

@ -1556,10 +1556,7 @@ end
function TimeStampToDateStr5(timestamp)
local date = os.date("*t", timestamp)
local cdate = os.date("*t", GetTimeStamp())
if date.year == cdate.year and date.month == cdate.month and date.day == cdate.day then
return string.format("%02d:%02d:%02d", date.hour, date.min, date.sec)
end
return string.format(Language[12056], date.year, date.month, date.day, date.hour, date.min)
return string.format("%02d:%02d:%02d", date.hour, date.min, date.sec)
end
--- 根据id获取资源

View File

@ -6,6 +6,7 @@ function this:InitComponent(gameObject)
self.spLoader = SpriteLoader.New()
self.scroll = Util.GetGameObject(gameObject,"Scroll")
self.textPre = Util.GetGameObject(gameObject,"textPre")
self.empty = Util.GetGameObject(gameObject,"Empty")
self.preList = {}
local rootHight = self.scroll.transform.rect.height
@ -30,8 +31,10 @@ function this:OnShow(_parent)
self.parent = _parent
self.data = LingMaiMiJingManager.recordData
if #self.data > 0 then
self.empty:SetActive(false)
PlayerPrefs.SetString(PlayerManager.uid.."LingMai",self.data[1].time)
else
self.empty:SetActive(true)
PlayerPrefs.SetString(PlayerManager.uid.."LingMai","")
end
CheckRedPointStatus(RedPointType.LingMaiMiJing)
@ -49,7 +52,7 @@ function this:SetSingleData(_go,_data,_index)
local time = Util.GetGameObject(_go,"Time"):GetComponent("Text")
local desc = Util.GetGameObject(_go,"Desc"):GetComponent("Text")
time.text = TimeStampToDateStr5(_data.time)
time.text = string.format( "[%s]",TimeStampToDateStr5(_data.time))
if _data.type == 0 then
desc.text = string.format("经过一番激烈的战斗,最终击败%s占领%s开始收集灵脉资源",PracticeManager.SetNameColor(_data.defName,_data.practiceLevel),lodeConfig[_data.lingMaiId].Name)
elseif _data.type == 1 then

View File

@ -199,7 +199,7 @@ function JumpServerPanel:BtnClick(id)
if id == JumpServer_Type.LingMaiMiJing then
NetManager.GetLingMaiInfoRequest(0,function ()
if LingMaiMiJingManager.state == 0 then
PopupTipPanel.ShowTip("灵脉秘境未开启")
PopupTipPanel.ShowTip("今日不开放灵脉秘境玩法")
else
if not LingMaiMiJingManager.GetData() then
LogError("灵脉试炼数据为空")

View File

@ -130,8 +130,10 @@ function this.CheckPrivilage(func)
end
function this.CheckRedPoint()
if this.state ~= 1 then
return false
end
if PrivilegeManager.GetPrivilegeRemainValue(2030) > 0 then
LogGreen("特权次数大于零 return true")
return true
end
if #this.recordData > 0 then
@ -139,17 +141,14 @@ function this.CheckRedPoint()
PlayerPrefs.SetString(PlayerManager.uid.."LingMai", "")
end
if PlayerPrefs.GetString(PlayerManager.uid.."LingMai") ~= tostring(this.recordData[1].time) then
LogGreen("有新的数据 return true")
return true
end
end
LogGreen(tostring(#this.recordData).." 啥也没有 return false")
return false
end
function this.CheckRecord()
if this.recordData[1] then
LogGreen("有新的数据2: "..tostring(PlayerPrefs.GetString(PlayerManager.uid.."LingMai")).." "..tostring(this.recordData[1].time))
return PlayerPrefs.GetString(PlayerManager.uid.."LingMai") ~= tostring(this.recordData[1].time)
end
return false

View File

@ -13,6 +13,12 @@ local veinName = {
[5] = "l_lmmj_dijilingmai",
[6] = "l_lmmj_tianjilingmai",
}
local fakeName = {
[3] = "黄级",
[4] = "玄级",
[5] = "地级",
[6] = "天级",
}
--初始化组件(用于子类重写)
function LingMaiMiJingPanel:InitComponent()
self.spLoader = SpriteLoader.New()
@ -69,11 +75,10 @@ function LingMaiMiJingPanel:BindEvent()
LingMaiMiJingManager.OpenRecord()
end)
Util.AddOnceClick(self.rewardBtn, function()
table.sort(self.groupList, function (a,b)
return a.Id < b.Id
end )
local num = LingMaiMiJingManager.myPlaceId - self.groupList[1].Id + 1
UIManager.OpenPanel(UIName.GeneralRankRewardPanel,5,num)--需要活动id和我的排名
NetManager.RequestRankInfo(RANK_TYPE.LINGMAIMIJING_RANK, function (msg)--请求数据
LogYellow("我的排名:"..tostring(msg.myRankInfo.rank))
UIManager.OpenPanel(UIName.GeneralRankRewardPanel,5,msg.myRankInfo.rank)--需要活动id和我的排名
end,0,1,0)
end)
Util.AddOnceClick(self.sortBtn, function()
UIManager.OpenPanel(UIName.RankingSingleListPanel,rankKingList[33])
@ -88,18 +93,6 @@ function LingMaiMiJingPanel:BindEvent()
end)
Util.AddClick(self.jumpBtn,function()
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.LingMaiJump,#self.groupList/5)
-- if self.inputField.text ~= "" then
-- local num = tonumber(self.inputField.text)
-- if num > #self.groupList/5 then
-- num = #self.groupList/5
-- elseif num < 0 then
-- num = 1
-- end
-- LingMaiMiJingManager.curPage = num
-- self:OnShow()
-- else
-- PopupTipPanel.ShowTip("请输入要前往的位置")
-- end
end)
end
@ -118,14 +111,18 @@ end
--跨服
function LingMaiMiJingPanel:OnOpen()
self.UpView:OnOpen({showType = UpViewOpenType.ShowLeft, panelType = PanelType.Main})
if LingMaiMiJingManager.state == 2 then
LingMaiMiJingManager.curPage = 1
end
end
--界面打开时调用(用于子类重写)
function LingMaiMiJingPanel:OnShow()
if LingMaiMiJingManager.state == 2 then
LingMaiMiJingManager.curPage = 1
end
NetManager.GetLingMaiInfoRequest(LingMaiMiJingManager.curPage,function ()
if LingMaiMiJingManager.state == 0 then
self:ClosePanel()
return
end
self.data = LingMaiMiJingManager.GetData()
self:SetTime()
self:SetMydata()
@ -133,8 +130,6 @@ function LingMaiMiJingPanel:OnShow()
self.groupList = ConfigManager.TryGetAllConfigsDataByKey(ConfigName.LodeConfig,"Group",lodeConfig[self.data.lingmaiData[1].Id].Group)
self.lastBtn:SetActive(LingMaiMiJingManager.curPage - 1 > 0)
self.nextBtn:SetActive(LingMaiMiJingManager.curPage + 1 <= 50)
local bool = LingMaiMiJingManager.CheckRecord()
self.recordRed:SetActive(bool)
self.inputField.text = LingMaiMiJingManager.curPage
end)
end
@ -182,6 +177,7 @@ function LingMaiMiJingPanel:SetVeins()
local obtain = Util.GetGameObject(go,"obtain")
local obtainImg = Util.GetGameObject(go,"obtain"):GetComponent("Image")
local name = Util.GetGameObject(go,"obtain/name"):GetComponent("Text")
local server = Util.GetGameObject(go,"obtain/server"):GetComponent("Text")
local grid = Util.GetGameObject(go,"obtain/grid")
local rewardPre = Util.GetGameObject(grid,"rewardPre")
rewardPre:SetActive(false)
@ -191,7 +187,8 @@ function LingMaiMiJingPanel:SetVeins()
obtainImg.sprite = self.spLoader:LoadSprite(img)
nameImg.sprite = self.spLoader:LoadSprite(veinName[data.Quality])
num.text = data.No
name.text = string.format( "%s %s",data.servername,data.name)
server.text = data.servername == "" and fakeName[data.Quality] or data.servername
name.text = data.name
if not self.itemList[i] then
self.itemList[i] = {}
end
@ -219,23 +216,27 @@ function LingMaiMiJingPanel:SetVeins()
end
function LingMaiMiJingPanel:SetTime()
if self.data.state == 0 then
self:ClosePanel()
end
if self.timer then
self.timer:Stop()
self.timer = nil
end
local time = self.data.endTime - GetTimeStamp()
local timeStayAtHere = GetTimeStamp() - self.data.startTime
--我已占领了多久
self.mytime.text = string.format("%s分",math.floor( timeStayAtHere/60 ))
--判断上方时间显示文字
local text = TEXTLIST[self.data.state]
if self.data.state == 2 and CalculateSecondsNowTo_N_OClock(24) <= 10800 then
text = TEXTLIST[3]
else
end
self.leftTime.text = string.format(text,TimeToHMS(time))
self.timer = Timer.New(function ()
time = time - 1
timeStayAtHere = timeStayAtHere + 1
self.leftTime.text = string.format(text,TimeToHMS(time))
self.mytime.text = string.format("%s分",math.floor( timeStayAtHere/60 ))
self.recordRed:SetActive(LingMaiMiJingManager.CheckRecord())
if time <= 0 then
self:OnShow()
end

View File

@ -1062,14 +1062,12 @@ function this.LingMaiIndication(buffer)
msg:ParseFromString(data)
NetManager.LingMaiRecordRequest(function ()
if #LingMaiMiJingManager.recordData > 0 then
PlayerPrefs.SetString(PlayerManager.uid.."LingMai", tostring(LingMaiMiJingManager.recordData[1].time))
else
if #LingMaiMiJingManager.recordData == 0 then
PlayerPrefs.SetString(PlayerManager.uid.."LingMai","")
end
CheckRedPointStatus(RedPointType.LingMaiMiJing)
LingMaiMiJingManager.curPage = 0
Game.GlobalEvent:DispatchEvent(GameEvent.LingMaiMiJing.RefreshPanel)
LogError("收到了后端发来的Indication")
end)
end