图鉴提交

PC-202302260912\Administrator 2024-04-17 10:11:12 +08:00
parent b06b7ee762
commit e630a11d81
22 changed files with 510 additions and 61 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: 4c3140f4c33a6244ead368c95db5da2b
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 2
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 57
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 8e01b6754e8f2f14089e65f731edb26f
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: f47f14f660f8bbb488b7782ee34b9011
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 2
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 57
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5c62dc618e9b1b8419d6e517576df51a
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -193,7 +193,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -463}
m_AnchoredPosition: {x: 0, y: -428}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1643554093586653940
@ -273,7 +273,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0.00024414062, y: -400}
m_AnchoredPosition: {x: 0.00024414062, y: -365}
m_SizeDelta: {x: 440, y: 138.6}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2462079492557140839
@ -347,7 +347,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -7.000244, y: -520.06006}
m_AnchoredPosition: {x: -7.000244, y: -485.06006}
m_SizeDelta: {x: 169, y: 91}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &700845277403535816
@ -499,7 +499,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0.00024414062, y: -200}
m_AnchoredPosition: {x: 0.00024414062, y: -165}
m_SizeDelta: {x: 440, y: 215.3}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &5426221414338835558
@ -558,10 +558,10 @@ RectTransform:
m_Father: {fileID: 572757096634856646}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 53}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 79, y: -28}
m_SizeDelta: {x: 152, y: 53}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &812751562271846823
CanvasRenderer:
@ -657,7 +657,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 175.50049, y: -424.75998}
m_AnchoredPosition: {x: 175.50049, y: -389.75998}
m_SizeDelta: {x: 176.4, y: 57.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &4712899983027829934
@ -873,7 +873,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -6.8603516, y: -523.06006}
m_AnchoredPosition: {x: -6.8603516, y: -488.06006}
m_SizeDelta: {x: 329.14, y: 94.32}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2497980411967337749
@ -1071,7 +1071,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &572757096634856646
RectTransform:
m_ObjectHideFlags: 0
@ -1090,7 +1090,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 256}
m_SizeDelta: {x: 0, y: 56}
m_SizeDelta: {x: 158, y: 56}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &858073496513592450
CanvasRenderer:

View File

