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

dev_chengFeng
gaoxin 2021-11-26 14:28:04 +08:00
commit efe08520b9
21 changed files with 517 additions and 34 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

@ -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

@ -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

@ -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

@ -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

@ -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