Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
ZhangBiao 2021-11-26 15:15:23 +08:00
commit 5c7ba2529d
59 changed files with 4987 additions and 983 deletions

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.8 KiB

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

View File

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

View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 56d5f4bb75c88da47b68ccdae8f67bd8
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 40b725938082ff24b978ef30aea7a60d
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: dffdee4298f72874aaca89c960e8cdaf
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: e8104da84cdbc6b41a4edebdca2a619c
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

View File

@ -6,7 +6,7 @@ AnimatorController:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: fuwenlujing
m_Name: fuwenlujing_ctrl
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:

View File

@ -4810,7 +4810,7 @@ RectTransform:
m_Children:
- {fileID: 788618541235343804}
m_Father: {fileID: 6857431349622417075}
m_RootOrder: 3
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -19955,6 +19955,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 7905331320865607645}
- {fileID: 7451155351264481488}
- {fileID: 2460104060231984465}
- {fileID: 7028779672763907709}
@ -20604,7 +20605,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 161672366053446771}
m_RootOrder: 2
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -37013,7 +37014,7 @@ RectTransform:
m_Children:
- {fileID: 8497496980748765707}
m_Father: {fileID: 6857431349622417075}
m_RootOrder: 4
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -37323,7 +37324,6 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 7905331320865607645}
- {fileID: 8834495025878721902}
- {fileID: 2104297696566059952}
- {fileID: 731194827031997369}
@ -56523,7 +56523,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 161672366053446771}
m_RootOrder: 1
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -57490,7 +57490,7 @@ RectTransform:
- {fileID: 7029056200395171643}
- {fileID: 8687714314605843872}
m_Father: {fileID: 6857431349622417075}
m_RootOrder: 2
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -67756,7 +67756,7 @@ RectTransform:
m_Children:
- {fileID: 5094442851259456152}
- {fileID: 5393295928246102467}
m_Father: {fileID: 6857431349622417075}
m_Father: {fileID: 161672366053446771}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@ -68124,7 +68124,7 @@ RectTransform:
m_Children:
- {fileID: 1037405534564376616}
m_Father: {fileID: 161672366053446771}
m_RootOrder: 0
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -68540,7 +68540,7 @@ RectTransform:
- {fileID: 2515134631909214660}
- {fileID: 4945657128760505677}
m_Father: {fileID: 6857431349622417075}
m_RootOrder: 1
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}

View File

@ -5123,7 +5123,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 83, y: -427}
m_SizeDelta: {x: 129, y: 126}
m_SizeDelta: {x: 128, y: 126}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6020975154716938251
CanvasRenderer:
@ -5153,7 +5153,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: c1a878ca1b69e94418d50385dcdcb660, type: 3}
m_Sprite: {fileID: 21300000, guid: 545e8499ef8310946bad1abfc208a98a, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -46027,7 +46027,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: c50319e65ad9dcf49bdea89487013be3, type: 3}
m_Sprite: {fileID: 21300000, guid: 074cbfe4e7dc08d40b4b10265ad8632e, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1

View File

@ -378,7 +378,7 @@ RectTransform:
m_Children:
- {fileID: 6136996338562794280}
m_Father: {fileID: 6788551056416428698}
m_RootOrder: 6
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -1768,7 +1768,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6788551056416428698}
m_RootOrder: 5
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -2277,11 +2277,11 @@ RectTransform:
- {fileID: 665414690798906158}
- {fileID: 3092850759758360225}
- {fileID: 3967679856157655767}
- {fileID: 4336398015624501059}
- {fileID: 1597820758558598860}
- {fileID: 2979957121249848572}
- {fileID: 6887620774143744948}
- {fileID: 2747881863298114042}
- {fileID: 4336398015624501059}
m_Father: {fileID: 8463856118875763708}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -3834,7 +3834,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6788551056416428698}
m_RootOrder: 8
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -4905,11 +4905,11 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6788551056416428698}
m_RootOrder: 4
m_RootOrder: 8
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: 443, y: 195}
m_AnchoredPosition: {x: 410.15, y: 163.5}
m_SizeDelta: {x: 30, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7686434233130170854
@ -5618,7 +5618,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6788551056416428698}
m_RootOrder: 7
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -5994,7 +5994,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -0.0000010166028}
m_AnchoredPosition: {x: 0, y: -0.000038214017}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 1}
--- !u!114 &1537562228229781123

View File

