Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
ZhangBiao
commit
5a4a42594d
|
|
@ -0,0 +1,110 @@
|
|||
fileFormatVersion: 2
|
||||
guid: b9283f980aba02848a6bd52fb65ef2c4
|
||||
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: 375b00e3e10406c42897c4442a3e1e5b
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: SettingAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 43 KiB |
|
|
@ -0,0 +1,110 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 88d917964d0ca7743b0c8c57734899c5
|
||||
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: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 65
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: iPhone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 56
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 5e9b8cff53dfa1f4496780655dab5e78
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: TianShuMiJuanAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,85 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &5450105837541760934
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 5119415483809533729}
|
||||
- component: {fileID: 7220752045491615797}
|
||||
- component: {fileID: 8298926714615160739}
|
||||
m_Layer: 0
|
||||
m_Name: shenjian_zuoqi
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &5119415483809533729
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5450105837541760934}
|
||||
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: 0}
|
||||
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: 0, y: 0}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7220752045491615797
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5450105837541760934}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &8298926714615160739
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5450105837541760934}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 2100000, guid: b66cf7a186d13054989b33a5c90044e4, type: 2}
|
||||
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
|
||||
skeletonDataAsset: {fileID: 11400000, guid: 40f28811b1a755142953230c26c9f7aa, type: 2}
|
||||
initialSkinName: default
|
||||
initialFlipX: 0
|
||||
initialFlipY: 0
|
||||
startingAnimation: idle3
|
||||
startingLoop: 1
|
||||
timeScale: 1
|
||||
freeze: 0
|
||||
unscaledTime: 0
|
||||
meshGenerator:
|
||||
settings:
|
||||
useClipping: 1
|
||||
zSpacing: 0
|
||||
pmaVertexColors: 1
|
||||
tintBlack: 0
|
||||
calculateTangents: 0
|
||||
addNormals: 0
|
||||
immutableTriangles: 0
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 16c9d4969d0421146b4f3d835f540884
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 48c077883fa13a340b315f4e6514167a
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,27 @@
|
|||
|
||||
shenjian_zuoqi.png
|
||||
size: 512,512
|
||||
format: RGBA8888
|
||||
filter: Linear,Linear
|
||||
repeat: none
|
||||
sj1
|
||||
rotate: false
|
||||
xy: 2, 2
|
||||
size: 109, 500
|
||||
orig: 109, 500
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
sj2
|
||||
rotate: false
|
||||
xy: 280, 202
|
||||
size: 165, 300
|
||||
orig: 165, 300
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
sj3
|
||||
rotate: false
|
||||
xy: 113, 202
|
||||
size: 165, 300
|
||||
orig: 165, 300
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 335fd6c71e7777944bd1a53d17e4cfa4
|
||||
TextScriptImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 162 KiB |
|
|
@ -0,0 +1,88 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 2c15260e0b7bccf49a44a02086a4abd5
|
||||
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: -1
|
||||
aniso: -1
|
||||
mipBias: -100
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 0
|
||||
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: 0
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 0
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: b68d9c05dd10ec142b957aaeb574782d
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 6e1fd9385a08a56438cb9d2da94d145b
|
||||
TextScriptImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!114 &11400000
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3}
|
||||
m_Name: shenjian_zuoqi_Atlas
|
||||
m_EditorClassIdentifier:
|
||||
atlasFile: {fileID: 4900000, guid: 335fd6c71e7777944bd1a53d17e4cfa4, type: 3}
|
||||
materials:
|
||||
- {fileID: 2100000, guid: 371e89de3576973409d785230ebb51ad, type: 2}
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: ecd04392ef246aa4b8f7f92c1aef11d2
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!21 &2100000
|
||||
Material:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: shenjian_zuoqi_Material
|
||||
m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
|
||||
m_ShaderKeywords:
|
||||
m_LightmapFlags: 4
|
||||
m_EnableInstancingVariants: 0
|
||||
m_DoubleSidedGI: 0
|
||||
m_CustomRenderQueue: -1
|
||||
stringTagMap: {}
|
||||
disabledShaderPasses: []
|
||||
m_SavedProperties:
|
||||
serializedVersion: 3
|
||||
m_TexEnvs:
|
||||
- _MainTex:
|
||||
m_Texture: {fileID: 2800000, guid: 2c15260e0b7bccf49a44a02086a4abd5, type: 3}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_Floats:
|
||||
- _Cutoff: 0.1
|
||||
m_Colors: []
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 371e89de3576973409d785230ebb51ad
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 2100000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!114 &11400000
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: f1b3b4b945939a54ea0b23d3396115fb, type: 3}
|
||||
m_Name: shenjian_zuoqi_SkeletonData
|
||||
m_EditorClassIdentifier:
|
||||
atlasAssets:
|
||||
- {fileID: 11400000, guid: ecd04392ef246aa4b8f7f92c1aef11d2, type: 2}
|
||||
scale: 0.01
|
||||
skeletonJSON: {fileID: 4900000, guid: 6e1fd9385a08a56438cb9d2da94d145b, type: 3}
|
||||
fromAnimation: []
|
||||
toAnimation: []
|
||||
duration: []
|
||||
defaultMix: 0.2
|
||||
controller: {fileID: 0}
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 40f28811b1a755142953230c26c9f7aa
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -943,6 +943,7 @@ RedPointType = {
|
|||
SoulPrint_Fetter = 798, --魂印羁绊
|
||||
TianShuMiJuan = 799, --天书秘卷红点
|
||||
TianShuPokemon_Fetter = 800,--灵兽羁绊
|
||||
Equip_Fetter = 805, --装备羁绊
|
||||
|
||||
--跨服天梯
|
||||
JumpServer_MainCity = 820,--主界面跨服天梯
|
||||
|
|
|
|||
|
|
@ -766,6 +766,9 @@ RELIC_STATUS_FIELD = protobuf.FieldDescriptor();
|
|||
LIKABLEINFO = protobuf.Descriptor();
|
||||
LIKABLEINFO_HEROSTATICID_FIELD = protobuf.FieldDescriptor();
|
||||
LIKABLEINFO_LIKABLENUM_FIELD = protobuf.FieldDescriptor();
|
||||
EQUIPBOOKINFO = protobuf.Descriptor();
|
||||
EQUIPBOOKINFO_EQUIPID_FIELD = protobuf.FieldDescriptor();
|
||||
EQUIPBOOKINFO_NUM_FIELD = protobuf.FieldDescriptor();
|
||||
|
||||
ERRORRESPONSE_ERRCODE_FIELD.name = "errCode"
|
||||
ERRORRESPONSE_ERRCODE_FIELD.full_name = ".rpc.protocols.ErrorResponse.errCode"
|
||||
|
|
@ -8058,6 +8061,33 @@ LIKABLEINFO.enum_types = {}
|
|||
LIKABLEINFO.fields = {LIKABLEINFO_HEROSTATICID_FIELD, LIKABLEINFO_LIKABLENUM_FIELD}
|
||||
LIKABLEINFO.is_extendable = false
|
||||
LIKABLEINFO.extensions = {}
|
||||
EQUIPBOOKINFO_EQUIPID_FIELD.name = "equipId"
|
||||
EQUIPBOOKINFO_EQUIPID_FIELD.full_name = ".rpc.protocols.EquipBookInfo.equipId"
|
||||
EQUIPBOOKINFO_EQUIPID_FIELD.number = 1
|
||||
EQUIPBOOKINFO_EQUIPID_FIELD.index = 0
|
||||
EQUIPBOOKINFO_EQUIPID_FIELD.label = 1
|
||||
EQUIPBOOKINFO_EQUIPID_FIELD.has_default_value = false
|
||||
EQUIPBOOKINFO_EQUIPID_FIELD.default_value = 0
|
||||
EQUIPBOOKINFO_EQUIPID_FIELD.type = 5
|
||||
EQUIPBOOKINFO_EQUIPID_FIELD.cpp_type = 1
|
||||
|
||||
EQUIPBOOKINFO_NUM_FIELD.name = "num"
|
||||
EQUIPBOOKINFO_NUM_FIELD.full_name = ".rpc.protocols.EquipBookInfo.num"
|
||||
EQUIPBOOKINFO_NUM_FIELD.number = 2
|
||||
EQUIPBOOKINFO_NUM_FIELD.index = 1
|
||||
EQUIPBOOKINFO_NUM_FIELD.label = 1
|
||||
EQUIPBOOKINFO_NUM_FIELD.has_default_value = false
|
||||
EQUIPBOOKINFO_NUM_FIELD.default_value = 0
|
||||
EQUIPBOOKINFO_NUM_FIELD.type = 5
|
||||
EQUIPBOOKINFO_NUM_FIELD.cpp_type = 1
|
||||
|
||||
EQUIPBOOKINFO.name = "EquipBookInfo"
|
||||
EQUIPBOOKINFO.full_name = ".rpc.protocols.EquipBookInfo"
|
||||
EQUIPBOOKINFO.nested_types = {}
|
||||
EQUIPBOOKINFO.enum_types = {}
|
||||
EQUIPBOOKINFO.fields = {EQUIPBOOKINFO_EQUIPID_FIELD, EQUIPBOOKINFO_NUM_FIELD}
|
||||
EQUIPBOOKINFO.is_extendable = false
|
||||
EQUIPBOOKINFO.extensions = {}
|
||||
|
||||
ActivityInfo = protobuf.Message(ACTIVITYINFO)
|
||||
ActivityInfo.MissionInfo = protobuf.Message(ACTIVITYINFO_MISSIONINFO)
|
||||
|
|
@ -8080,6 +8110,7 @@ Drop = protobuf.Message(DROP)
|
|||
EndlessPoint = protobuf.Message(ENDLESSPOINT)
|
||||
EndlessRefreshInfo = protobuf.Message(ENDLESSREFRESHINFO)
|
||||
Equip = protobuf.Message(EQUIP)
|
||||
EquipBookInfo = protobuf.Message(EQUIPBOOKINFO)
|
||||
ErrorResponse = protobuf.Message(ERRORRESPONSE)
|
||||
EventBehaviorCommon = protobuf.Message(EVENTBEHAVIORCOMMON)
|
||||
EventBehaviorValues = protobuf.Message(EVENTBEHAVIORVALUES)
|
||||
|
|
|
|||
|
|
@ -99,6 +99,7 @@ GETALLPOKEMONRESPONSE_POKEMONGOT_FIELD = protobuf.FieldDescriptor();
|
|||
GETALLPROPERTYINFORESPONSE = protobuf.Descriptor();
|
||||
GETALLPROPERTYINFORESPONSE_ALLBOOKENABLED_FIELD = protobuf.FieldDescriptor();
|
||||
GETALLPROPERTYINFORESPONSE_EQUIPGOT_FIELD = protobuf.FieldDescriptor();
|
||||
GETALLPROPERTYINFORESPONSE_EQUIPLIST_FIELD = protobuf.FieldDescriptor();
|
||||
REPLACETEAMPOKEMONINFOREQUEST = protobuf.Descriptor();
|
||||
REPLACETEAMPOKEMONINFOREQUEST_TEAMPOKEMONINFOS_FIELD = protobuf.FieldDescriptor();
|
||||
POKENMONUPLEVELREQUEST = protobuf.Descriptor();
|
||||
|
|
@ -251,6 +252,8 @@ HEROUPLIKABLEREQUEST = protobuf.Descriptor();
|
|||
HEROUPLIKABLEREQUEST_HEROSTATICID_FIELD = protobuf.FieldDescriptor();
|
||||
HEROUPLIKABLEREQUEST_ITEMID_FIELD = protobuf.FieldDescriptor();
|
||||
HEROUPLIKABLEREQUEST_ITEMNUM_FIELD = protobuf.FieldDescriptor();
|
||||
EQUIPBOOKINDICATION = protobuf.Descriptor();
|
||||
EQUIPBOOKINDICATION_CHANGEEQUIPLIST_FIELD = protobuf.FieldDescriptor();
|
||||
|
||||
GETHEROLISTINFOREQUEST_INDEX_FIELD.name = "index"
|
||||
GETHEROLISTINFOREQUEST_INDEX_FIELD.full_name = ".rpc.protocols.GetHeroListInfoRequest.index"
|
||||
|
|
@ -1119,11 +1122,22 @@ GETALLPROPERTYINFORESPONSE_EQUIPGOT_FIELD.default_value = {}
|
|||
GETALLPROPERTYINFORESPONSE_EQUIPGOT_FIELD.type = 5
|
||||
GETALLPROPERTYINFORESPONSE_EQUIPGOT_FIELD.cpp_type = 1
|
||||
|
||||
GETALLPROPERTYINFORESPONSE_EQUIPLIST_FIELD.name = "equipList"
|
||||
GETALLPROPERTYINFORESPONSE_EQUIPLIST_FIELD.full_name = ".rpc.protocols.GetAllPropertyInfoResponse.equipList"
|
||||
GETALLPROPERTYINFORESPONSE_EQUIPLIST_FIELD.number = 3
|
||||
GETALLPROPERTYINFORESPONSE_EQUIPLIST_FIELD.index = 2
|
||||
GETALLPROPERTYINFORESPONSE_EQUIPLIST_FIELD.label = 3
|
||||
GETALLPROPERTYINFORESPONSE_EQUIPLIST_FIELD.has_default_value = false
|
||||
GETALLPROPERTYINFORESPONSE_EQUIPLIST_FIELD.default_value = {}
|
||||
GETALLPROPERTYINFORESPONSE_EQUIPLIST_FIELD.message_type = CommonProto_pb.EQUIPBOOKINFO
|
||||
GETALLPROPERTYINFORESPONSE_EQUIPLIST_FIELD.type = 11
|
||||
GETALLPROPERTYINFORESPONSE_EQUIPLIST_FIELD.cpp_type = 10
|
||||
|
||||
GETALLPROPERTYINFORESPONSE.name = "GetAllPropertyInfoResponse"
|
||||
GETALLPROPERTYINFORESPONSE.full_name = ".rpc.protocols.GetAllPropertyInfoResponse"
|
||||
GETALLPROPERTYINFORESPONSE.nested_types = {}
|
||||
GETALLPROPERTYINFORESPONSE.enum_types = {}
|
||||
GETALLPROPERTYINFORESPONSE.fields = {GETALLPROPERTYINFORESPONSE_ALLBOOKENABLED_FIELD, GETALLPROPERTYINFORESPONSE_EQUIPGOT_FIELD}
|
||||
GETALLPROPERTYINFORESPONSE.fields = {GETALLPROPERTYINFORESPONSE_ALLBOOKENABLED_FIELD, GETALLPROPERTYINFORESPONSE_EQUIPGOT_FIELD, GETALLPROPERTYINFORESPONSE_EQUIPLIST_FIELD}
|
||||
GETALLPROPERTYINFORESPONSE.is_extendable = false
|
||||
GETALLPROPERTYINFORESPONSE.extensions = {}
|
||||
REPLACETEAMPOKEMONINFOREQUEST_TEAMPOKEMONINFOS_FIELD.name = "teamPokemonInfos"
|
||||
|
|
@ -2497,6 +2511,24 @@ HEROUPLIKABLEREQUEST.enum_types = {}
|
|||
HEROUPLIKABLEREQUEST.fields = {HEROUPLIKABLEREQUEST_HEROSTATICID_FIELD, HEROUPLIKABLEREQUEST_ITEMID_FIELD, HEROUPLIKABLEREQUEST_ITEMNUM_FIELD}
|
||||
HEROUPLIKABLEREQUEST.is_extendable = false
|
||||
HEROUPLIKABLEREQUEST.extensions = {}
|
||||
EQUIPBOOKINDICATION_CHANGEEQUIPLIST_FIELD.name = "changeEquipList"
|
||||
EQUIPBOOKINDICATION_CHANGEEQUIPLIST_FIELD.full_name = ".rpc.protocols.EquipBookIndication.changeEquipList"
|
||||
EQUIPBOOKINDICATION_CHANGEEQUIPLIST_FIELD.number = 1
|
||||
EQUIPBOOKINDICATION_CHANGEEQUIPLIST_FIELD.index = 0
|
||||
EQUIPBOOKINDICATION_CHANGEEQUIPLIST_FIELD.label = 3
|
||||
EQUIPBOOKINDICATION_CHANGEEQUIPLIST_FIELD.has_default_value = false
|
||||
EQUIPBOOKINDICATION_CHANGEEQUIPLIST_FIELD.default_value = {}
|
||||
EQUIPBOOKINDICATION_CHANGEEQUIPLIST_FIELD.message_type = CommonProto_pb.EQUIPBOOKINFO
|
||||
EQUIPBOOKINDICATION_CHANGEEQUIPLIST_FIELD.type = 11
|
||||
EQUIPBOOKINDICATION_CHANGEEQUIPLIST_FIELD.cpp_type = 10
|
||||
|
||||
EQUIPBOOKINDICATION.name = "EquipBookIndication"
|
||||
EQUIPBOOKINDICATION.full_name = ".rpc.protocols.EquipBookIndication"
|
||||
EQUIPBOOKINDICATION.nested_types = {}
|
||||
EQUIPBOOKINDICATION.enum_types = {}
|
||||
EQUIPBOOKINDICATION.fields = {EQUIPBOOKINDICATION_CHANGEEQUIPLIST_FIELD}
|
||||
EQUIPBOOKINDICATION.is_extendable = false
|
||||
EQUIPBOOKINDICATION.extensions = {}
|
||||
|
||||
AllBookEnableRequest = protobuf.Message(ALLBOOKENABLEREQUEST)
|
||||
CancelHeroChangeRequest = protobuf.Message(CANCELHEROCHANGEREQUEST)
|
||||
|
|
@ -2513,6 +2545,7 @@ DoHeroChangeRequest = protobuf.Message(DOHEROCHANGEREQUEST)
|
|||
DoHeroChangeResponse = protobuf.Message(DOHEROCHANGERESPONSE)
|
||||
DrawHeroRequest = protobuf.Message(DRAWHEROREQUEST)
|
||||
DrawHeroResponse = protobuf.Message(DRAWHERORESPONSE)
|
||||
EquipBookIndication = protobuf.Message(EQUIPBOOKINDICATION)
|
||||
EquipUnLoadOptRequest = protobuf.Message(EQUIPUNLOADOPTREQUEST)
|
||||
EquipWearRequest = protobuf.Message(EQUIPWEARREQUEST)
|
||||
EspecialEquipBackRequest = protobuf.Message(ESPECIALEQUIPBACKREQUEST)
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -81,7 +81,6 @@ function this.UpdateBagData(_itemData, isNoSendNewItemEvent)
|
|||
diamond_amount = BagManager.GetItemCountById(16),
|
||||
})
|
||||
end
|
||||
--
|
||||
end
|
||||
|
||||
---英雄副本独用刷新
|
||||
|
|
@ -682,8 +681,7 @@ function this.GetTableByBackDropData(drop)
|
|||
itemdata.frame = GetQuantityImageByquality(itemdata.configData.Quantity)
|
||||
itemdata.icon = GetResourcePath(itemdata.configData.ResourceID)
|
||||
itemdata.num = drop.itemlist[i].itemNum
|
||||
table.insert(itemDataList, itemdata)
|
||||
--BagManager.UpdateBagData(itemdata.backData)
|
||||
table.insert(itemDataList, itemdata)
|
||||
end
|
||||
CheckRedPointStatus(RedPointType.Recruit_Normal)
|
||||
CheckRedPointStatus(RedPointType.Recruit_ShenJiang)
|
||||
|
|
@ -809,7 +807,7 @@ function this.GetItemListFromTempBag(drop, isSave)
|
|||
table.insert(itemDataList, itemdata)
|
||||
elseif this.dropIsSHowEquipPrint then--献祭 升星吞卡 掉落身上装备和魂印 但是不显示 前端做处理
|
||||
table.insert(itemDataList, itemdata)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
if drop.equipId ~= nil and #drop.equipId > 0 then
|
||||
|
|
@ -1093,7 +1091,7 @@ function this.BagIndicationRefresh(msg)
|
|||
end
|
||||
if itemConfig[v.itemId].ItemType == ItemType.LingShouChip then--灵兽碎片获得刷新红点
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.Pokemon.PokemonChipRefresh)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
elseif msg.type == 1 then
|
||||
|
|
|
|||
|
|
@ -8423,6 +8423,60 @@ local passivityList = {
|
|||
end
|
||||
role.Event:AddEvent(BattleEventName.SkillCastEnd,onSkillCastEnd,nil,nil,role)
|
||||
end,
|
||||
--回合开始前给自身增加[a][b]%的御甲,每场战斗触发[c]次
|
||||
--a[int 属性id], b[flaot], c[int]
|
||||
[354]=function(role,args,id,judge)
|
||||
local pro = args[1]
|
||||
local v1 = args[2]
|
||||
local num = args[3]
|
||||
local time=0
|
||||
local onRoundStart= function(round)
|
||||
if time>=num then
|
||||
return
|
||||
end
|
||||
local val = floor(BattleUtil.FP_Mul(v1, role:GetRoleData(BattlePropList[pro])))
|
||||
--如果身上有御甲就添加御甲的值
|
||||
if role.bloodShield then
|
||||
role.bloodShield:AddValue(val)
|
||||
else--没有就上御甲buff
|
||||
role:AddBuff(Buff.Create(role, BuffName.Blood,0, val))
|
||||
end
|
||||
time=time+1
|
||||
end
|
||||
BattleLogic.Event:AddEvent(BattleEventName.BattleRoundStart,onRoundStart,nil,nil,role)
|
||||
end,
|
||||
|
||||
--[a]数回合，自身释放技能，己方全体神将 [b]属性[c]改变[d]%,持续[e]回合(e：0为永久)
|
||||
--a[int 1:奇数 0：偶数 ] b[int 属性id], c[int 改变类型], d[float],e[int]
|
||||
[355]=function(role,args,id,judge)
|
||||
local type = args[1]
|
||||
local pro = args[2]
|
||||
local ct = args[3]
|
||||
local v1 = args[4]
|
||||
local round = args[5]
|
||||
|
||||
local onSkillCast = function(skill)
|
||||
if not skill then
|
||||
return
|
||||
end
|
||||
local r=BattleLogic.GetCurRound()
|
||||
if r%2~=type then
|
||||
return
|
||||
end
|
||||
if skill and not skill.isTriggerJudge and judge==1 then
|
||||
return
|
||||
end
|
||||
if skill.type==BattleSkillType.Special
|
||||
or skill.type==BattleSkillType.Extra
|
||||
or skill.type==BattleSkillType.DeadSkill then
|
||||
local list = RoleManager.Query(function(v) return role.camp == v.camp end)
|
||||
for _, r in pairs(list) do
|
||||
r:AddBuff(Buff.Create(role, BuffName.PropertyChange, round, BattlePropList[pro],v1, ct))
|
||||
end
|
||||
end
|
||||
end
|
||||
role.Event:AddEvent(BattleEventName.SkillCastBefore,onSkillCast,nil,nil,role)
|
||||
end,
|
||||
|
||||
}
|
||||
return passivityList
|
||||
|
|
@ -6,10 +6,20 @@ local propertyConfig = ConfigManager.GetConfig(ConfigName.PropertyConfig)
|
|||
local equipStarsConfig = ConfigManager.GetConfig(ConfigName.EquipStarsConfig)
|
||||
local rewardGroupConfig=ConfigManager.GetConfig(ConfigName.RewardGroup)
|
||||
|
||||
--已装备的
|
||||
this.equipDatas = {}
|
||||
|
||||
function this.Initialize()
|
||||
this.equipDatas = {}
|
||||
this.HaveEquipDatas = {}
|
||||
end
|
||||
|
||||
function this.InitHaveEquipDatas(equipList)
|
||||
for k,v in ipairs(equipList) do
|
||||
this.HaveEquipDatas[v.equipId] = v.num
|
||||
end
|
||||
TianShuMiJuanManger.CheckFetterStatus(4)
|
||||
end
|
||||
|
||||
function this.GetHaveEquipDatas()
|
||||
return this.HaveEquipDatas
|
||||
end
|
||||
|
||||
--upHeroDid
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ Func_Prop_Type = {
|
|||
TechTree = 10, -- 神树
|
||||
FourQua = 11, -- 四象心法
|
||||
LikeAbility = 12, -- 好感度
|
||||
EquipFetter = 13, -- 白金装备羁绊
|
||||
}
|
||||
|
||||
-- 计算需要缓存数据的方法
|
||||
|
|
@ -84,6 +85,11 @@ Func_Prop_Func = {
|
|||
local SingleProVal, AllHeroProVal = LikabilityManager.GetTotalForce()
|
||||
return AllHeroProVal
|
||||
end,
|
||||
-- 魂印羁绊属性加成
|
||||
[Func_Prop_Type.EquipFetter] = function()
|
||||
local allPro = TianShuMiJuanManger.GetAllFetterAddProsBy(4)
|
||||
return allPro
|
||||
end,
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -145,4 +151,8 @@ Func_Prop_Filter = {
|
|||
[Func_Prop_Type.LikeAbility] = function(funcData, heroData)
|
||||
return funcData
|
||||
end,
|
||||
-- 魂印羁绊属性加成
|
||||
[Func_Prop_Type.EquipFetter] = function(funcData, heroData)
|
||||
return funcData
|
||||
end,
|
||||
}
|
||||
|
|
@ -146,6 +146,14 @@ function this.RegisterMessage(network)
|
|||
socket:RegistNetMessage(MessageTypeProto_pb.IsCrossIndication, this.IsCrossIndication)
|
||||
--七界试炼推送
|
||||
socket:RegistNetMessage(MessageTypeProto_pb.SevenWorldInfoIndication, this.SevenWorldInfoIndication)
|
||||
socket:RegistNetMessage(MessageTypeProto_pb.EQUIP_BOOK_INDICATION, this.EquipBookInfoIndication)
|
||||
end
|
||||
|
||||
function this.EquipBookInfoIndication(buff)
|
||||
local data = buff:DataByte()
|
||||
local msg = HeroInfoProto_pb.EquipBookIndication()
|
||||
msg:ParseFromString(data)
|
||||
EquipManager.InitHaveEquipDatas(msg.changeEquipList)
|
||||
end
|
||||
|
||||
--后端推送激活的称号
|
||||
|
|
|
|||
|
|
@ -261,6 +261,9 @@ function this.AllBookEnableResponse(func)
|
|||
end
|
||||
SoulPrintManager.UpdateAllHavedSoulPrint(msg.equipGot)
|
||||
end
|
||||
if msg.equipList then
|
||||
EquipManager.InitHaveEquipDatas(msg.equipList)
|
||||
end
|
||||
TianShuMiJuanManger.OnLevelChange()
|
||||
if func then
|
||||
func(msg)
|
||||
|
|
@ -269,6 +272,7 @@ function this.AllBookEnableResponse(func)
|
|||
HeroPropManager.SetFuncPropDirty(Func_Prop_Type.PokemonFetter)
|
||||
HeroPropManager.SetFuncPropDirty(Func_Prop_Type.HeroFetter)
|
||||
HeroPropManager.SetFuncPropDirty(Func_Prop_Type.HunYinFetter)
|
||||
HeroPropManager.SetFuncPropDirty(Func_Prop_Type.EquipFetter)
|
||||
end)
|
||||
end
|
||||
|
||||
|
|
@ -4770,6 +4774,7 @@ function this.PokemonBookEnableRequest(id,func)
|
|||
HeroPropManager.SetFuncPropDirty(Func_Prop_Type.PokemonFetter)
|
||||
HeroPropManager.SetFuncPropDirty(Func_Prop_Type.HeroFetter)
|
||||
HeroPropManager.SetFuncPropDirty(Func_Prop_Type.HunYinFetter)
|
||||
HeroPropManager.SetFuncPropDirty(Func_Prop_Type.EquipFetter)
|
||||
if func then
|
||||
func(msg)
|
||||
end
|
||||
|
|
|
|||
|
|
@ -283,6 +283,7 @@ function this.InitRedPointAllRelate()
|
|||
RPData:SetParent(RedPointType.Hero_Fetter,RedPointType.TianShuMiJuan)
|
||||
RPData:SetParent(RedPointType.SoulPrint_Fetter,RedPointType.TianShuMiJuan)
|
||||
RPData:SetParent(RedPointType.TianShuPokemon_Fetter,RedPointType.TianShuMiJuan)
|
||||
RPData:SetParent(RedPointType.Equip_Fetter,RedPointType.TianShuMiJuan)
|
||||
|
||||
--牛气冲天
|
||||
RPData:SetParent(RedPointType.NiuQiChongTian_1,RedPointType.NiuQiChongTian)
|
||||
|
|
@ -510,10 +511,10 @@ function this.RegisterRedCheckFunc()
|
|||
RPData:AddCheckFunc(RedPointType.Pokemon_Recruit,PokemonManager.RefreshPokemonRecruitRedPoint)
|
||||
RPData:AddCheckFunc(RedPointType.Pokemon_ChipCompound,PokemonManager.PokemonChipCompoundRedPoint)
|
||||
|
||||
RPData:AddCheckFunc(RedPointType.Pokemon_Fetter,PokemonManager.RefreshPokemonFetterRedPoint)
|
||||
RPData:AddCheckFunc(RedPointType.Hero_Fetter,TianShuMiJuanManger.CheckRedPointType)
|
||||
RPData:AddCheckFunc(RedPointType.SoulPrint_Fetter,TianShuMiJuanManger.CheckRedPointType)
|
||||
RPData:AddCheckFunc(RedPointType.TianShuPokemon_Fetter,TianShuMiJuanManger.CheckRedPointType)
|
||||
RPData:AddCheckFunc(RedPointType.Equip_Fetter,TianShuMiJuanManger.CheckRedPointType)
|
||||
|
||||
--跨服天梯
|
||||
RPData:AddCheckFunc(RedPointType.JumpServer_HightLadder_HaveMianFeiPanel,JumpServerManager.JumpServerHightLadderMianFeiNumRedPoint)
|
||||
|
|
|
|||
|
|
@ -16,6 +16,8 @@ local curUserRideId
|
|||
--初始化组件（用于子类重写）
|
||||
function SettingPlayerRide:InitComponent(gameObject)
|
||||
this.spLoader = SpriteLoader.New()
|
||||
this.smallShow = Util.GetGameObject(gameObject, "Image")
|
||||
this.jingqingqidai = Util.GetGameObject(gameObject, "notOpen")
|
||||
this.live2dRootParent = Util.GetGameObject(gameObject, "live2dRootParent")
|
||||
this.live2dRootParent2 = Util.GetGameObject(gameObject, "live2dRootParent2")
|
||||
this.name = Util.GetGameObject(gameObject, "name/Text"):GetComponent("Text")
|
||||
|
|
@ -51,11 +53,31 @@ function SettingPlayerRide:InitComponent(gameObject)
|
|||
this.scrollViewPro.gameObject:GetComponent("RectTransform").pivot = Vector2.New(0.5, 0.5)
|
||||
this.scrollViewPro.moveTween.MomentumAmount = 1
|
||||
this.scrollViewPro.moveTween.Strength = 2
|
||||
|
||||
this.skillPre = Util.GetGameObject(gameObject, "skinProInfo/skillPre")
|
||||
this.skillImage = Util.GetGameObject(gameObject, "skinProInfo/skillImage")
|
||||
this.skillGrid = Util.GetGameObject(gameObject, "skinProInfo/skillGrid")
|
||||
this.skillList = {}
|
||||
|
||||
this.skillDes = Util.GetGameObject(gameObject, "PokemonSkillInfoPopup")
|
||||
this.skillDesClose = Util.GetGameObject(this.skillDes, "Button")
|
||||
this.skillDesIcon = Util.GetGameObject(this.skillDes, "Content/IconBG/Icon"):GetComponent("Image")
|
||||
this.skillDesTitle = Util.GetGameObject(this.skillDes, "Content/Title")
|
||||
this.skillDesTitleText = Util.GetGameObject(this.skillDesTitle,"Text"):GetComponent("Text")
|
||||
this.skillDesText = Util.GetGameObject(this.skillDes, "Content/curinfo"):GetComponent("Text")
|
||||
end
|
||||
|
||||
--绑定事件（用于子类重写）
|
||||
function SettingPlayerRide:BindEvent()
|
||||
|
||||
Util.AddClick(this.skillDesClose,function()
|
||||
this.skillDes.gameObject:SetActive(false)
|
||||
end)
|
||||
end
|
||||
|
||||
function this.SetSkillDes(data)
|
||||
this.skillDesIcon.sprite = this.spLoader:LoadSprite(data.icon)
|
||||
this.skillDesTitleText.text = data.title
|
||||
this.skillDesText.text = data.des
|
||||
end
|
||||
|
||||
--添加事件监听（用于子类重写）
|
||||
|
|
@ -80,6 +102,7 @@ end
|
|||
function this.ShowPanelData()
|
||||
|
||||
local rideList = ConfigManager.GetAllConfigsDataByKey(ConfigName.PlayerHeadIcon,"Type",PlayerHeadIconType.Ride)
|
||||
LogGreen("rideList:"..#rideList)
|
||||
--设置滚动区信息
|
||||
curUserRideId = PlayerManager.GetPlayerRide()
|
||||
curUserRideConFig = rideList[1]
|
||||
|
|
@ -161,18 +184,69 @@ function this.SingleRideClickShowInfo(data,go)
|
|||
if live2dRoot2 then
|
||||
live2dRoot2:OnClose()
|
||||
end
|
||||
local curPlayerLiveViewData = {
|
||||
skin = PlayerManager.GetPlayerSkin(),
|
||||
sex = NameManager.roleSex,
|
||||
ride = curPlayerHeadIconConfig.Id,
|
||||
}
|
||||
live2dRoot = PlayerLiveView:New(this.live2dRootParent,2, curPlayerLiveViewData)
|
||||
live2dRoot:OnOpen(GetPlayerRoleSingleConFig().Scale7,nil,WALK_DIR.IDLE_LEFT)
|
||||
local ridePlayerLiveViewData = {
|
||||
if curPlayerHeadIconConfig.Hide == 0 then
|
||||
this.jingqingqidai.gameObject:SetActive(false)
|
||||
this.smallShow.gameObject:SetActive(true)
|
||||
this.live2dRootParent2.gameObject:SetActive(true)
|
||||
this.live2dRootParent.gameObject:SetActive(true)
|
||||
local curPlayerLiveViewData = {
|
||||
skin = PlayerManager.GetPlayerSkin(),
|
||||
sex = NameManager.roleSex,
|
||||
ride = curPlayerHeadIconConfig.Id,
|
||||
}
|
||||
live2dRoot2 = PlayerLiveView:New(this.live2dRootParent2,2, ridePlayerLiveViewData)
|
||||
live2dRoot2:OnOpen(GetPlayerRoleSingleConFig().Scale8,nil,WALK_DIR.IDLE_LEFT)
|
||||
live2dRoot = PlayerLiveView:New(this.live2dRootParent,2, curPlayerLiveViewData)
|
||||
live2dRoot:OnOpen(GetPlayerRoleSingleConFig().Scale7,nil,WALK_DIR.IDLE_LEFT)
|
||||
local ridePlayerLiveViewData = {
|
||||
ride = curPlayerHeadIconConfig.Id,
|
||||
}
|
||||
live2dRoot2 = PlayerLiveView:New(this.live2dRootParent2,2, ridePlayerLiveViewData)
|
||||
live2dRoot2:OnOpen(GetPlayerRoleSingleConFig().Scale8,nil,WALK_DIR.IDLE_LEFT)
|
||||
else
|
||||
this.jingqingqidai.gameObject:SetActive(true)
|
||||
this.smallShow.gameObject:SetActive(false)
|
||||
this.live2dRootParent2.gameObject:SetActive(false)
|
||||
this.live2dRootParent.gameObject:SetActive(false)
|
||||
end
|
||||
|
||||
if not this.skillList then
|
||||
this.skillList = {}
|
||||
end
|
||||
for k,v in ipairs(this.skillList) do
|
||||
v.go.gameObject:SetActive(false)
|
||||
end
|
||||
if curPlayerHeadIconConfig.Icon then
|
||||
this.skillGrid.gameObject:SetActive(true)
|
||||
this.skillImage.gameObject:SetActive(true)
|
||||
for i = 1,math.max(#this.skillList,#curPlayerHeadIconConfig.Icon) do
|
||||
if not curPlayerHeadIconConfig.Icon[i] then
|
||||
this.skillList[i].go.gameObject:SetActive(false)
|
||||
else
|
||||
if not this.skillList[i] then
|
||||
this.skillList[i] = {}
|
||||
this.skillList[i].go = newObjToParent(this.skillPre,this.skillGrid)
|
||||
this.skillList[i].btn = Util.GetGameObject(this.skillList[i].go, "icon")
|
||||
this.skillList[i].icon = this.skillList[i].btn:GetComponent("Image")
|
||||
this.skillList[i].index = i
|
||||
end
|
||||
this.skillList[i].go.gameObject:SetActive(true)
|
||||
this.skillList[i].icon.sprite = this.spLoader:LoadSprite(GetResourcePath(curPlayerHeadIconConfig.Icon[i]))
|
||||
Util.AddOnceClick(this.skillList[i].btn,function()
|
||||
this.skillDes.gameObject:SetActive(true)
|
||||
local data = {}
|
||||
data.icon = GetResourcePath(curPlayerHeadIconConfig.Icon[i])
|
||||
local strs = string.split(curPlayerHeadIconConfig.SkillEffect,"|")
|
||||
local strDes = string.split(strs[i],"#")
|
||||
data.title = strDes[1]
|
||||
data.des = strDes[2]
|
||||
this.SetSkillDes(data)
|
||||
end)
|
||||
end
|
||||
end
|
||||
else
|
||||
this.skillGrid.gameObject:SetActive(false)
|
||||
this.skillImage.gameObject:SetActive(false)
|
||||
end
|
||||
|
||||
|
||||
Util.AddOnceClick(this.goToBtn, function()
|
||||
if not isGet and not isUser then
|
||||
|
|
@ -208,7 +282,7 @@ end
|
|||
--界面销毁时调用（用于子类重写）
|
||||
function SettingPlayerRide:OnDestroy()
|
||||
this.spLoader:Destroy()
|
||||
|
||||
this.skillList = {}
|
||||
end
|
||||
|
||||
return SettingPlayerRide
|
||||
|
|
@ -92,7 +92,7 @@ function this.GetAllData()
|
|||
for i = 1, #allCurSoulPrintData do
|
||||
local curSpiritAnimalBook
|
||||
for _, configInfo in ConfigPairs(ConfigManager.GetConfig(ConfigName.SpiritAnimalBook)) do
|
||||
if configInfo.FetterType == 2 and configInfo.Teamers and configInfo.Teamers[1] and configInfo.Teamers[1] == allCurSoulPrintData[i].Id then
|
||||
if configInfo.FetterType == 2 and configInfo.Teamers and configInfo.Teamers[1] and configInfo.Teamers[1][1] == allCurSoulPrintData[i].Id then
|
||||
curSpiritAnimalBook = configInfo
|
||||
break
|
||||
end
|
||||
|
|
|
|||
|
|
@ -19,6 +19,10 @@ local tabs = {
|
|||
default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",tabName = Language[12276],
|
||||
rpType = RedPointType.TianShuPokemon_Fetter,funcType = FUNCTION_OPEN_TYPE.POKEMON,bg = "t_tianshumijuan_lingshouditu",zi = "t_tianshumijuan_lingshoupian_zi_zh",
|
||||
},
|
||||
[4] = { --装备
|
||||
default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",tabName = "装备篇",
|
||||
rpType = RedPointType.Equip_Fetter,funcType = FUNCTION_OPEN_TYPE.COMPOUND,bg = "t_tianshumijuan_shengjiangditu",zi = "t_tianshumijuan_zhuangbeipian_zi_zh",
|
||||
},
|
||||
}
|
||||
local status = {
|
||||
[0] = Language[10175],
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@ function this.OnLevelChange()
|
|||
this.CheckFetterStatus(1)
|
||||
this.CheckFetterStatus(2)
|
||||
this.CheckFetterStatus(3)
|
||||
this.CheckFetterStatus(4)
|
||||
end
|
||||
|
||||
function this.CheckRedPointType(redType)
|
||||
|
|
@ -32,6 +33,8 @@ function this.CheckRedPointType(redType)
|
|||
return this.CheckRedPoint(2)
|
||||
elseif redType == RedPointType.TianShuPokemon_Fetter then
|
||||
return this.CheckRedPoint(3)
|
||||
elseif redType == RedPointType.Equip_Fetter then
|
||||
return this.CheckRedPoint(4)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -66,6 +69,7 @@ function this.UpdateFetterId(ids)
|
|||
this.CheckFetterStatus(1)
|
||||
this.CheckFetterStatus(2)
|
||||
this.CheckFetterStatus(3)
|
||||
this.CheckFetterStatus(4)
|
||||
end
|
||||
|
||||
--检测条件变化，判断羁绊是否可激活
|
||||
|
|
@ -83,6 +87,10 @@ function this.CheckFetterStatus(fetterType)
|
|||
this.GetAllPokemonFetterDatas(fetterType,curPokemonSidList)
|
||||
CheckRedPointStatus(RedPointType.Pokemon_Fetter)
|
||||
CheckRedPointStatus(RedPointType.TianShuPokemon_Fetter)
|
||||
elseif fetterType == 4 then
|
||||
local curPokemonSidList = EquipManager.GetHaveEquipDatas()
|
||||
this.GetAllPokemonFetterDatas(fetterType,curPokemonSidList)
|
||||
CheckRedPointStatus(RedPointType.Equip_Fetter)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -91,7 +99,7 @@ function this.GetAllPokemonFetterDatas(fetterType,curPokemonSidList)
|
|||
local SpiritAnimalBookList = {}
|
||||
for k,v in pairs(this.fetterData) do
|
||||
if v.fetterType == fetterType and v.enabled == -1 then
|
||||
if this.IsCompound(v.teamers,curPokemonSidList) then
|
||||
if this.IsCompound(v.teamers,curPokemonSidList,v.fetterType) then
|
||||
v.enabled = 0
|
||||
end
|
||||
end
|
||||
|
|
@ -107,10 +115,15 @@ function this.CheckRedPoint(fetterType)
|
|||
return false
|
||||
end
|
||||
|
||||
function this.IsCompound(Teamers,curPokemonSidList)
|
||||
function this.IsCompound(Teamers,curPokemonSidList,fetterType)
|
||||
local isCompound = true
|
||||
for k,v in ipairs(Teamers) do
|
||||
if curPokemonSidList[v] == nil then
|
||||
if curPokemonSidList[v[1]] == nil then
|
||||
if isCompound then
|
||||
isCompound = false
|
||||
break
|
||||
end
|
||||
elseif fetterType and fetterType == 4 and curPokemonSidList[v[1]] < v[2] then
|
||||
if isCompound then
|
||||
isCompound = false
|
||||
break
|
||||
|
|
@ -171,7 +184,7 @@ function this.GetAllPokemonFetterAddProsSWarPower(fetterType)
|
|||
return addPowerVal
|
||||
end
|
||||
|
||||
function this.IsHaveItem(fetterType,id)
|
||||
function this.IsHaveItem(fetterType,id,num)
|
||||
local data = {}
|
||||
if fetterType == 1 then
|
||||
data = PlayerManager.heroHandBook
|
||||
|
|
@ -179,11 +192,18 @@ function this.IsHaveItem(fetterType,id)
|
|||
data = SoulPrintManager.GetAllHavedSoulPrint()
|
||||
elseif fetterType == 3 then
|
||||
data = PokemonManager.GetAllPokemonGetDatas()
|
||||
elseif fetterType == 4 then
|
||||
data = EquipManager.GetHaveEquipDatas()
|
||||
end
|
||||
if data[id] then
|
||||
if fetterType == 4 then
|
||||
if data[id] and data[id] >= num then
|
||||
return true
|
||||
else
|
||||
return false
|
||||
end
|
||||
elseif data[id] then
|
||||
return true
|
||||
else
|
||||
return false
|
||||
end
|
||||
return false
|
||||
end
|
||||
return this
|
||||
|
|
@ -82,8 +82,10 @@ function FetterItem:SetData(data,_parent)
|
|||
end
|
||||
Util.SetGray(self.itemList[i].gameObject,false)
|
||||
self.itemList[i].gameObject:SetActive(true)
|
||||
self.itemList[i]:OnOpen(false,{self.itemData.teamers[i],0},1,true,false,false,self.sortingOrder)
|
||||
if TianShuMiJuanManger.IsHaveItem(self.itemData.fetterType,self.itemData.teamers[i]) then
|
||||
self.itemList[i]:OnOpen(false,{self.itemData.teamers[i][1],self.itemData.teamers[i][2]},1,true,false,false,self.sortingOrder)
|
||||
self.itemList[i].num.gameObject:SetActive(true)
|
||||
self.itemList[i].name:GetComponent("Text").text = string.gsub(self.itemList[i].name:GetComponent("Text").text,"魂印","")
|
||||
if TianShuMiJuanManger.IsHaveItem(self.itemData.fetterType,self.itemData.teamers[i][1],self.itemData.teamers[i][2]) then
|
||||
Util.SetGray(self.itemList[i].gameObject,false)
|
||||
else
|
||||
Util.SetGray(self.itemList[i].gameObject,true)
|
||||
|
|
|
|||
Loading…
Reference in New Issue