@ -63,6 +63,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 28
@ -112,8 +114,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 2.4, y: -1.29}
m_SizeDelta: {x: 147.04, y: 84.2}
m_AnchoredPosition: {x: 2.4, y: 2.612502}
m_SizeDelta: {x: 147, y: 61.375}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &592479173826892207
CanvasRenderer:
@ -136,25 +138,27 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.9490197, g: 0.91372555, b: 0.79215693, a: 1}
m_Color: {r: 0.6792453, g: 0.40967014, b: 0.14417945, a: 0.88235295}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 51
m_FontSize: 28
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 20
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 51
m_Alignment: 4
m_AlignByGeometry: 0
m_AlignByGeometry: 1
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text:
m_Text: "\u53D7\u5230\u5E7F\u6CDB\u7684"
--- !u!1 &1373740748917850188
GameObject:
m_ObjectHideFlags: 0
@ -243,6 +247,8 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!114 &4400287981268164915
MonoBehaviour:
m_ObjectHideFlags: 0
@ -261,6 +267,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: c90cb343197e94445948755e1cb75de6, type: 3}
m_Type: 0
m_PreserveAspect: 0
@ -334,6 +342,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 88785b6606f773e43bfb8d365c2689ab, type: 3}
m_Type: 0
m_PreserveAspect: 0
@ -397,7 +407,7 @@ MonoBehaviour:
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 4
m_Spacing: -0.9
m_Spacing: 0
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
@ -465,6 +475,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: ad0ee1969b6e4de4e9593455a27ffcfc, type: 3}
m_Type: 0
m_PreserveAspect: 0
@ -538,6 +550,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: e1eb5a78b93294840889587d72740102, type: 3}
m_Type: 0
m_PreserveAspect: 0
@ -611,6 +625,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 36
@ -674,8 +690,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 2.44, y: -1.82}
m_SizeDelta: {x: 184, y: 126.35}
m_AnchoredPosition: {x: 0.57499, y: 2.14}
m_SizeDelta: {x: 104.85, y: 60.43}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8644410507718093528
CanvasRenderer:
@ -703,6 +719,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: dcab34f84847d94448b245ab7e62e44e, type: 3}
m_Type: 1
m_PreserveAspect: 0
@ -775,6 +793,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 0e97e3866623faa4fa4a58ebb054267c, type: 3}
m_Type: 1
m_PreserveAspect: 0
@ -891,6 +911,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 484c8db56b6edb445ae7ffe09daba96e, type: 3}
m_Type: 0
m_PreserveAspect: 0
@ -965,6 +987,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 72
@ -1267,6 +1291,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 2887ec8dbdcb57242a540f77f7cb5a72, type: 3}
m_Type: 0
m_PreserveAspect: 0
@ -1316,6 +1342,8 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!95 &1645882415491024726
Animator:
serializedVersion: 3
@ -1374,8 +1402,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 1332, y: -52.235}
m_SizeDelta: {x: 159.29, y: 104.07}
m_AnchoredPosition: {x: 606.3, y: -605}
m_SizeDelta: {x: 103.7, y: 64.7}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4770590556367807517
CanvasRenderer:
@ -1425,6 +1453,8 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!114 &712352259616840284
MonoBehaviour:
m_ObjectHideFlags: 0
@ -1443,6 +1473,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
--- !u!1 &8074562993270738609
GameObject:
m_ObjectHideFlags: 0
@ -1477,8 +1509,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 64.64497, y: 37.034996}
m_SizeDelta: {x: 30, y: 30}
m_AnchoredPosition: {x: 38.3, y: 20.8}
m_SizeDelta: {x: 25, y: 25}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1536775684161593866
CanvasRenderer:
@ -1506,6 +1538,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: f9ea4c4aff328ff4abcc21aae0a4fa10, type: 3}
m_Type: 0
m_PreserveAspect: 0
@ -1533,7 +1567,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &8396209728857207438
RectTransform:
m_ObjectHideFlags: 0
@ -1553,8 +1587,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 50.100098}
m_SizeDelta: {x: 806.3, y: 100.2}
m_AnchoredPosition: {x: 37.6, y: 50.100098}
m_SizeDelta: {x: 899.3, y: 100.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &3105191926613661990
MonoBehaviour:
@ -1586,6 +1620,8 @@ MonoBehaviour:
m_OnValueChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!222 &4755473649158108574
CanvasRenderer:
m_ObjectHideFlags: 0
@ -1669,6 +1705,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 8a8494211a35a9e4090dad21d8fd8bbf, type: 3}
m_Type: 0
m_PreserveAspect: 0
@ -1741,6 +1779,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 8f797b996c03faa4abffb3134701a8bc, type: 3}
m_Type: 0
m_PreserveAspect: 0

View File