@ -1011,6 +1011,7 @@ RedPointType = {
incarnation_buddish = 43803,
incarnation_demon = 43804,
incarnation_taoist = 43805,
tiandihonglu = 43806,
LingMaiMiJing = 920,--灵脉秘境
}
@ -1355,6 +1356,7 @@ ActivityTypeDef = {
QiJieTreasure = 83,--七界秘宝
linglongshangshi = 20005,--玲珑商市
YuJianXing = 84, --御剑行
tiandihonglu = 74,
}
--活动结束需要处理面板关闭类型
ActivityTypePanel = {
@ -3075,7 +3077,18 @@ GetIncarnationNameColor = {
[2] = "7E20Af",
[3] = "7E20Af",
[4] = "7E20Af",
[5] = "BB6FIE",
[5] = "BB6F1E",
[6] = "B63939",
[7] = "96FFEF",
}
--Hero大卡背景
GetIncarnationHeroCardStarBg = {
[1] = "t_chengyuankuang_huise",
[2] = "t_chengyuankuang_lvse",
[3] = "t_chengyuankuang_lan",
[4] = "t_chengyuankuang_zi",
[5] = "t_chengyuankuang_huang",
[6] = "t_chengyuankuang_hong",
[7] = "t_chengyuankuang_zhaunshi",
}

View File

@ -1559,6 +1559,18 @@ function TimeStampToDateStr5(timestamp)
return string.format("%02d:%02d:%02d", date.hour, date.min, date.sec)
end
--时间格式转换(只显示月日时分)
function TimeStampToMDHM(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", date.hour, date.min)
--end
return string.format(Language[10627],date.month, date.day,date.hour, date.min)
--return string.format("%d年%d月%d日 %02d:%02d", date.year, date.month, date.day, date.hour, date.min)
end
--- 根据id获取资源
function GetResourcePath(id)
local config = ConfigManager.TryGetConfigData(ConfigName.ArtResourcesConfig, id)

View File

@ -506,5 +506,5 @@ SubUIConfig = {
[32] = {name = "ElementDrawCardPanelNew",assetName = "ElementDrawCardPanelNew",script = "Modules/Recruit/ElementDrawCardPanelNew"},--升星有礼
[33] = {name = "XunBaoMiZongPanel",assetName = "XunBaoMiZongPanel",script = "Modules/XunBaoMiZong/XunBaoMiZongPanel"},--寻宝迷踪
[34] = {name = "WeekCardPage",assetName = "WeekCardPage",script = "Modules/Operating/WeekCardPage"},
[35] = {name = "page16",assetName = "page16",script = "Modules/Operating/TailsmanSoulChipLottery"},
[35] = {name = "page16",assetName = "page16",script = "Modules/TailsManSoul/TailsmanSoulChipLottery"},
}

View File

@ -827,6 +827,7 @@ function this.GetSkillCombat(id)
BeforeOffset = combat.BeforeOffset,
HitOffset = combat.HitOffset,
SkillNameVoice = combat.SkillNameVoice,
BeforeEffectDelay = combat.BeforeEffectDelay,
}
end
@ -990,7 +991,7 @@ function this.LoadAsset(path, battleSorting)
UIManager.DoLanguageCheck(this.spLoader, go)
local layer = tonumber(go.name) or 0
battleSorting = battleSorting or BattleManager.GetBattleSorting()
Util.SetParticleSortLayer(go, battleSorting)-- - layer)
Util.AddParticleSortLayer(go, battleSorting - layer)
go.name = tostring(battleSorting)
return go
end

View File

