Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪

# Conflicts:
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
dev_chengFeng
ZhangBiao 2021-08-12 14:56:26 +08:00
commit a0ef88e58d
31 changed files with 2427 additions and 39 deletions

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 79a55dbade35fe94cbf4e8c763766d01
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 96f87164ec8dcc34a96b814c75c9b69e
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 46 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: d00e57efb7a07594c914bf824ff511f4
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
- 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: bd78d8202fa718c43949ae08dccadce2
vertices: []
indices:
edges: []
weights: []
spritePackingTag: TaiChuMiJuan
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: cc75023d216df704994210abb18241bc
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
- 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: 3a82bc8023c93ab448f08b27fb7686bf
vertices: []
indices:
edges: []
weights: []
spritePackingTag: TaiChuMiJuan
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 MiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: e5174d678f0c29d4b807e5fae001249f
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
- 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: 1f302e76992376a4cada874bd361418f
vertices: []
indices:
edges: []
weights: []
spritePackingTag: TaiChuMiJuan
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: e8b6f468b891b504790240e62864a79f
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: 396, y: 717, z: 368, w: 709}
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
- 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: 5b533282e805a0c49afaa5aa9aa61a97
vertices: []
indices:
edges: []
weights: []
spritePackingTag: TaiChuMiJuan
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 MiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: d59ff4e348a69dd45bbd0200e84e635f
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: 322, y: 726, z: 349, w: 644}
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
- 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: 892e3544d8343214fb90ac4b2ab3a38a
vertices: []
indices:
edges: []
weights: []
spritePackingTag: TaiChuMiJuan
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: d273621ae1575f84893d25220619a4e0
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: df2037b357f788a4badd031f096c23dd
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 78badfa9bacacd340b36aa0d8ea4bbbc
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -7094,6 +7094,8 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 7019400324678272696}
- component: {fileID: 1414705437977451223}
- component: {fileID: 8838132903214057687}
m_Layer: 5
m_Name: RightDown
m_TagString: Untagged
@ -7113,15 +7115,53 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1174661642300151069}
- {fileID: 7679659585813988529}
- {fileID: 165462485454605335}
m_Father: {fileID: 986452627335843391}
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -50, y: 50}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 252.3, y: 0}
m_Pivot: {x: 1, y: 0}
--- !u!114 &1414705437977451223
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 682283706549292340}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 81
m_ChildAlignment: 8
m_Spacing: -55
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
m_ChildControlHeight: 0
--- !u!114 &8838132903214057687
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 682283706549292340}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 0
m_VerticalFit: 2
--- !u!1 &697502373389413099
GameObject:
m_ObjectHideFlags: 0
@ -61108,12 +61148,12 @@ RectTransform:
- {fileID: 2393141543341706285}
- {fileID: 6848493942208162007}
m_Father: {fileID: 7019400324678272696}
m_RootOrder: 1
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -104.4, y: 185}
m_SizeDelta: {x: 208.7, y: 187.8}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 208.70001, y: 187.80005}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8445632292948232348
CanvasRenderer:
@ -66795,6 +66835,80 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: -160}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &5505799093322972228
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 119690817069795584}
- component: {fileID: 8217469561655222238}
- component: {fileID: 8627580103289282522}
m_Layer: 5
m_Name: bg
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &119690817069795584
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5505799093322972228}
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: 7679659585813988529}
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: 2.175, y: 0}
m_SizeDelta: {x: 204.35, y: 200}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8217469561655222238
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5505799093322972228}
m_CullTransparentMesh: 0
--- !u!114 &8627580103289282522
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5505799093322972228}
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: d273621ae1575f84893d25220619a4e0, 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 &5527264345949089561
GameObject:
m_ObjectHideFlags: 0
@ -70555,6 +70669,145 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!1 &6982318018571617701
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7679659585813988529}
- component: {fileID: 4144326890380073377}
- component: {fileID: 1251308906423233540}
- component: {fileID: 3665830019459992081}
- component: {fileID: 690815757707058175}
m_Layer: 5
m_Name: taichumijuan
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7679659585813988529
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6982318018571617701}
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: 119690817069795584}
- {fileID: 998803897713680703}
m_Father: {fileID: 7019400324678272696}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 208.70001, y: 187.80005}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4144326890380073377
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6982318018571617701}
m_CullTransparentMesh: 0
--- !u!114 &1251308906423233540
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6982318018571617701}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 3
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 3665830019459992081}
m_OnClick:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!114 &3665830019459992081
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6982318018571617701}
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: ce6a5e8caebae894bbb7d3eeb17e8dcb, 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!95 &690815757707058175
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6982318018571617701}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &6982851482232808185
GameObject:
m_ObjectHideFlags: 0
@ -85379,6 +85632,80 @@ MonoBehaviour:
m_LineSpacing: 1.3
m_Text: "\u516C\u4F1A"
LanguageIndex: 0
--- !u!1 &8183902688312227531
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 998803897713680703}
- component: {fileID: 758011505487036487}
- component: {fileID: 6247085585318051533}
m_Layer: 5
m_Name: redPoint
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &998803897713680703
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8183902688312227531}
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: 7679659585813988529}
m_RootOrder: 1
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: 35.4, y: 23.6}
m_SizeDelta: {x: 26, y: 26}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &758011505487036487
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8183902688312227531}
m_CullTransparentMesh: 0
--- !u!114 &6247085585318051533
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8183902688312227531}
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: 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 &8218091088732983054
GameObject:
m_ObjectHideFlags: 0