@ -1005,6 +1005,9 @@ RedPointType = {
TianShuPokemon_Fetter = 800,--灵兽羁绊
Equip_Fetter = 805, --装备羁绊
Weapon_Fetter = 806, --神兵羁绊
Treasure_Fetter =807,--法宝羁绊
FaXiang_Fetter = 808, --法相羁绊
HuaShen_Fetter = 809, --身外化身羁绊
--跨服天梯
JumpServer_MainCity = 820,--主界面跨服天梯
@ -1543,6 +1546,7 @@ ActivityTypeDef = {
godsWayTowerTreasure_two=115, --多队塔二队秘宝
godsWayTowerTreasure_three=116,--多队塔三队秘宝
wishHero=117, --英雄心愿抽卡
ExclusiveWeapon =125, --专属武器
}
--活动结束需要处理面板关闭类型
ActivityTypePanel = {

View File

@ -406,6 +406,10 @@ ASSISTUPDOWNREQUEST = protobuf.Descriptor();
ASSISTUPDOWNREQUEST_ID_FIELD = protobuf.FieldDescriptor();
ASSISTUPDOWNREQUEST_HEROID_FIELD = protobuf.FieldDescriptor();
ASSISTUPDOWNREQUEST_OPERATE_FIELD = protobuf.FieldDescriptor();
QUERYBOOKIMAGEREQUEST = protobuf.Descriptor();
QUERYBOOKIMAGEREQUEST_TYPE_FIELD = protobuf.FieldDescriptor();
QUERYBOOKIMAGERESPONSE = protobuf.Descriptor();
QUERYBOOKIMAGERESPONSE_BOOKIMGIDS_FIELD = protobuf.FieldDescriptor();
GETHEROLISTINFOREQUEST_INDEX_FIELD.name = "index"
GETHEROLISTINFOREQUEST_INDEX_FIELD.full_name = ".rpc.protocols.GetHeroListInfoRequest.index"
@ -4064,6 +4068,40 @@ ASSISTUPDOWNREQUEST.enum_types = {}
ASSISTUPDOWNREQUEST.fields = {ASSISTUPDOWNREQUEST_ID_FIELD, ASSISTUPDOWNREQUEST_HEROID_FIELD, ASSISTUPDOWNREQUEST_OPERATE_FIELD}
ASSISTUPDOWNREQUEST.is_extendable = false
ASSISTUPDOWNREQUEST.extensions = {}
QUERYBOOKIMAGEREQUEST_TYPE_FIELD.name = "type"
QUERYBOOKIMAGEREQUEST_TYPE_FIELD.full_name = ".rpc.protocols.QueryBookImageRequest.type"
QUERYBOOKIMAGEREQUEST_TYPE_FIELD.number = 1
QUERYBOOKIMAGEREQUEST_TYPE_FIELD.index = 0
QUERYBOOKIMAGEREQUEST_TYPE_FIELD.label = 1
QUERYBOOKIMAGEREQUEST_TYPE_FIELD.has_default_value = false
QUERYBOOKIMAGEREQUEST_TYPE_FIELD.default_value = 0
QUERYBOOKIMAGEREQUEST_TYPE_FIELD.type = 5
QUERYBOOKIMAGEREQUEST_TYPE_FIELD.cpp_type = 1
QUERYBOOKIMAGEREQUEST.name = "QueryBookImageRequest"
QUERYBOOKIMAGEREQUEST.full_name = ".rpc.protocols.QueryBookImageRequest"
QUERYBOOKIMAGEREQUEST.nested_types = {}
QUERYBOOKIMAGEREQUEST.enum_types = {}
QUERYBOOKIMAGEREQUEST.fields = {QUERYBOOKIMAGEREQUEST_TYPE_FIELD}
QUERYBOOKIMAGEREQUEST.is_extendable = false
QUERYBOOKIMAGEREQUEST.extensions = {}
QUERYBOOKIMAGERESPONSE_BOOKIMGIDS_FIELD.name = "bookImgIds"
QUERYBOOKIMAGERESPONSE_BOOKIMGIDS_FIELD.full_name = ".rpc.protocols.QueryBookImageResponse.bookImgIds"
QUERYBOOKIMAGERESPONSE_BOOKIMGIDS_FIELD.number = 1
QUERYBOOKIMAGERESPONSE_BOOKIMGIDS_FIELD.index = 0
QUERYBOOKIMAGERESPONSE_BOOKIMGIDS_FIELD.label = 3
QUERYBOOKIMAGERESPONSE_BOOKIMGIDS_FIELD.has_default_value = false
QUERYBOOKIMAGERESPONSE_BOOKIMGIDS_FIELD.default_value = {}
QUERYBOOKIMAGERESPONSE_BOOKIMGIDS_FIELD.type = 5
QUERYBOOKIMAGERESPONSE_BOOKIMGIDS_FIELD.cpp_type = 1
QUERYBOOKIMAGERESPONSE.name = "QueryBookImageResponse"
QUERYBOOKIMAGERESPONSE.full_name = ".rpc.protocols.QueryBookImageResponse"
QUERYBOOKIMAGERESPONSE.nested_types = {}
QUERYBOOKIMAGERESPONSE.enum_types = {}
QUERYBOOKIMAGERESPONSE.fields = {QUERYBOOKIMAGERESPONSE_BOOKIMGIDS_FIELD}
QUERYBOOKIMAGERESPONSE.is_extendable = false
QUERYBOOKIMAGERESPONSE.extensions = {}
AllBookEnableRequest = protobuf.Message(ALLBOOKENABLEREQUEST)
AssistInfoRequest = protobuf.Message(ASSISTINFOREQUEST)
@ -4159,6 +4197,8 @@ PotentialUpLvRequest = protobuf.Message(POTENTIALUPLVREQUEST)
PotentialUpLvResponse = protobuf.Message(POTENTIALUPLVRESPONSE)
PracticeSkillUpRequest = protobuf.Message(PRACTICESKILLUPREQUEST)
PurpleMansionSealIndication = protobuf.Message(PURPLEMANSIONSEALINDICATION)
QueryBookImageRequest = protobuf.Message(QUERYBOOKIMAGEREQUEST)
QueryBookImageResponse = protobuf.Message(QUERYBOOKIMAGERESPONSE)
ReplacePrupleMansionSealResponse = protobuf.Message(REPLACEPRUPLEMANSIONSEALRESPONSE)
ReplacePurpleMansionSealRequest = protobuf.Message(REPLACEPURPLEMANSIONSEALREQUEST)
ReplaceTeamPokemonInfoRequest = protobuf.Message(REPLACETEAMPOKEMONINFOREQUEST)

File diff suppressed because one or more lines are too long

View File

@ -154,12 +154,12 @@ function this.InitActivityServerData(msg, isUpdate)
if GlobalActivity[v.activityId] then
this.CheckMoneyProgress(v)
this.mission[v.activityId] = v
--LogYellow("刷新活动数据activityId" .. v.activityId .. " value" .. v.value)
LogYellow("刷新活动数据activityId" .. v.activityId .. " value" .. v.value)
-- if v.endTime and v.endTime > 0 then
-- LogYellow(" 结束日期:"..TimeStampToDateStr4(v.endTime))
-- end
for n, m in ipairs(v.mission) do
--LogGreen(" 刷新活动数据missionId" .. m.missionId .. " state" .. m.state .. " progress" .. m.progress)
LogGreen(" 刷新活动数据missionId" .. m.missionId .. " state" .. m.state .. " progress" .. m.progress)
if (v.activityId == ActivityTypeDef.OnlineGift) then
this.onlineOpen = true
this.onlineGetRewardState[m.missionId] = m.state

View File

@ -587,7 +587,7 @@ function this.ShowBattleInfo()
end
roleLiveGO.transform:SetParent(this.heroList[i].pos.transform)
roleLiveGO.transform.localPosition = Vector2.New(0, 0)
roleLiveGO.transform.localScale=Vector3.one * roleConfig[sId].enemy_liveScale*0.2 -- * 0.75--* 1.5
roleLiveGO.transform.localScale=Vector3.one * roleConfig[sId].enemy_liveScale*0.4 -- * 0.75--* 1.5
if i<=3 then
if heroData.heroConfig.Toward==1 then
SetHEeroLiveToward(roleLiveGO,1)

View File

@ -53,6 +53,7 @@ function this.GetAllEquipDataNoBless()
for k, v in pairs(this.allEquipData) do
if CheckListIsContainValue1(this.allBlessIds,k)==false and (v.belongHero==nil or v.belongHero=="") then
table.insert(list,v)
TianShuMiJuanManger.CheckFetterStatus(6)
end
end
table.sort(list,function(a,b)
@ -235,6 +236,9 @@ end
--
function this.AddEquipToList(_data)
local single=this.initSingleData(_data)
if CheckListIsContainValue1(PlayerManager.handBook[6],single.staticId)==false then
table.insert(PlayerManager.handBook[6],single.staticId)
end
this.allEquipData[single.did]=single
end

View File

@ -140,6 +140,10 @@ end
function this.SetItemDataByid(id,state,pos)
if not this.itemDataList[id] then
this.CreatEmptyItemData(id)
if CheckListIsContainValue1(PlayerManager.handBook[8],id)==false then
table.insert(PlayerManager.handBook[8],id)
TianShuMiJuanManger.CheckFetterStatus(8)
end
end
this.itemDataList[id].state = state
this.itemDataList[id].pos = pos

View File

@ -738,6 +738,9 @@ function this.ExecuteLoading()
--[[[64] =]]function() NetManager.GetSoldiersInfoRequest(LoadingPanel.OnStep) end, --小兵
function() NetManager.BaublesAllInfoRequest(LoadingPanel.OnStep) end, --新法宝
function() NetManager.TrainingArchitectureInfoRequest(LoadingPanel.OnStep) end,
function() NetManager.QueryBookImageRequest(6,LoadingPanel.OnStep) end,
function() NetManager.QueryBookImageRequest(7,LoadingPanel.OnStep) end,
function() NetManager.QueryBookImageRequest(8,LoadingPanel.OnStep) end,
function() -- 登录请求最终接口,所有请求放在此接口之前
-- 登录成功确认
NetManager.LoginConfimRequest()

View File

@ -289,6 +289,9 @@ function this.AllBookEnableResponse(func)
HeroPropManager.SetFuncPropDirty(Func_Prop_Type.HunYinFetter)
HeroPropManager.SetFuncPropDirty(Func_Prop_Type.EquipFetter)
HeroPropManager.SetFuncPropDirty(Func_Prop_Type.WeaponFetter)
-- HeroPropManager.SetFuncPropDirty(Func_Prop_Type.)
-- HeroPropManager.SetFuncPropDirty(Func_Prop_Type.EquipFetter)
-- HeroPropManager.SetFuncPropDirty(Func_Prop_Type.WeaponFetter)
end)
end
@ -8055,4 +8058,25 @@ function NetManager.NewArenaResetRequest(_func)
end)
end
function NetManager.QueryBookImageRequest(_index,func)
local data=HeroInfoProto_pb.QueryBookImageRequest()
data.type= _index
local msg = data:SerializeToString()
Network:SendMessageWithCallBack(MessageTypeProto_pb.QueryBookImageRequest,MessageTypeProto_pb.QueryBookImageResponse,msg,function(buffer)
local data = buffer:DataByte()
local msg = HeroInfoProto_pb.QueryBookImageResponse()
msg:ParseFromString(data)
PlayerManager.handBook[_index]=msg.bookImgIds
-- for i=1,#msg.bookImgIds do
-- LogError("msg.bookImgIds[i]======================"..msg.bookImgIds[i].." type========================".._index)
-- end
TianShuMiJuanManger.CheckFetterStatus(_index)
if func then
func(msg)
end
end)
end
return this

View File

@ -182,6 +182,9 @@ function CommonActPage:RefreshActData(isTop,isAni)
self.scrollView:ForeachItemGO(function(index, go)
go.gameObject:SetActive(false)
end)
if self.ActData==nil then
return
end
self.scrollView:SetData(self.ActData.rewards, function (index, item)
self:ShowSingleData(item, self.ActData.rewards[index],index)
end,not isTop,not isAni)

View File

@ -84,6 +84,9 @@ local TypeUpdateFunc = {
[ActivityTypeDef.RecruitExper] = function ()--征募达人
this.GetExpertData(2,ActivityTypeDef.RecruitExper)
end,
[ActivityTypeDef.ExclusiveWeapon] = function ()--专武活动
this.GetExpertData(1,ActivityTypeDef.ExclusiveWeapon)
end,
[ActivityTypeDef.SecretBoxExper] = function ()--秘宝达人
this.GetExpertData(2,ActivityTypeDef.SecretBoxExper)
end,
@ -729,7 +732,7 @@ function this.GetExpertData(indexType,actType)
end
end
else --日累计充值 达人
if actType == ActivityTypeDef.AccumulativeRechargeExper or actType == ActivityTypeDef.DynamicAct_recharge then
if actType == ActivityTypeDef.AccumulativeRechargeExper or actType == ActivityTypeDef.DynamicAct_recharge or actType == ActivityTypeDef.ExclusiveWeapon then
curData.rewards[i].otherData.Values = actRewardConfigs[j].Values[1][1]
else
curData.rewards[i].otherData.Values = actRewardConfigs[j].Values[2][1]

View File

@ -22,6 +22,7 @@ this.heroHandBook = {}
this.equipHandBook = {}
this.talismanHandBook={}
this.heroHandBookListData={}
this.handBook={}
--移动速度 和 视野范围
this.MapSpeed = 0
this.MapView = 0
@ -47,6 +48,8 @@ this.dailyRedPack = 0
this.startWeek = 0
this.RewardItemSingleShowPopupIsRoleUpStarLayout = false
this.RewardItemSingleShowPopupIsRoleUpStarLayout2 = false

View File

@ -292,7 +292,10 @@ function this.InitRedPointAllRelate()
RPData:SetParent(RedPointType.SoulPrint_Fetter,RedPointType.TianShuMiJuan)
RPData:SetParent(RedPointType.TianShuPokemon_Fetter,RedPointType.TianShuMiJuan)
RPData:SetParent(RedPointType.Equip_Fetter,RedPointType.TianShuMiJuan)
RPData:SetParent(RedPointType.Weapon_Fetter,RedPointType.TianShuMiJuan)
RPData:SetParent(RedPointType.Treasure_Fetter,RedPointType.TianShuMiJuan)
RPData:SetParent(RedPointType.FaXiang_Fetter,RedPointType.TianShuMiJuan)
RPData:SetParent(RedPointType.HuaShen_Fetter,RedPointType.TianShuMiJuan)
--牛气冲天
RPData:SetParent(RedPointType.NiuQiChongTian_1,RedPointType.NiuQiChongTian)
RPData:SetParent(RedPointType.NiuQiChongTian_2,RedPointType.NiuQiChongTian)
@ -589,6 +592,9 @@ function this.RegisterRedCheckFunc()
RPData:AddCheckFunc(RedPointType.TianShuPokemon_Fetter,TianShuMiJuanManger.CheckRedPointType)
RPData:AddCheckFunc(RedPointType.Equip_Fetter,TianShuMiJuanManger.CheckRedPointType)
RPData:AddCheckFunc(RedPointType.Weapon_Fetter,TianShuMiJuanManger.CheckRedPointType)
RPData:AddCheckFunc(RedPointType.Treasure_Fetter,TianShuMiJuanManger.CheckRedPointType)
RPData:AddCheckFunc(RedPointType.FaXiang_Fetter,TianShuMiJuanManger.CheckRedPointType)
RPData:AddCheckFunc(RedPointType.HuaShen_Fetter,TianShuMiJuanManger.CheckRedPointType)
--跨服天梯
RPData:AddCheckFunc(RedPointType.JumpServer_HightLadder_HaveMianFeiPanel,JumpServerManager.JumpServerHightLadderMianFeiNumRedPoint)
RPData:AddCheckFunc(RedPointType.JumpServer_HightLadder_Worship,JumpServerManager.JumpServerHightLadderWorshipRedPoint)

View File

@ -53,7 +53,10 @@ function this.InitSingleTreasureData(_singleData,notAdd)
single.refineConfig = this.GetCurrTreasureLvConfig(2, currJewel.Star, _singleData.rebuildLevel)
allTreasures[_singleData.id] = single
-- end
if CheckListIsContainValue1(PlayerManager.handBook[7],staticId)==false then
table.insert(PlayerManager.handBook[7],staticId)
TianShuMiJuanManger.CheckFetterStatus(7)
end
end
--获取玩家穿戴的宝物

View File

@ -7,25 +7,40 @@ local redPointList = {}
-- Tab管理器
local TabBox = require("Modules/Common/TabBox")
local tabs = {
-- [1] = { --神将
-- default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",tabName = Language[12274],
-- rpType = RedPointType.Hero_Fetter,funcType = -1,bg = "t_tianshumijuan_shengjiangditu",zi = "t_tianshumijuan_shenjiangpian_zi_zh",
-- },
-- [2] = { --魂印
-- default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",tabName = Language[12275],
-- rpType = RedPointType.SoulPrint_Fetter,funcType = FUNCTION_OPEN_TYPE.hunyin,bg = "t_tianshumijuan_hunyinditu",zi = "t_tianshumijuan_hunyingpian_zi_zh", --gamesetting.EquipSignUnlock
-- },
[1] = { --神将
default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",tabName = Language[12274],
rpType = RedPointType.Hero_Fetter,funcType = -1,bg = "t_tianshumijuan_shengjiangditu",zi = "t_tianshumijuan_shenjiangpian_zi_zh",
},
[2] = { --魂印
default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",tabName = Language[12275],
rpType = RedPointType.SoulPrint_Fetter,funcType = FUNCTION_OPEN_TYPE.hunyin,bg = "t_tianshumijuan_hunyinditu",zi = "t_tianshumijuan_hunyingpian_zi_zh", --gamesetting.EquipSignUnlock
},
[3] = { --灵兽
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",
-- },
[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",
},
[5] = { --神兵
default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",tabName = "神兵篇",
rpType = RedPointType.Weapon_Fetter,funcType = FUNCTION_OPEN_TYPE.POKEMON,bg = "t_tianshumijuan_lingshouditu"-- "t_tianshumijuan_shengjiangditu"
rpType = RedPointType.Weapon_Fetter,funcType = FUNCTION_OPEN_TYPE.GodWeapon,bg = "t_tianshumijuan_lingshouditu"
,zi = "GodWeaponAtlas_handbook_title_zh",
},
[6] = { --法宝
default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",tabName = "法宝篇",
rpType = RedPointType.Weapon_Fetter,funcType = -1,bg = "t_tianshumijuan_lingshouditu"
,zi = "GodWeaponAtlas_handbook_title_zh",
},
[7] = { --法相
default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",tabName = "法相篇",
rpType = RedPointType.Weapon_Fetter,funcType = FUNCTION_OPEN_TYPE.FaXiang,bg = "t_tianshumijuan_lingshouditu"
,zi = "GodWeaponAtlas_handbook_title_zh",
},
[8] = { --身外化身
default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",tabName = "化身篇",
rpType = RedPointType.Weapon_Fetter,funcType = FUNCTION_OPEN_TYPE.Incarnation,bg = "t_tianshumijuan_lingshouditu"
,zi = "GodWeaponAtlas_handbook_title_zh",
},
}
@ -88,6 +103,10 @@ function TianShuMiJuanMainPanel.SetTabAdapter(newTab, index, status)
else
newTab.gameObject:SetActive(true)
end
--屏蔽装备篇
if index==4 then
newTab.gameObject:SetActive(false)
end
end
end

View File

@ -29,6 +29,9 @@ function this.OnLevelChange()
this.CheckFetterStatus(3)
this.CheckFetterStatus(4)
this.CheckFetterStatus(5)
this.CheckFetterStatus(6)
this.CheckFetterStatus(7)
this.CheckFetterStatus(8)
end
function this.CheckRedPointType(redType)
@ -42,6 +45,12 @@ function this.CheckRedPointType(redType)
return this.CheckRedPoint(4)
elseif redType == RedPointType.Weapon_Fetter then
return this.CheckRedPoint(5)
elseif redType ==RedPointType.Treasure_Fetter then
return this.CheckRedPoint(6)
elseif redType ==RedPointType.FaXiang_Fetter then
return this.CheckRedPoint(7)
elseif redType ==RedPointType.HuaShen_Fetter then
return this.CheckRedPoint(8)
end
end
@ -82,6 +91,9 @@ function this.UpdateFetterId(ids)
this.CheckFetterStatus(3)
this.CheckFetterStatus(4)
this.CheckFetterStatus(5)
this.CheckFetterStatus(6)
this.CheckFetterStatus(7)
this.CheckFetterStatus(8)
end
--获取加成的羁绊等级
@ -121,6 +133,22 @@ function this.CheckFetterStatus(fetterType)
local curPokemonSidList = GodWeaponManager.GetAllHandData()
this.GetAllPokemonFetterDatas(fetterType,curPokemonSidList)
CheckRedPointStatus(RedPointType.Weapon_Fetter)
elseif fetterType==6 then
local curPokemonSidList = PlayerManager.handBook[6]
if curPokemonSidList then
LogError("curPokemonSidList=====================len11111111111111111111111111================="..#curPokemonSidList)
end
this.GetAllPokemonFetterDatas(fetterType,curPokemonSidList)
CheckRedPointStatus(RedPointType.Treasure_Fetter)
elseif fetterType==7 then
local curPokemonSidList = PlayerManager.handBook[7]
this.GetAllPokemonFetterDatas(fetterType,curPokemonSidList)
CheckRedPointStatus(RedPointType.FaXiang_Fetter)
elseif fetterType==8 then
local curPokemonSidList = PlayerManager.handBook[8]
this.GetAllPokemonFetterDatas(fetterType,curPokemonSidList)
CheckRedPointStatus(RedPointType.HuaShen_Fetter)
end
end
@ -128,11 +156,18 @@ end
--刷新羁绊状态
function this.GetAllPokemonFetterDatas(fetterType,curPokemonSidList)
local SpiritAnimalBookList = {}
if curPokemonSidList==nil then
return
end
for k,v in pairs(this.fetterData) do
--LogError("fetterType=="..fetterType.." v.fettertype=="..v.fetterType)
if fetterType==6 then
LogError("fetterType=="..fetterType.." v.fettertype=="..v.fetterType.." v.enabled=="..v.enabled)
end
if v.fetterType == fetterType and v.enabled == -1 then
if this.IsCompound(v.teamers,curPokemonSidList,v.fetterType) then
v.enabled = 0
LogError(" open==========")
end
end
end
@ -165,17 +200,31 @@ end
function this.IsCompound(Teamers,curPokemonSidList,fetterType)
local isCompound = true
for k,v in ipairs(Teamers) do
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
if fetterType and (fetterType==6 or fetterType==7 or fetterType==8) then
-- if isCompound then
-- LogError("v1================================="..v[1].." len===================="..#curPokemonSidList)
-- isCompound = false
-- break
-- end
local isCon=CheckListIsContainValue1(curPokemonSidList,v[1])
if isCompound and isCon==false then
isCompound=false
break
end
else
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
end
end
end
end
return isCompound
end
@ -260,13 +309,22 @@ function this.IsHaveItem(fetterType,id,num)
data = EquipManager.GetHaveEquipDatas()
elseif fetterType ==5 then
data = GodWeaponManager.GetAllHandData()
elseif fetterType ==6 then
data = PlayerManager.handBook[6]
elseif fetterType ==7 then
data = PlayerManager.handBook[7]
elseif fetterType ==8 then
data = PlayerManager.handBook[8]
end
if fetterType == 4 then
if data[id] and data[id] >= num then
return true
else
return false
end
elseif fetterType==6 or fetterType==7 or fetterType==8 then
return CheckListIsContainValue1(data,id)
elseif data[id] then
return true
end