@ -13,10 +13,20 @@ function SkillSetView:Init(root)
self.gameObject = root
self.rt = Util.GetGameObject(root, "role/time1/input"):GetComponent("InputField")
self.rt2 = Util.GetGameObject(root, "role/time2/input"):GetComponent("InputField")
self.nt1 = Util.GetGameObject(root, "normal/time1/input"):GetComponent("InputField")
self.nt2 = Util.GetGameObject(root, "normal/time2/input"):GetComponent("InputField")
self.nt3 = Util.GetGameObject(root, "normal/time3/input"):GetComponent("InputField")
self.nt4 = Util.GetGameObject(root, "normal/time4/input"):GetComponent("InputField")
self.nt5 = Util.GetGameObject(root, "normal/time5/input"):GetComponent("InputField")
self.nt6 = Util.GetGameObject(root, "normal/time6/input"):GetComponent("InputField")
self.st1 = Util.GetGameObject(root, "special/time1/input"):GetComponent("InputField")
self.st2 = Util.GetGameObject(root, "special/time2/input"):GetComponent("InputField")
self.st3 = Util.GetGameObject(root, "special/time3/input"):GetComponent("InputField")
self.st4 = Util.GetGameObject(root, "special/time4/input"):GetComponent("InputField")
self.st5 = Util.GetGameObject(root, "special/time5/input"):GetComponent("InputField")
self.st6 = Util.GetGameObject(root, "special/time6/input"):GetComponent("InputField")
self.btnComfirm = Util.GetGameObject(root, "Root/confirm")
@ -43,18 +53,26 @@ function SkillSetView:Show(camp, pos, BattleView)
local nSkillId = self.role.roleData.skill[1]
local sSkillId = self.role.roleData.superSkill[1]
self.rt.text = self.roleView.spAtkTime*1000
self.rt2.text = self.roleView.atkSoundTime*1000
self.rt.text = self.roleView.SkillCaster.actionTime*1000
self.rt2.text = self.roleView.SkillCaster.soundTime*1000
local nCId = BattleManager.GetCombatIdBySkin(nSkillId, 0)
local nCombat = BattleManager.GetSkillCombat(nCId)
self.nt1.text = nCombat.BulletTime
self.nt1.text = nCombat.BeforeEffectDelay
self.nt2.text = nCombat.KeyFrame
self.nt3.text = nCombat.BulletTime
self.nt4.text = nCombat.DamageDelay
self.nt5.text = nCombat.SkillDuration
self.nt6.text = nCombat.SkillNumber
local sCId = BattleManager.GetCombatIdBySkin(sSkillId, 0)
local sCombat = BattleManager.GetSkillCombat(sCId)
self.st1.text = sCombat.BulletTime
self.st1.text = sCombat.BeforeEffectDelay
self.st2.text = sCombat.KeyFrame
self.st3.text = sCombat.BulletTime
self.st4.text = sCombat.DamageDelay
self.st5.text = sCombat.SkillDuration
self.st6.text = sCombat.SkillNumber
end
@ -64,29 +82,45 @@ function SkillSetView:ApplyData()
local nSkillId = self.role.roleData.skill[1]
local sSkillId = self.role.roleData.superSkill[1]
self.roleView.spAtkTime = (tonumber(self.rt.text)or 0)/1000
self.roleView.atkSoundTime = (tonumber(self.rt2.text)or 0)/1000
self.roleView.SkillCaster.actionTime = (tonumber(self.rt.text)or 0)/1000
self.roleView.SkillCaster.soundTime = (tonumber(self.rt2.text)or 0)/1000
local ncId = BattleManager.GetCombatIdBySkin(nSkillId, 0)
local nCombat = BattleManager.GetSkillCombat(ncId)
local nBulletTime = tonumber(self.nt1.text) or 0
local nBeforeEffectDelay = tonumber(self.nt1.text) or 0
local nKeyFrame = tonumber(self.nt2.text) or 0
local nBulletTime = tonumber(self.nt3.text) or 0
local nDamageDelay = tonumber(self.nt4.text) or 0
local nSkillDuration = tonumber(self.nt5.text) or 0
local nSkillNumber = tonumber(self.nt6.text) or 0
nCombat.BulletTime = nBulletTime
nCombat.KeyFrame = nKeyFrame
nCombat.BeforeEffectDelay = nBeforeEffectDelay
nCombat.DamageDelay = nDamageDelay
BattleManager.SetSkillCombat(ncId, nCombat)
for i=2, #self.role.skill do
self.role.skill[2] = nKeyFrame/1000
self.role.skill[3] = nSkillDuration/1000
self.role.skill[4] = nSkillNumber
end
local scId = BattleManager.GetCombatIdBySkin(sSkillId, 0)
local sCombat = BattleManager.GetSkillCombat(scId)
local sBulletTime = tonumber(self.st1.text) or 0
local sBeforeEffectDelay = tonumber(self.st1.text) or 0
local sKeyFrame = tonumber(self.st2.text) or 0
local sBulletTime = tonumber(self.st3.text) or 0
local sDamageDelay = tonumber(self.st4.text) or 0
local sSkillDuration = tonumber(self.st5.text) or 0
local sSkillNumber = tonumber(self.st6.text) or 0
sCombat.BulletTime = sBulletTime
sCombat.KeyFrame = sKeyFrame
sCombat.BeforeEffectDelay = sBeforeEffectDelay
sCombat.DamageDelay = sDamageDelay
BattleManager.SetSkillCombat(scId, sCombat)
for i=2, #self.role.superSkill do
self.role.superSkill[2] = sKeyFrame/1000
self.role.superSkill[3] = sSkillDuration/1000
self.role.superSkill[4] = sSkillNumber
end
PopupTipPanel.ShowTip(Language[10212])

View File