View File

@ -27,6 +27,7 @@ imageDownloadMgr = App.ImageDownloadMgr
--PhoneMgr = App.PhoneMgr
PoolMgr = App.ObjectPoolMgr
WWW = UnityEngine.WWW
Sprite = UnityEngine.Sprite
GameObject = UnityEngine.GameObject
Camera = UnityEngine.Camera
Input = UnityEngine.Input

View File

@ -401,6 +401,7 @@ UIName = {
FightLevelTrialPanel = 400,--山河试炼
XunBaoMiZongPanel = 406, --寻宝迷踪
XunBaoMiZongMapPanel = 407, --寻宝迷踪地图界面
taiChuMiJuan = 408,
}
SubUIConfig = {

View File

@ -708,6 +708,10 @@ RANDOMTYPENUM_NUM_FIELD = protobuf.FieldDescriptor();
BEAUTYBAGCARDINFO = protobuf.Descriptor();
BEAUTYBAGCARDINFO_ID_FIELD = protobuf.FieldDescriptor();
BEAUTYBAGCARDINFO_EQUIP_FIELD = protobuf.FieldDescriptor();
TAICHUSECRETVOLUME = protobuf.Descriptor();
TAICHUSECRETVOLUME_ID_FIELD = protobuf.FieldDescriptor();
TAICHUSECRETVOLUME_STRATEGYLINK_FIELD = protobuf.FieldDescriptor();
TAICHUSECRETVOLUME_WINDOWLINK_FIELD = protobuf.FieldDescriptor();
ERRORRESPONSE_ERRCODE_FIELD.name = "errCode"
ERRORRESPONSE_ERRCODE_FIELD.full_name = ".rpc.protocols.ErrorResponse.errCode"
@ -7437,6 +7441,43 @@ BEAUTYBAGCARDINFO.enum_types = {}
BEAUTYBAGCARDINFO.fields = {BEAUTYBAGCARDINFO_ID_FIELD, BEAUTYBAGCARDINFO_EQUIP_FIELD}
BEAUTYBAGCARDINFO.is_extendable = false
BEAUTYBAGCARDINFO.extensions = {}
TAICHUSECRETVOLUME_ID_FIELD.name = "id"
TAICHUSECRETVOLUME_ID_FIELD.full_name = ".rpc.protocols.taiChuSecretvolume.id"
TAICHUSECRETVOLUME_ID_FIELD.number = 1
TAICHUSECRETVOLUME_ID_FIELD.index = 0
TAICHUSECRETVOLUME_ID_FIELD.label = 1
TAICHUSECRETVOLUME_ID_FIELD.has_default_value = false
TAICHUSECRETVOLUME_ID_FIELD.default_value = 0
TAICHUSECRETVOLUME_ID_FIELD.type = 5
TAICHUSECRETVOLUME_ID_FIELD.cpp_type = 1
TAICHUSECRETVOLUME_STRATEGYLINK_FIELD.name = "strategyLink"
TAICHUSECRETVOLUME_STRATEGYLINK_FIELD.full_name = ".rpc.protocols.taiChuSecretvolume.strategyLink"
TAICHUSECRETVOLUME_STRATEGYLINK_FIELD.number = 2
TAICHUSECRETVOLUME_STRATEGYLINK_FIELD.index = 1
TAICHUSECRETVOLUME_STRATEGYLINK_FIELD.label = 1
TAICHUSECRETVOLUME_STRATEGYLINK_FIELD.has_default_value = false
TAICHUSECRETVOLUME_STRATEGYLINK_FIELD.default_value = ""
TAICHUSECRETVOLUME_STRATEGYLINK_FIELD.type = 9
TAICHUSECRETVOLUME_STRATEGYLINK_FIELD.cpp_type = 9
TAICHUSECRETVOLUME_WINDOWLINK_FIELD.name = "windowLink"
TAICHUSECRETVOLUME_WINDOWLINK_FIELD.full_name = ".rpc.protocols.taiChuSecretvolume.windowLink"
TAICHUSECRETVOLUME_WINDOWLINK_FIELD.number = 3
TAICHUSECRETVOLUME_WINDOWLINK_FIELD.index = 2
TAICHUSECRETVOLUME_WINDOWLINK_FIELD.label = 1
TAICHUSECRETVOLUME_WINDOWLINK_FIELD.has_default_value = false
TAICHUSECRETVOLUME_WINDOWLINK_FIELD.default_value = ""
TAICHUSECRETVOLUME_WINDOWLINK_FIELD.type = 9
TAICHUSECRETVOLUME_WINDOWLINK_FIELD.cpp_type = 9
TAICHUSECRETVOLUME.name = "taiChuSecretvolume"
TAICHUSECRETVOLUME.full_name = ".rpc.protocols.taiChuSecretvolume"
TAICHUSECRETVOLUME.nested_types = {}
TAICHUSECRETVOLUME.enum_types = {}
TAICHUSECRETVOLUME.fields = {TAICHUSECRETVOLUME_ID_FIELD, TAICHUSECRETVOLUME_STRATEGYLINK_FIELD, TAICHUSECRETVOLUME_WINDOWLINK_FIELD}
TAICHUSECRETVOLUME.is_extendable = false
TAICHUSECRETVOLUME.extensions = {}
ActivityInfo = protobuf.Message(ACTIVITYINFO)
ActivityInfo.MissionInfo = protobuf.Message(ACTIVITYINFO_MISSIONINFO)
@ -7561,5 +7602,6 @@ endlessHero = protobuf.Message(ENDLESSHERO)
endlessSign = protobuf.Message(ENDLESSSIGN)
fiveResetTowerInfo = protobuf.Message(FIVERESETTOWERINFO)
randomTypeNum = protobuf.Message(RANDOMTYPENUM)
taiChuSecretvolume = protobuf.Message(TAICHUSECRETVOLUME)
wishDrawCardInfo = protobuf.Message(WISHDRAWCARDINFO)

View File

@ -0,0 +1,73 @@
require("Base/BasePanel")
TaiChuMiJuanPanel = Inherit(BasePanel)
local this = TaiChuMiJuanPanel
--初始化组件(用于子类重写)
function TaiChuMiJuanPanel:InitComponent()
this.spLoader = SpriteLoader.New()
-- 屏幕适配修改
this.btnRoot = Util.GetGameObject(self.gameObject, "btnRoot")
this.itemPre = Util.GetGameObject(this.btnRoot, "itemPre")
this.title = Util.GetGameObject(this.btnRoot, "title")
this.grid = Util.GetGameObject(this.btnRoot, "bg/circle/root")
this.backBtn = Util.GetGameObject(this.btnRoot, "backBtn")
this.itemPres = {}
end
--绑定事件(用于子类重写)
function TaiChuMiJuanPanel:BindEvent()
Util.AddClick(this.backBtn,function()
this:ClosePanel()
end)
end
--添加事件监听(用于子类重写)
function TaiChuMiJuanPanel:AddListener()
end
--移除事件监听(用于子类重写)
function TaiChuMiJuanPanel:RemoveListener()
end
--副本类型 1 综合 2 万象
function TaiChuMiJuanPanel:OnOpen(data)
this.data = data
end
--界面打开时调用(用于子类重写)
function TaiChuMiJuanPanel:OnShow(...)
for i = 1, math.max(#this.itemPres,#this.data) do
if not this.data[i] then
this.itemPres[i].go.gameObject:SetActive(false)
else
if not this.itemPres[i] then
this.itemPres[i] = {}
this.itemPres[i].go = newObjToParent(this.itemPre,this.grid)
this.itemPres[i].bg = Util.GetGameObject(this.itemPres[i].go, "bg"):GetComponent("Image")
end
this.itemPres[i].go.gameObject:SetActive(true)
this.itemPres[i].bg.sprite = this.data[i].sprite
Util.AddOnceClick(this.itemPres[i].go,function()
SDKMgr:OpenWeb(this.data[i].linkAddress)
end)
end
end
end
--界面关闭时调用(用于子类重写)
function TaiChuMiJuanPanel:OnClose()
end
--界面销毁时调用(用于子类重写)
function TaiChuMiJuanPanel:OnDestroy()
this.spLoader:Destroy()
this.itemPres = {}
end
return TaiChuMiJuanPanel

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: fe181c39a7ac70d4b95a0ab53ceaa8e7
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -14,6 +14,76 @@ this.OpenUIList = {}
this.selectIndex = {dataType = 0,goodsId = {}}
this.selectIndex2 = {dataType = 0,goodsId = {}}
this.NiuQiIndex = 1
this.TaiChuMiJuanData = {}
function this.SetTaiChuMiJuanData(msg,fun)
local datas
if not msg or #msg.secretvolume < 1 then
---------------------------------------------测试数据
datas = {[1] = {id = 1,strategyLink = "https://pc.yiyouliao.com/msn/article.html?recId=eed09eaec41c4d18abc08ddbb3452fdc_s&infoId=II003LYBG9XPE7A",windowLink = "https://img-nos.yiyouliao.com/inforec-20210811-e1fd1cf39f6abfc1cdb35be92b6bc3d0.jpg?time=1628668135&signature=89DFF74746F289F5ED404A0BC627387A"},
[2] = {id = 2,strategyLink = "https://pc.yiyouliao.com/msn/article.html?recId=b5f830ada8a04ab2bac07efa621ba453_s&infoId=IT00TLAILJ9X7KZ",windowLink = "https://img-nos.yiyouliao.com/inforec-20210811-8e07612db47c17ec56fbba613d31cc7b.jpg?time=1628668250&signature=CA7856DD83E45651B5E2274D76D8BF48"},
[3] = {id = 3,strategyLink = "https://mini.eastday.com/nsa/210811133830637498814.html?qid=02034",windowLink = "https://lupic.cdn.bcebos.com/20191203/3016121736_23.jpg"},
[4] = {id = 4,strategyLink = "https://pc.yiyouliao.com/msn/article.html?recId=b5f830ada8a04ab2bac07efa621ba453_s&infoId=IT003LL8LJF1X9E",windowLink = "https://lupic.cdn.bcebos.com/20210629/938550_23.jpg"},
[5] = {id = 5,strategyLink = "https://mini.eastday.com/nsa/n210811082523736.html?qid=04232",windowLink = "https://img-nos.yiyouliao.com/inforec-20210811-361d4790c345bae2c5a5e1706c2b550b.jpg?time=1628668377&signature=B1350B327A0806326DD29054B83B071E"},
[6] = {id = 6,strategyLink = "http://ex.chinadaily.com.cn/exchange/partners/82/rss/channel/cn/columns/sz8srm/stories/WS6111cd6fa3101e7ce975deae.html",windowLink = "http://cn.chinadaily.com.cn/image/2018/j-2.jpg"},
[7] = {id = 7,strategyLink = "https://pc.yiyouliao.com/msn/article.html?recId=bdba7a24fe304b598695dbd25219f8e4_s&infoId=II003JLZ9IT187M",windowLink = "https://img-nos.yiyouliao.com/inforec-20210811-9987eceb8e5181eadb24778c05d9195b.jpg?time=1628668882&signature=842592897E6CE7C3DB594FAFC515B22E"},
[8] = {id = 8,strategyLink = "https://mini.eastday.com/nsa/210811065335765353208.html?qid=02034",windowLink = "https://lupic.cdn.bcebos.com/20200412/3062717289_23_800_349.jpg"},
}
-- if fun then
-- fun(msg)
-- end
else
datas = msg.secretvolume
end
coroutine.start(function()
for k,v in ipairs(datas) do
local str = v.windowLink
local www = WWW.New(str)
coroutine.www(www)
local tex2d = www.texture
local m_sprite = Sprite.Create(tex2d, Rect.New(0, 0, tex2d.width, tex2d.height), Vector2.New(0, 0));
if not this.TaiChuMiJuanData[v.id] then
this.TaiChuMiJuanData[v.id] = {}
this.TaiChuMiJuanData[v.id].id = v.id
this.TaiChuMiJuanData[v.id].linkAddress = v.strategyLink
this.TaiChuMiJuanData[v.id].windowLink = v.windowLink
this.TaiChuMiJuanData[v.id].sprite = m_sprite
end
end
if fun then
fun(msg)
end
end)
end
function this.GetwwwProgress()
return this.IsFisish
end
function this.GetATaiChuMiJuanData(data)
this.IsFisish = true
if not this.TaiChuMiJuanData[data.id] or this.TaiChuMiJuanData[data.id].windowLink ~= data.windowLink then
this.IsFisish = false
coroutine.start(function()
local str = data.windowLink
local www = WWW.New(str)
coroutine.www(www)
local tex2d = www.texture
local m_sprite = Sprite.Create(tex2d, Rect.New(0, 0, tex2d.width, tex2d.height), Vector2.New(0, 0));
if not this.TaiChuMiJuanData[data.id] then
this.TaiChuMiJuanData[data.id] = {}
end
this.TaiChuMiJuanData[data.id].id = data.id
this.TaiChuMiJuanData[data.id].linkAddress = data.strategyLink
this.TaiChuMiJuanData[data.id].windowLink = data.windowLink
this.TaiChuMiJuanData[data.id].sprite = m_sprite
this.IsFisish = true
end)
else
return this.TaiChuMiJuanData[data.id]
end
end
function this.SetSelectIndex(dataType,goodsId,b)
this.selectIndex.dataType = dataType
this.selectIndex.goodsId = goodsId
@ -25,6 +95,7 @@ function this.SetSelectIndex(dataType,goodsId,b)
end
function this.Initialize()
this.TaiChuMiJuanData = {}
end
function this.AddUIList(jumpId)

View File

@ -7,6 +7,7 @@ local timer = Timer.New()
-- local npc
local GetCurNodeInfo = {}--当前操作层数据
-- local SkeletonGraphic--动画组件
local isPlayerMove = false--是否在播放人物行走动画
local isAllHaveAttack = false--是否有状态不一致情况 说明不是失败过 就是未领取圣物状态
local nodeGoTable = {}
@ -241,26 +242,14 @@ function ExpeditionMainPanel:OnShowNodeData(isMoveGrid)
ExpeditionMainPanel:SingleLayNodeShow(layListGrid[i],curAllLayNodeList[i])
layListGrid[i]:SetActive(true)
end
if isMoveGrid then
local gridH = 2746--self.grid:GetComponent("RectTransform").sizeDelta.y
local rectH = 1656--self.grid.transform.parent:GetComponent("RectTransform").sizeDelta.y
local endH = gridH - rectH
local curlay = GetCurNodeInfo.lay
if curlay <= 6 then
local y = endH / 6
y = endH - (curlay - 1) * y
self.grid:GetComponent("RectTransform").anchoredPosition = Vector3.New(0,y,0)
end
end
--self.ScrollView:SetData(curAllLayNodeList, function (index, go)
-- self:SingleLayNodeShow(go,curAllLayNodeList[index],(#AllLayNodeList - index) + 1)
--end)
--LogError("#AllLayNodeList - GetCurNodeInfo.lay "..#AllLayNodeList - GetCurNodeInfo.lay)
--local curIndex = #AllLayNodeList - GetCurNodeInfo.lay
--if curIndex == 0 then
-- curIndex = curIndex + 1
--end
--self.ScrollView:SetIndex(curIndex)
local curlay = GetCurNodeInfo.lay
-- local rectH = self.grid.transform.parent:GetComponent("RectTransform").rect.height/2
-- local y = (#curAllLayNodeList - curlay) * 183.3 + 638.55 - rectH
local rectH = self.grid.transform.parent:GetComponent("RectTransform").rect.height/2
local y = 2746.5 - ((curlay - 1) * 183.3) - rectH;
self.grid.transform:DOLocalMove(Vector3.New(0,y,0), 0.5, false):SetEase(Ease.Linear)
-- self.grid:GetComponent("RectTransform").anchoredPosition = Vector3.New(0,y,0)
end
--实例化每层信息
@ -706,11 +695,11 @@ function ExpeditionMainPanel:PlayerMoveFun()
if targetPosGoAndData.curNodeData.type == ExpeditionNodeType.Shop then
NetManager.StoreNodeRequest(targetPosGoAndData.curNodeData.sortId,function ()
UIManager.OpenPanel(UIName.ExpeditionMonsterInfoPopup,EXPEDITON_POPUP_TYPE.Shop,targetPosGoAndData.curNodeData,3,function ()
self:OnShowNodeData()
self:OnShowNodeData(true)
end)
end)
else
self:OnShowNodeData()
self:OnShowNodeData(true)
end
isPlayerMove = false
end, 0.8)
@ -740,7 +729,7 @@ function ExpeditionMainPanel:SelfUpdataPanelShow()
end
function ExpeditionMainPanel:RefreshManagerData()
NetManager.GetExpeditionRequest(ExpeditionManager.expeditionLeve,function ()
self:OnShowNodeData()
self:OnShowNodeData(true)
end)
end
function ExpeditionMainPanel:HeroResurgence()

View File

@ -302,11 +302,14 @@ function this.SetScrollPre(root,data,curRankType)
local hurt=Util.GetGameObject(root,"Hurt"):GetComponent("Text")
this.SetRankingNum(root,data.rankInfo.rank,false)
LogGreen("data.serverName:"..tostring(data.serverName))
if curRankType==RANK_TYPE.GUILD_DEATHPOS_GUILD then
LogGreen("data.guildName:"..tostring(data.guildName))
name.text=(data.serverName and data.serverName ~= "")
and data.serverName.." "..string.format(Language[11027],data.guildName,data.rankInfo.param2)
or string.format(Language[11027],data.guildName,data.rankInfo.param2) --公会名称(人数) param2 挑战人数
elseif curRankType==RANK_TYPE.GUILD_DEATHPOS_PERSON then
LogGreen("data.guildName:"..tostring(data.userName))
name.text=(data.serverName and data.serverName ~= "")
and data.serverName.." "..string.format("%s",data.userName)
or string.format("%s",data.userName)
@ -318,6 +321,7 @@ end
function this.SetMyRank(data,curRankType)
local guildData = MyGuildManager.GetMyGuildInfo()
this.SetRankingNum(this.mRRank,data.rank,true)
LogYellow("data.serverName:"..tostring(data.serverName))
if curRankType==RANK_TYPE.GUILD_DEATHPOS_GUILD then
this.mRName.text=(data.serverName and data.serverName ~= "")
and data.serverName.." "..string.format(Language[11027],guildData.name,data.param2)

View File

@ -123,6 +123,7 @@ function this.RefreshPanel()
Util.GetGameObject(o,"Guild"):SetActive(false)
Util.GetGameObject(o,"serverName"):SetActive(false)
end
local colorValue = Color.New(1,1,1,0)
DoTween.To(
DG.Tweening.Core.DOGetter_float( function () return 0 end),
@ -189,15 +190,16 @@ function this.RefreshGuildInfo()
for key, value in pairs(data) do
if i==value.pathId then
local guild=Util.GetGameObject(preList[i],"Guild")
local serverName=Util.GetGameObject(preList[i],"serverName/Text"):GetComponent("Text")
local serverDi = Util.GetGameObject(preList[i],"serverName")
local serverName=Util.GetGameObject(serverDi,"Text"):GetComponent("Text")
local guildImage=guild:GetComponent("Image")
local guildName=Util.GetGameObject(preList[i],"Guild/mask/GuildName"):GetComponent("Text")
Util.GetGameObject(preList[i],"serverName"):SetActive(false)
guild:SetActive(true)
if value.serverName and value.serverName ~= "" then
serverName.text = value.serverName
serverDi:SetActive(true)
else
Util.GetGameObject(preList[i],"serverName"):SetActive(false)
serverDi:SetActive(false)
serverName.text = ""
end
guildName.text=value.guildName

View File

@ -664,6 +664,7 @@ function this.ExecuteLoading()
function() NetManager.BeautyBagWishEquipRequest(nil,LoadingPanel.OnStep) end,
function() LingLongBaoJingManager.InitData(LoadingPanel.OnStep) end,
function() NetManager.IsCrossRequert(LoadingPanel.OnStep) end,
function() NetManager.TaiChuSecretvolumeRequest(LoadingPanel.OnStep) end,
--[[[35] =]] function() -- 登录请求最终接口,所有请求放在此接口之前
-- 登录成功确认
NetManager.LoginConfimRequest()

View File

@ -266,6 +266,8 @@ function this:InitComponent()
this.RightUp2gridSize = this.RightUp2Grid:GetComponent("RectTransform")
this.jiantouObj=Util.GetGameObject(self.gameObject, "jiantouObj")
this.taiChuMiJuanBtn = Util.GetGameObject(self.gameObject, "taichumijuan")
end
function this:SetPosFunc(v2)
@ -293,6 +295,59 @@ end
--绑定事件(用于子类重写)
function this:BindEvent()
Util.AddOnceClick(this.taiChuMiJuanBtn,function()
-- NetManager.TaiChuSecretvolumeRequest(function(msg)
-- local data = {}
-- if #msg.secretvolume < 1 then
-- LogGreen("该功能暂未开放")
-- return
-- end
-- coroutine.start(function()
-- for k,v in ipairs(msg.secretvolume) do
-- local isContinue = DynamicActivityManager.GetATaiChuMiJuanData(v)
-- while(not DynamicActivityManager.GetwwwProgress()) do
-- coroutine.wait(0.01)
-- end
-- isContinue = DynamicActivityManager.GetATaiChuMiJuanData(v)
-- table.insert(data,isContinue)
-- end
-- table.sort(data,function(a,b)
-- return a.id < b.id
-- end)
-- UIManager.OpenPanel(UIName.taiChuMiJuan,data)
-- end)
-- end)
----------------------------------------------------------- 测试数据
local data = {}
local datas = {[1] = {id = 1,strategyLink = "https://pc.yiyouliao.com/msn/article.html?recId=eed09eaec41c4d18abc08ddbb3452fdc_s&infoId=II003LYBG9XPE7A",windowLink = "https://img-nos.yiyouliao.com/inforec-20210811-e1fd1cf39f6abfc1cdb35be92b6bc3d0.jpg?time=1628668135&signature=89DFF74746F289F5ED404A0BC627387A"},
[2] = {id = 2,strategyLink = "https://pc.yiyouliao.com/msn/article.html?recId=b5f830ada8a04ab2bac07efa621ba453_s&infoId=IT00TLAILJ9X7KZ",windowLink = "https://img-nos.yiyouliao.com/inforec-20210811-8e07612db47c17ec56fbba613d31cc7b.jpg?time=1628668250&signature=CA7856DD83E45651B5E2274D76D8BF48"},
[3] = {id = 3,strategyLink = "https://mini.eastday.com/nsa/210811133830637498814.html?qid=02034",windowLink = "https://lupic.cdn.bcebos.com/20191203/3016121736_23.jpg"},
[4] = {id = 4,strategyLink = "https://pc.yiyouliao.com/msn/article.html?recId=b5f830ada8a04ab2bac07efa621ba453_s&infoId=IT003LL8LJF1X9E",windowLink = "https://lupic.cdn.bcebos.com/20210629/938550_23.jpg"},
[5] = {id = 5,strategyLink = "https://mini.eastday.com/nsa/n210811082523736.html?qid=04232",windowLink = "https://img-nos.yiyouliao.com/inforec-20210811-361d4790c345bae2c5a5e1706c2b550b.jpg?time=1628668377&signature=B1350B327A0806326DD29054B83B071E"},
[6] = {id = 6,strategyLink = "http://ex.chinadaily.com.cn/exchange/partners/82/rss/channel/cn/columns/sz8srm/stories/WS6111cd6fa3101e7ce975deae.html",windowLink = "http://cn.chinadaily.com.cn/image/2018/j-2.jpg"},
[7] = {id = 7,strategyLink = "https://pc.yiyouliao.com/msn/article.html?recId=bdba7a24fe304b598695dbd25219f8e4_s&infoId=II003JLZ9IT187M",windowLink = "https://img-nos.yiyouliao.com/inforec-20210811-9987eceb8e5181eadb24778c05d9195b.jpg?time=1628668882&signature=842592897E6CE7C3DB594FAFC515B22E"},
[8] = {id = 8,strategyLink = "https://mini.eastday.com/nsa/210811065335765353208.html?qid=02034",windowLink = "https://dfzximg01.dftoutiao.com/minimodify/20210810/640x427_611230bb2fc8e.png"},
[9] = {id = 9,strategyLink = "https://pc.yiyouliao.com/msn/article.html?recId=ef71759530174eb7a644f43a1c82fc41_s&infoId=IC003K1PNC70DBQ",windowLink = "https://img-nos.yiyouliao.com/inforec-20210811-da593f41724ecf38354bb712398cfca6.jpg?time=1628672089&signature=6EABA2FF759B313F41F158D7AD8FDF6A"},
}
coroutine.start(function()
for k,v in ipairs(datas) do
local isContinue = DynamicActivityManager.GetATaiChuMiJuanData(v)
local time = 0
while(not DynamicActivityManager.GetwwwProgress()) do
coroutine.wait(0.01)
time = time + 0.01
end
isContinue = DynamicActivityManager.GetATaiChuMiJuanData(v)
table.insert(data,isContinue)
end
table.sort(data,function(a,b)
return a.id < b.id
end)
UIManager.OpenPanel(UIName.taiChuMiJuan,data)
end)
end)
Util.AddOnceClick(this.btnEndLess,function()
StoryMapManager.InitData(1)
end)

View File

@ -5475,5 +5475,20 @@ function this.XunBaoMiZongEnterMap(func)
end
end)
end
--请求太初秘卷
function NetManager.TaiChuSecretvolumeRequest(func)
DynamicActivityManager.SetTaiChuMiJuanData(nil,func) --测试用
-- local data=PlayerInfoProto_pb.TaiChuSecretvolumeRequest()
-- local msg = data:SerializeToString()
-- Network:SendMessageWithCallBack(MessageTypeProto_pb.TAI_CHU_SECRET_VOLUME_REQUEST, MessageTypeProto_pb.TAI_CHU_SECRET_VOLUME_RESPONS, msg, function(buffer)
-- local data = buffer:DataByte()
-- local msg = PlayerInfoProto_pb.TaiChuSecretvolumeResponse()
-- msg:ParseFromString(data)
-- for k,v in ipairs(msg.secretvolume) do
-- LogGreen("id:"..v.id.." strategyLink:"..v.strategyLink.." windowLink:"..v.windowLink)
-- end
-- DynamicActivityManager.SetTaiChuMiJuanData(msg,func)
-- end)
end
return this

View File

@ -1,4 +1,5 @@
using LitJson;
using GameEditor.FrameTool;
using LitJson;
using System;
using System.Collections;
using System.Collections.Generic;
@ -22,6 +23,34 @@ namespace GameEditor.Util
bool[] usedPathSelect;
string[] filePath;
List<string> upLoadPathList;
[MenuItem("资源导入/协程测试")]
static void InitWindow1()
{
EditorCoroutineRunner.StartEditorCoroutine(DownLoadTempComfig());
}
static IEnumerator DownLoadTempComfig()
{
string[] list = new string[] { "b_baridenglu_slogan02_en", "b_baridenglu_slogan03_en", "b_baridenglu_slogan08_en", "b_baridenglu_slogan08_zh_1_en", "b_baridenglu_sloganwuxing_en" };
string tag2 = Environment.CurrentDirectory;
string tag3 = "Assets/ManagedResources";
WWW www;
for (int i = 0; i < 5; i++)
{
Debug.Log("i:" + i);
string name = Path.Combine(tag2, tag3) + "/" +list[i];
Debug.Log("name:" + name);
www = new WWW(name);
yield return www;
if (www.isDone)
{
Debug.Log("www.Texture:" + i);
}
}
yield return new WaitForSeconds(2);
Debug.Log("等待2秒");
}
[MenuItem("资源导入/资源导入")]
static void InitWindow()
{

View File

@ -26,8 +26,10 @@ namespace LJ_OptTools
var oHeight = tex.height;
if (oWidth <= 0 || oHeight <= 0) return false;
var tarW = (oWidth / 4 + ((oWidth % 4 > 0) ? 1 : 0)) * 4;
var tarH = (oHeight / 4 + ((oHeight % 4 > 0) ? 1 : 0)) * 4;
var tarW = (int)Mathf.Pow(2, Mathf.Ceil(Mathf.Log(oWidth, 2)));
var tarH = (int)Mathf.Pow(2, Mathf.Ceil(Mathf.Log(oHeight, 2)));
//var tarW = (oWidth / 4 + ((oWidth % 4 > 0) ? 1 : 0)) * 4;
//var tarH = (oHeight / 4 + ((oHeight % 4 > 0) ? 1 : 0)) * 4;
return oWidth != tarW || oHeight != tarH;
}
@ -60,8 +62,11 @@ namespace LJ_OptTools
#endregion
//图片大小调整为4的整数倍
var tarW = (oWidth / 4 + ((oWidth % 4 > 0) ? 1 : 0)) * 4;
var tarH = (oHeight / 4 + ((oHeight % 4 > 0) ? 1 : 0)) * 4;
//var tarW = (oWidth / 4 + ((oWidth % 4 > 0) ? 1 : 0)) * 4;
//var tarH = (oHeight / 4 + ((oHeight % 4 > 0) ? 1 : 0)) * 4;
var tarW = (int) Mathf.Pow(2, Mathf.Ceil(Mathf.Log(oWidth, 2)));
var tarH = (int) Mathf.Pow(2, Mathf.Ceil(Mathf.Log(oHeight, 2)));
ret.width = tarW;
ret.height = tarH;