@ -118,7 +118,9 @@ function BuffCtrl:AddBuffEffect(buffName, isTrigger, offset)
-- if sortingOrder==nil and buffName=="TongYong_Effect_buff_hunluan_1" then
-- sortingOrder=BattleManager.GetBattleSorting()+1
-- end
local node = BattleManager.LoadAsset(buffName, sortingOrder - 1) -- buff特效比血条低一个层级
local node = BattleManager.LoadAsset(buffName)
Util.SetParticleSortLayer(node, sortingOrder - 1) -- buff特效比血条低一个层级
node.name = tostring(sortingOrder - 1)
-- node.transform:SetParent(self.RootPanel.transform)
-- node.transform.localScale = Vector3.one
node.transform:SetParent(self.owner.GameObject.transform)

View File

@ -205,8 +205,8 @@ function EnemyView:ChangeCardSorting(sortingOrder)
self.GameObject:GetComponent("Canvas").sortingOrder = sort + 2 --血条层级加2
self.effect_rage:GetComponent("Canvas").sortingOrder = sort + 3
self.effect_dead:GetComponent("Canvas").sortingOrder = sort + 3
Util.AddParticleSortLayer(self.effect_rage, sort + 3)
Util.AddParticleSortLayer(self.effect_dead, sort + 3)
Util.SetParticleSortLayer(self.effect_rage, sort + 3)
Util.SetParticleSortLayer(self.effect_dead, sort + 3)
end
function EnemyView:Update()

View File

@ -57,7 +57,13 @@ function SkillCaster:OnSkillCast(skill)
-- 播放
-- 这里相当于技能前摇,等待立绘播放到需要释放关键帧的时间时继续释放技能(人物前摇特效)
if self.owner.role.type == BattleUnitType.Role then
self:CheckSkillForoleEffect(combat, skill)
if combat.BeforeEffectDelay then
self.owner:DelayFunc(combat.BeforeEffectDelay/1000, function()
self:CheckSkillForoleEffect(combat, skill)
end)
else
self:CheckSkillForoleEffect(combat, skill)
end
end
self.owner:DelayFunc(self.actionTime, function()
self:CheckFullSceenSkill(combat, skill)
@ -116,7 +122,13 @@ function SkillCaster:PlaySkillCastingEffect(combat, skill, func)
-- 这里相当于技能前摇,等待立绘播放到需要释放关键帧的时间时继续释放技能(灵兽前摇特效)
if self.owner.role.type == BattleUnitType.Monster then
self:CheckSkillForoleEffect(combat, skill)
if combat.BeforeEffectDelay then
self.owner:DelayFunc(combat.BeforeEffectDelay/1000, function()
self:CheckSkillForoleEffect(combat, skill)
end)
else
self:CheckSkillForoleEffect(combat, skill)
end
end
if self.owner.OnSkillCastStart then
@ -392,7 +404,7 @@ function SkillCaster:CheckFullSceenSkill(combat, skill)
--
BattleManager.AddDelayRecycleRes(combat.Bullet, go2, combat.KeyFrame/1000)
BattleManager.AddDelayRecycleRes(combat.Bullet, go2, combat.KeyFrame/1000 + 0.2) -- 额外增加0.2秒显示时间
end
end

View File

@ -114,7 +114,7 @@ function this:FormationAdapter()
this.LiveGO = poolManager:LoadLive(this.LiveName, this.live2dRoot.transform,
Vector3.one * heroConfig.Scale, Vector3.New(heroConfig.Position[1],heroConfig.Position[2],0))
end
FindFairyManager.ResetItemView(this.root,this.root.transform,itemList,5,1,sortingOrder,false,rewardData)
ResetItemView(this.root,this.root.transform,itemList,5,1,sortingOrder,false,rewardData)
end
function this:OnClose()
if fun then

View File

@ -122,7 +122,7 @@ function this:FormationAdapter()
end
end
end
FindFairyManager.ResetItemView(this.root,this.root.transform,itemList,5,1,sortingOrder,false,rewardData)
ResetItemView(this.root,this.root.transform,itemList,5,1,sortingOrder,false,rewardData)
end
function this.OnSortingOrderChange()

View File

@ -183,7 +183,7 @@ function this:FormationAdapter()
heroListGo[i]:SetActive(false)
end
end
FindFairyManager.ResetItemView(this.root,this.root.transform,itemList,5,1,sortingOrder,false,rewardData)
ResetItemView(this.root,this.root.transform,itemList,5,1,sortingOrder,false,rewardData)
end
function this.OnSortingOrderChange()

View File

@ -194,7 +194,7 @@ function this:FormationAdapter()
heroListGo[i]:SetActive(false)
end
end
FindFairyManager.ResetItemView(this.root,this.root.transform,itemList,5,1,sortingOrder,false,rewardData)
ResetItemView(this.root,this.root.transform,itemList,5,1,sortingOrder,false,rewardData)
end
function this.OnSortingOrderChange()

View File

@ -251,7 +251,7 @@ function this.FindFairyRecordShow(root, data)
local logoName = GuildManager.GetLogoResName(data.icon)
guildIcon.sprite = this.spLoader:LoadSprite(logoName)
end
FindFairyManager.ResetItemView(
ResetItemView(
root,
heroHead.transform,
this.heroItemList,
@ -274,7 +274,7 @@ function this.ScoreRewardShow(root, data)
local stateText = Util.GetGameObject(root, "StateBtn/Text"):GetComponent("Text")
local config = ConfigManager.GetConfigData(ConfigName.ActivityRewardConfig, data.missionId)
info.text = Language[10634] .. config.Values[1][1] .. Language[10635]
FindFairyManager.ResetItemView(root, rewardRoot, this.scoreItemList, 4, 1, this.sortingOrder, false, config.Reward)
ResetItemView(root, rewardRoot, this.scoreItemList, 4, 1, this.sortingOrder, false, config.Reward)
stateBtn:GetComponent("Button").interactable = data.value >= config.Values[1][1] and data.state == 0
@ -358,7 +358,7 @@ function this.BigRankRewardShow(root, data, index)
end
--奖励物品根节点
local rewardRoot = Util.GetGameObject(root, "RewardRoot").transform
FindFairyManager.ResetItemView(
ResetItemView(
root,
rewardRoot,
this.bigItemList,

View File

@ -77,7 +77,7 @@ function this.SetShow(root,data)
local progress=Util.GetGameObject(root,"Progress"):GetComponent("Text")
title.text=GetLanguageStrById(data.native.Name)
FindFairyManager.ResetItemView(root,content.transform,itemList,4,0.9,sortingOrder,false,data.native.RewardShow)
ResetItemView(root,content.transform,itemList,4,0.9,sortingOrder,false,data.native.RewardShow)
stateBtn:GetComponent("Button").interactable=data.server.buyTimes< data.native.Limit
if data.server.buyTimes< data.native.Limit then--未购买

View File

@ -79,7 +79,7 @@ function this:SetShow(root,data)
local config = ConfigManager.GetConfigData(ConfigName.ActivityRewardConfig,data.missionId)
title.text= GetLanguageStrById(config.ContentsShow)
FindFairyManager.ResetItemView(root,content.transform,itemList,4,0.9,sortingOrder,false,config.Reward)
ResetItemView(root,content.transform,itemList,4,0.9,sortingOrder,false,config.Reward)
progress.text="("..data.value.."/"..config.Values[1][1]..")"
progress.enabled= data.value<config.Values[1][1]

View File

@ -356,11 +356,11 @@ function this.SetCurRankReward(myRankData)
for i = 1, #FindFairyManager.rankRewardData do
--前3档奖励
if myRank<=3 and i==myRank then
FindFairyManager.ResetItemView(this.bottomView,this.curRewardRoot.transform,
ResetItemView(this.bottomView,this.curRewardRoot.transform,
this.curRewardItemList,3,0.9,sortingOrder,false,FindFairyManager.rankRewardData[i].RankingReward)
--后续各档位奖励
elseif myRank>3 and myRank>=FindFairyManager.rankRewardData[i].MinRank and myRank<=FindFairyManager.rankRewardData[i].MaxRank then
FindFairyManager.ResetItemView(this.bottomView,this.curRewardRoot.transform,
ResetItemView(this.bottomView,this.curRewardRoot.transform,
this.curRewardItemList,3,0.9,sortingOrder,false,FindFairyManager.rankRewardData[i].RankingReward)
end
end

View File

@ -162,7 +162,7 @@ function this.SetShow(root,data,index)
end
end
playerName.text=PracticeManager.SetNameColor(data.name,data.practiceLevel).." ("..grant..")"
time.text=FindFairyManager.TimeStampToDateStr(data.time)
time.text= TimeStampToMDHM(data.time)
rewardIcon.sprite=SetIcon(this.spLoader, data.itemId)
rewardNum.text=data.count
end

View File

@ -166,7 +166,7 @@ function this.SetInfo(id)
this.countText.text=redpack.Num
this.message.text=GetLanguageStrById(redpack.SendWord)
FindFairyManager.ResetItemView(this.rewardRoot,this.rewardRoot.transform,this.itemList,4,0.9,sortingOrder,false,recharge.BaseReward)
ResetItemView(this.rewardRoot,this.rewardRoot.transform,this.itemList,4,0.9,sortingOrder,false,recharge.BaseReward)
this.sendBtn:GetComponent("Button").interactable=surplusNum>0
Util.SetGray(this.sendBtn,surplusNum<1)

View File

@ -69,7 +69,7 @@ end
function this.GetproDesStr(_str,dataList)
local str = _str
for k,v in pairs(dataList) do
str = str..PropertyConfig[k].Info.."+"..GetEquipPropertyFormatStr(PropertyConfig[k].Style,v).." "
str = str..PropertyConfig[k].Info.."+"..GetPropertyFormatStrOne(PropertyConfig[k].Style,v).." "
end
return str
end
@ -77,7 +77,7 @@ end
function this.GetproDesLst(dataList,_color)
local list = {}
for k,v in pairs(dataList) do
local str = string.format("<color=#%s>%s+%s</color>",_color,PropertyConfig[k].Info,GetEquipPropertyFormatStr(PropertyConfig[k].Style,v))
local str = string.format("<color=#%s>%s+%s</color>",_color,PropertyConfig[k].Info,GetPropertyFormatStrOne(PropertyConfig[k].Style,v))
table.insert(list,str)
end
return list

View File

@ -94,8 +94,8 @@ function IncarnationPanel:BindEvent()
local data = {}
local singData = {}
singData.title = "当前化身收集度"
singData.pro = {string.format("<color=#00FF00>%s/%s</color>",IncarnationManager.GetActiveNum(),LengthOfTable(IncarnationManager.itemDataList))}
singData.tip = ""
singData.pro = {}
singData.tip = string.format("<color=#00FF00>%s/%s</color>",IncarnationManager.GetActiveNum(),LengthOfTable(IncarnationManager.itemDataList))
table.insert(data,singData)
local singData = {}
singData.title = "化身之力加成"
@ -197,7 +197,7 @@ function IncarnationPanel:RefreshSingleCardPre(cardPre,data,isJump,index)
else
self.cardList[cardPre].getBtn.gameObject:SetActive(false)
end
self.cardList[cardPre].bg.sprite = self.spLoader:LoadSprite(GetHeroCardStarBg[data.quality])
self.cardList[cardPre].bg.sprite = self.spLoader:LoadSprite(GetIncarnationHeroCardStarBg[data.quality])
local liveName = GetResourcePath(heroConfig[data.heroId].Live)
local roleConfig = ConfigManager.GetConfigData(ConfigName.RoleConfig, data.heroId)

View File

@ -690,6 +690,7 @@ function this.ExecuteLoading()
--[[[50] =]]function() NetManager.GetLikeableDataRequest(LoadingPanel.OnStep) end, --好感度
--[[[51] =]]function() NetManager.GetTransformationRequest(LoadingPanel.OnStep) end, --身外化身
--[[[51] =]]function() NetManager.GetLingMaiInfoRequest(0,LoadingPanel.OnStep) end, --灵脉秘境
--[[[51] =]]function() NetManager.SendGetTailsmanSoulData(LoadingPanel.OnStep) end, --灵脉秘境
function() -- 登录请求最终接口,所有请求放在此接口之前
-- 登录成功确认
NetManager.LoginConfimRequest()

View File

@ -6157,9 +6157,14 @@ function NetManager.UpOrDownTransformationRequest(id,pos,status,func)
data.index = pos
local msg = data:SerializeToString()
Network:SendMessageWithCallBack(MessageTypeProto_pb.UpOrDownTransformationRequest, MessageTypeProto_pb.GetTransformationResponse, msg, function(buffer)
local oldPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
IncarnationManager.SetItemDataByid(id,status,pos)
HeroPropManager.SetFuncPropDirty(Func_Prop_Type.Incarnation)
NetManager.RequestUserForceChange(FormationTypeDef.FORMATION_NORMAL)
local newPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
if newPower - oldPower > 0 then
UIManager.OpenPanel(UIName.WarPowerChangeNotifyPanelV2,{oldValue = oldPower,newValue = newPower})
end
if func then
func(msg)
end
@ -6179,12 +6184,13 @@ function NetManager.LingMaiRecordRequest(func)
end
function NetManager.SendRefreshTailsmanSoulData(idlist,fun)
local data = HeroInfoProto_pb.HeroGodSoulBindRequest()
local data = ActivityProto_pb.TrumpGachaSelectItemRequest()
data.activityId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.tiandihonglu)
for k,v in pairs(idlist) do
data.idlist:append(v)
data.selectIds:append(v)
end
local msg = data:SerializeToString()
Network:SendMessageWithCallBack(MessageTypeProto_pb.CrossLingmaiSecretAreaRecordRequest, MessageTypeProto_pb.CrossLingmaiSecretAreaRecordResponse, nil, function(buffer)
Network:SendMessageWithCallBack(MessageTypeProto_pb.TRUMP_GACHA_SELECT_ITEM_REQUEST, MessageTypeProto_pb.TRUMP_GACHA_SELECT_ITEM_RESPONSE, nil, function(buffer)
RecruitManager.SetWishTailsManSoulChips(idlist)
Game.GlobalEvent:DispatchEvent(GameEvent.Activity.TailsmanSoulChipChange)
if fun then
@ -6192,4 +6198,19 @@ function NetManager.SendRefreshTailsmanSoulData(idlist,fun)
end
end)
end
function NetManager.SendGetTailsmanSoulData(fun)
local data = ActivityProto_pb.GetTrumpSelectItemRequest()
local msg = data:SerializeToString()
Network:SendMessageWithCallBack(MessageTypeProto_pb.GET_TRUMP_SELECT_ITEM_REQUEST, MessageTypeProto_pb.GET_TRUMP_SELECT_ITEM_RESPONSE, msg, function(buffer)
local data = buffer:DataByte()
local msg = ActivityProto_pb.GetTrumpSelectItemResponse()
msg:ParseFromString(data)
RecruitManager.SetWishTailsManSoulChips(msg.selectIds)
if fun then
fun()
end
end)
end
return this

View File

@ -334,7 +334,8 @@ function this.InitRedPointAllRelate()
RPData:SetParent(RedPointType.incarnation_buddish,RedPointType.incarnation)
RPData:SetParent(RedPointType.incarnation_demon,RedPointType.incarnation)
RPData:SetParent(RedPointType.incarnation_taoist,RedPointType.incarnation)
RPData:SetParent(RedPointType.incarnation,RedPointType.Practice)
for k,v in ConfigPairs(ConfigManager.GetConfig(ConfigName.ActivityGroups)) do
if v.RpType > 0 and v.RpTypeParent > 0 then
RPData:SetParent(v.RpType,v.RpTypeParent)

View File

@ -78,7 +78,7 @@ function this:OnShow(_parent,...)
index = index + 1
end
FindFairyManager.ResetItemView(this.root,this.root.transform,itemList,4,1,sortingOrder,false,data)
ResetItemView(this.root,this.root.transform,itemList,4,1,sortingOrder,false,data)
end
function this:OnClose()

View File

@ -55,7 +55,7 @@ function this:OnShow(_parent,...)
this.titleText.text=Language[11541]
this.numImage.sprite = SetIcon(this.spLoader, 14)
this.numImage2.sprite = SetIcon(this.spLoader, 1258)
FindFairyManager.ResetItemView(this.root,this.root.transform,itemList,10,1,sortingOrder,false,args[3])
ResetItemView(this.root,this.root.transform,itemList,10,1,sortingOrder,false,args[3])
end
function this:OnClose()

View File

@ -31,7 +31,7 @@ function this:OnShow(_parent,...)
sortingOrder = _parent.sortingOrder
--不定参中包含的不定参 _args[1]为面板类型 _args[2]之后(包括)为打开面板后传入的不定参
local args = {...}
FindFairyManager.ResetItemView(this.root,this.root.transform,itemList,10,1.2,sortingOrder,false,ConfigManager.GetConfigData(ConfigName.GuildHelpConfig,1).Reward)
ResetItemView(this.root,this.root.transform,itemList,10,1.2,sortingOrder,false,ConfigManager.GetConfigData(ConfigName.GuildHelpConfig,1).Reward)
end
function this:OnClose()

View File

@ -92,7 +92,7 @@ function this:OnShow(_parent,...)
for i=1,#dropList do
_data[i]={dropList[i].id,dropList[i].num}
end
FindFairyManager.ResetItemView(this.root,this.root.transform,itemList,8,1,sortingOrder,false,_data)
ResetItemView(this.root,this.root.transform,itemList,8,1,sortingOrder,false,_data)
end
function this:OnClose()

View File

@ -71,7 +71,7 @@ function this:OnShow(_parent,...)
else
this.infoTxt.text=string.format(Language[12214],coin,GetLanguageStrById(itemConfig[id].Name),GetLanguageStrById(lingshouConfig.Name),"%")
end
FindFairyManager.ResetItemView(this.root,this.root.transform,itemList,10,1,sortingOrder,false,args[2])
ResetItemView(this.root,this.root.transform,itemList,10,1,sortingOrder,false,args[2])
end
function this:OnClose()

View File

@ -51,7 +51,7 @@ function this:OnShow(_parent,...)
--this.num.text = args[1]
fun = args[2]
this.infoTxt.text=Language[11576]
FindFairyManager.ResetItemView(this.root,this.root.transform,itemList,10,1,sortingOrder,false,args[1])
ResetItemView(this.root,this.root.transform,itemList,10,1,sortingOrder,false,args[1])
end
function this:OnClose()

View File

@ -75,7 +75,7 @@ function this:OnShow(_parent,...)
for i, v in pairs(dropList) do
data[i]={v.id,v.num}
end
FindFairyManager.ResetItemView(this.root,this.root.transform,itemList,10,1,sortingOrder,false,data)
ResetItemView(this.root,this.root.transform,itemList,10,1,sortingOrder,false,data)
end
function this:OnClose()

View File

@ -98,7 +98,7 @@ function this:OnShow(_parent,...)
index = index + 1
end
LogBlue(#data)
FindFairyManager.ResetItemView(this.root,this.root.transform,itemList,60,1,sortingOrder,false,data)
ResetItemView(this.root,this.root.transform,itemList,60,1,sortingOrder,false,data)
end
function this:OnClose()

View File

@ -101,7 +101,7 @@ function this:OnShow(_parent,...)
return itemConfig[a[1]].ItemType > itemConfig[b[1]].ItemType
end
end)
FindFairyManager.ResetItemView(this.root,this.root.transform,itemList,8,1,sortingOrder,false,_data)
ResetItemView(this.root,this.root.transform,itemList,8,1,sortingOrder,false,_data)
--英雄消耗道具数量

View File

@ -83,7 +83,7 @@ function this:OnShow(_parent,...)
for i=1,#dropList do
_data[i] = {dropList[i].id,dropList[i].num,nil,dropList[i].star}
end
FindFairyManager.ResetItemView(this.root,this.root.transform,itemList,8,1,sortingOrder,false,_data)
ResetItemView(this.root,this.root.transform,itemList,8,1,sortingOrder,false,_data)
end
function this:OnClose()

View File

@ -51,7 +51,7 @@ function this:OnShow(_parent,...)
fun = _args[3]
this.titleText.text=Language[11541]
this.numImage.sprite = SetIcon(this.spLoader, 14)
FindFairyManager.ResetItemView(this.root,this.root.transform,itemList,10,1,sortingOrder,false,_args[2])
ResetItemView(this.root,this.root.transform,itemList,10,1,sortingOrder,false,_args[2])
end
function this:OnClose()

View File

@ -34,7 +34,7 @@ function Practice:InitComponent()
self.treeRed = Util.GetGameObject(self.treeBtn, "redPoint")
self.talsmanSoulBtn = Util.GetGameObject(self.gameObject, "Btns/rightGrid/talsmanSoulBtm")
self.talsmanSoulBtnRed = Util.GetGameObject(self.talsmanSoulBtn, "redPoint")
self.incarnationBtn = Util.GetGameObject(self.gameObject, "Btns/rightGrid/incarnationBtn")
self.incarnationBtn = Util.GetGameObject(self.gameObject, "Btns/leftGrid/incarnationBtn")
self.incarnationBtnRed = Util.GetGameObject(self.incarnationBtn, "redPoint")
--MidPart

View File

@ -103,7 +103,7 @@ function QiJieShiLianMonsterInfo:FormationAdapter()
heroListGo[i]:SetActive(false)
end
end
FindFairyManager.ResetItemView(self.root,self.root.transform,itemList,5,1,sortingOrder,false,rewardData)
ResetItemView(self.root,self.root.transform,itemList,5,1,sortingOrder,false,rewardData)
end
function QiJieShiLianMonsterInfo:OnSortingOrderChange()

View File

@ -31,8 +31,7 @@ function TailsmanSoulChipLottery:InitComponent()
self.zqbgEffect = Util.GetGameObject(self.zhenqibaogeBtn,"Fx_Circle 1")
self.btn_soul = Util.GetGameObject(self.rightUp, "btn_hero")
self.upSoulImg= Util.GetGameObject(self.btn_soul, "Icon"):GetComponent("Image")
Util.GetGameObject(self.btn_soul,"InfoImg"):GetComponent("Image").sprite = self.spLoader:LoadSprite("q_qiankun__icondi_ghwj_zh")
Util.GetGameObject(self.btn_soul,"InfoImg2"):GetComponent("Image").sprite = self.spLoader:LoadSprite("x_xinjiangzhaohuan_gailv_zh")
Util.GetGameObject(self.btn_soul,"InfoImg"):GetComponent("Image").sprite = self.spLoader:LoadSprite("t_tdhl_genghuansuipian")
self.btns = {}
for i = 1 , 2 do