svn逻辑同步
parent
cadced19c9
commit
461c64b04a
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 7b2037ed3c118b140acea5836736d927
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: f8caebb1f24cd114ebc6fd41468c2df2
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName: lz4/atlas/treasureofheaven
|
||||
assetBundleVariant: unity3d
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 6f369e06e034a1b4d830220e7c8adeb1
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 79e83052292ddcc4090a6038e040f43e
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 8e215062c094e93439bde3e958611dad
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: ff5f2ef72e86bc846ba149e2a08322ed
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 47 KiB |
|
|
@ -0,0 +1,110 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 7f84a89f5f54f194fb323253dfd0a8c1
|
||||
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: 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: Standalone
|
||||
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
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 0c98b0b528c97eb429941ed6333460eb
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 7a18bf804ae55af498bd3019e9981f46
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName: lzma/luabytes
|
||||
assetBundleVariant: unity3d
|
||||
|
|
@ -14468,7 +14468,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &6210025963494768122
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -33730,7 +33730,7 @@ RectTransform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6210025964156221443}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 0.9999203, y: 0.9999203, z: 0.9999203}
|
||||
m_Children:
|
||||
|
|
|
|||
|
|
@ -5923,7 +5923,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &7369355265537435491
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -178,7 +178,6 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
tweenSequeue1:
|
||||
tweenSequeue:
|
||||
- initV3: {x: 0, y: -300, z: 0}
|
||||
initFloat: 0
|
||||
|
|
@ -477,7 +476,7 @@ Canvas:
|
|||
m_PlaneDistance: 100
|
||||
m_PixelPerfect: 0
|
||||
m_ReceivesEvents: 1
|
||||
m_OverrideSorting: 0
|
||||
m_OverrideSorting: 1
|
||||
m_OverridePixelPerfect: 0
|
||||
m_SortingBucketNormalizedSize: 0
|
||||
m_AdditionalShaderChannelsFlag: 0
|
||||
|
|
|
|||
|
|
@ -641,7 +641,6 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
tweenSequeue1:
|
||||
tweenSequeue:
|
||||
- initV3: {x: 0, y: -300, z: 0}
|
||||
initFloat: 0
|
||||
|
|
@ -1518,9 +1517,9 @@ RectTransform:
|
|||
m_Father: {fileID: 224957088180840468}
|
||||
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: 398, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 398, y: -381.95}
|
||||
m_SizeDelta: {x: 796, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &222214354735553476
|
||||
|
|
@ -2954,7 +2953,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 398, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 796, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6686941601074667578
|
||||
|
|
|
|||
|
|
@ -5660,7 +5660,7 @@ ParticleSystem:
|
|||
--- !u!199 &199793888397422328
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -5776,7 +5776,7 @@ MonoBehaviour:
|
|||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 2100000, guid: 566292ef07220324e850f9b295e935dd, type: 2}
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
|
|
@ -11348,7 +11348,7 @@ ParticleSystem:
|
|||
--- !u!199 &199786334729933541
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -11540,7 +11540,6 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
tweenSequeue1:
|
||||
tweenSequeue:
|
||||
- initV3: {x: 0, y: 0, z: 0}
|
||||
initFloat: 1
|
||||
|
|
@ -16268,7 +16267,7 @@ ParticleSystem:
|
|||
--- !u!199 &199812891778826125
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -21162,7 +21161,7 @@ ParticleSystem:
|
|||
--- !u!199 &199314592830468766
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -26238,7 +26237,7 @@ ParticleSystem:
|
|||
--- !u!199 &199738970247411175
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -26770,7 +26769,6 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
tweenSequeue1:
|
||||
tweenSequeue:
|
||||
- initV3: {x: 0, y: 0, z: 0}
|
||||
initFloat: 0
|
||||
|
|
@ -31877,7 +31875,7 @@ ParticleSystem:
|
|||
--- !u!199 &199312732024159113
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -32383,7 +32381,6 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
tweenSequeue1:
|
||||
tweenSequeue:
|
||||
- initV3: {x: 0, y: 0, z: 0}
|
||||
initFloat: 1
|
||||
|
|
@ -32719,7 +32716,7 @@ RectTransform:
|
|||
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_AnchoredPosition: {x: 125.3, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 100.75}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &222314792653266900
|
||||
|
|
@ -32885,9 +32882,9 @@ RectTransform:
|
|||
m_Father: {fileID: 7942848174134688160}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 365.06, y: -14.545}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 365.06, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 29.09}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &114534522639639522
|
||||
|
|
@ -33202,7 +33199,6 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
tweenSequeue1:
|
||||
tweenSequeue:
|
||||
- initV3: {x: 0, y: 0, z: 0}
|
||||
initFloat: 1
|
||||
|
|
@ -33723,7 +33719,6 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
tweenSequeue1:
|
||||
tweenSequeue:
|
||||
- initV3: {x: 0, y: 0, z: 0}
|
||||
initFloat: 1
|
||||
|
|
@ -38528,7 +38523,7 @@ ParticleSystem:
|
|||
--- !u!199 &199309040906483979
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -43284,7 +43279,7 @@ ParticleSystem:
|
|||
--- !u!199 &199592651100025897
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -43711,7 +43706,6 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
tweenSequeue1:
|
||||
tweenSequeue:
|
||||
- initV3: {x: 0, y: 0, z: 0}
|
||||
initFloat: 1
|
||||
|
|
@ -48513,7 +48507,7 @@ ParticleSystem:
|
|||
--- !u!199 &199310039250832541
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -53269,7 +53263,7 @@ ParticleSystem:
|
|||
--- !u!199 &199031629276305175
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -58551,7 +58545,7 @@ ParticleSystem:
|
|||
--- !u!199 &199224694020007487
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -85108,7 +85102,6 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
tweenSequeue1:
|
||||
tweenSequeue:
|
||||
- initV3: {x: 0, y: 0, z: 0}
|
||||
initFloat: 0
|
||||
|
|
|
|||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 749ca20497e1551458180135f56ecc83
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName: lz4/spine/c_bm_0068
|
||||
assetBundleVariant: unity3d
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 3109bfa893b26c646b3127fa03b1233b
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName: lz4/spine/c_fjzd_0055
|
||||
assetBundleVariant: unity3d
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 2126835660bccc449b367a6b4dc1a6f4
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName: lz4/spine/c_hyt_0032
|
||||
assetBundleVariant: unity3d
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 8708338c8fb732349951c4ac04649278
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName: lz4/spine/c_jlbuyuan_0001
|
||||
assetBundleVariant: unity3d
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: ca9b7831095e6774fbc5bfb70d3372d3
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName: lz4/spine/c_jlbuyuan_00015
|
||||
assetBundleVariant: unity3d
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: bb2b36e8f41186346a978945956b7f61
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName: lz4/spine/c_jlbuyuan_00020
|
||||
assetBundleVariant: unity3d
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 31ac804ae11f3b547b18072fbcf43877
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName: lz4/spine/c_jlbuyuan_00027
|
||||
assetBundleVariant: unity3d
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 8d8a91a8091f28a4e9157f988390a24b
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName: lz4/spine/c_kq_0018
|
||||
assetBundleVariant: unity3d
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: aa19b76953d30a444af2f25a6e564f16
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName: lz4/spine/c_ly_0039
|
||||
assetBundleVariant: unity3d
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: d296186c55e48f24b9bb7ea2baf6189a
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName: lz4/spine/c_ly_0070
|
||||
assetBundleVariant: unity3d
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: b7b63bd7ee6729f4dab80194392aa74b
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName: lz4/spine/c_mrzq_0010
|
||||
assetBundleVariant: unity3d
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 5a16d26b93389ca45829034781ecf1a2
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName: lz4/spine/c_ne_0058
|
||||
assetBundleVariant: unity3d
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: db90f4b28b633ce47881633d2d95ef6e
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName: lz4/spine/c_qf_0046
|
||||
assetBundleVariant: unity3d
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: af50c88df417b4849addce11d7dce6a9
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName: lz4/spine/c_qlq_0006
|
||||
assetBundleVariant: unity3d
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: b2d32fb47728f7c4ab48215c9b0e33b9
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName: lz4/spine/c_skr_0028
|
||||
assetBundleVariant: unity3d
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: b9bb57cd4d351ec4992d92ca5f53b1c0
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName: lz4/spine/c_sq_0019
|
||||
assetBundleVariant: unity3d
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 06c02c2af9f748e48a268e5fba8d0a0f
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName: lz4/spine/c_syf_0016
|
||||
assetBundleVariant: unity3d
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 631923df38bbfd04493abb846257b356
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName: lz4/spine/c_xhht_0017
|
||||
assetBundleVariant: unity3d
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 7dcdccdd85d93ec42a9cc860c1e5aac6
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName: lz4/spine/c_xy_0012
|
||||
assetBundleVariant: unity3d
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: fb6d365f475b65745aabac23b33fca1b
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName: lz4/spine/c_yl_0035
|
||||
assetBundleVariant: unity3d
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: a56bc96b0c9026c48b809a2fed6f1f3f
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName: lz4/spine/c_yqj_0042
|
||||
assetBundleVariant: unity3d
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 56a70d19f8311ec4c836c3d041453868
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName: lz4/spine/c_yr_0007
|
||||
assetBundleVariant: unity3d
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 079ce1c192416b343a3fc1ba36fbe874
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName: lz4/spine/c_ywg_0045
|
||||
assetBundleVariant: unity3d
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: a26291f0ca2fff54d843700aab2b90bf
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName: lz4/spine/c_ywy_0040
|
||||
assetBundleVariant: unity3d
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 70fa225984f4d9342a6b672d59b53cc6
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName: lz4/spine/c_yxz_0057
|
||||
assetBundleVariant: unity3d
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 15be475689ec1a14fa308a7236e4881e
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName: lz4/spine/c_zc_0021
|
||||
assetBundleVariant: unity3d
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: a5293d84d8c02264785c2c0c848b8737
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName: lz4/spine/c_zh_0044
|
||||
assetBundleVariant: unity3d
|
||||
|
|
@ -120,9 +120,9 @@ function this.SwitchView(index)
|
|||
end
|
||||
--区分显示
|
||||
if index==1 then
|
||||
this.upView:OnOpen({showType = UpViewOpenType.ShowLeft, panelType = PanelType.HeroReturn})
|
||||
this.upView:OnOpen({showType = UpViewOpenType.ShowLeft, panelType = PanelType.Main})
|
||||
elseif index==2 then
|
||||
this.upView:OnOpen({showType = UpViewOpenType.ShowLeft, panelType = PanelType.HeartFireStone})
|
||||
this.upView:OnOpen({showType = UpViewOpenType.ShowLeft, panelType = PanelType.Main})
|
||||
elseif index==3 then
|
||||
this.upView:OnOpen({showType = UpViewOpenType.ShowLeft, panelType = PanelType.Main})
|
||||
end
|
||||
|
|
|
|||
|
|
@ -252,12 +252,12 @@ function this.UpdateHeroHpValue(heroInfo)
|
|||
for i = 1, #heroInfo do
|
||||
if this.heroInfo[heroInfo[i].heroId] then
|
||||
this.heroInfo[heroInfo[i].heroId].remainHp = heroInfo[i].remainHp
|
||||
--Log(" ******* 推送更新远征英雄血量 "..heroInfo[i].heroId.." "..heroInfo[i].remainHp)
|
||||
-- LogGreen(" ******* 推送更新远征英雄血量 "..heroInfo[i].heroId.." "..heroInfo[i].remainHp)
|
||||
else
|
||||
local singleHeroInfo = {}
|
||||
singleHeroInfo.heroId = heroInfo[i].heroId--英雄动态id
|
||||
singleHeroInfo.remainHp = heroInfo[i].remainHp--剩余血量
|
||||
--Log(" ******* 推送更新远征英雄血量 "..singleHeroInfo.heroId.." "..singleHeroInfo.remainHp)
|
||||
-- LogGreen(" ******* 推送更新远征英雄血量 "..singleHeroInfo.heroId.." "..singleHeroInfo.remainHp)
|
||||
this.heroInfo[singleHeroInfo.heroId] = singleHeroInfo
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ local fun
|
|||
local itemList = {}
|
||||
local monsterData = {}
|
||||
local rewardData = {}
|
||||
local curNodeConFig
|
||||
local type = 1 --1 前往 2 放弃
|
||||
function this:InitComponent(gameObject)
|
||||
this.titleText=Util.GetGameObject(gameObject,"TitleText"):GetComponent("Text")
|
||||
|
|
@ -72,6 +73,9 @@ function this:OnShow(_parent,...)
|
|||
end
|
||||
end
|
||||
for i, v in pairs(curRewardData) do
|
||||
if curNodeConFig and curNodeConFig.Reward and curNodeConFig.Reward > 0 then
|
||||
v = {v[1],math.floor(v[2] * curNodeConFig.Reward)}
|
||||
end
|
||||
table.insert(rewardData,v)
|
||||
end
|
||||
this:FormationAdapter()
|
||||
|
|
|
|||
|
|
@ -81,6 +81,9 @@ function this:OnShow(_parent,...)
|
|||
end
|
||||
end
|
||||
for i, v in pairs(curRewardData) do
|
||||
if curNodeConFig and curNodeConFig.Reward and curNodeConFig.Reward > 0 then
|
||||
v = {v[1],math.floor(v[2] * curNodeConFig.Reward)}
|
||||
end
|
||||
table.insert(rewardData,v)
|
||||
end
|
||||
this:FormationAdapter()
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@ function this.SetCurFormationIndex()
|
|||
local curIndex = 1
|
||||
local curMapId = PlayerManager.curMapId
|
||||
local carbonType = 1
|
||||
if curMapId > 0 then
|
||||
if curMapId and curMapId > 0 then
|
||||
carbonType = ChallengeData[curMapId].Type
|
||||
end
|
||||
curIndex = carbonType == 4 and 401 or 1
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ function this:InitComponent(gameObject)
|
|||
this.ScrollView.moveTween.MomentumAmount = 1
|
||||
this.ScrollView.moveTween.Strength = 1
|
||||
end
|
||||
|
||||
this.isClickAid = true
|
||||
--绑定事件(用于子类重写)
|
||||
function this:BindEvent()
|
||||
Util.AddClick(this.aidBtn, function()
|
||||
|
|
@ -33,6 +33,7 @@ end
|
|||
|
||||
--界面打开或者重新打开后,界面刷新时调用(用于子类重写)
|
||||
function this:OnShow()
|
||||
this.isClickAid = true
|
||||
this.ShowPanelData()
|
||||
end
|
||||
function this.ShowPanelData()
|
||||
|
|
@ -44,13 +45,13 @@ function this.ShowPanelData()
|
|||
this.titleText.text = ConfigManager.GetConfigData(ConfigName.ItemConfig,item).Name..Language[11003]..guildHelpConfig[1].HelpTime[2] - curNum.."/".. guildHelpConfig[1].HelpTime[2]..")"
|
||||
end
|
||||
local allMyAidData = MyGuildManager.GetAllGuildHelpInfo()
|
||||
if #allMyAidData <= 0 then
|
||||
if #allMyAidData <= 0 and not MyGuildManager.isPanelRequest then
|
||||
MyGuildManager.isPanelRequest = true
|
||||
NetManager.GuildHelpGetAllRequest(function (msg)
|
||||
allMyAidData = MyGuildManager.GetAllGuildHelpInfo()
|
||||
this.ScrollView:SetData(allMyAidData, function (index, go)
|
||||
this.SingleHelpAidDataShow(go, allMyAidData[index])
|
||||
end)
|
||||
this.emptyObj:SetActive(#allMyAidData <= 0)
|
||||
end)
|
||||
else
|
||||
this.ScrollView:SetData(allMyAidData, function (index, go)
|
||||
|
|
@ -76,9 +77,12 @@ function this.SingleHelpAidDataShow(go,data)
|
|||
--免费
|
||||
Util.GetGameObject(getRewardBtn, "Text"):GetComponent("Text").text = Language[11004]
|
||||
Util.AddOnceClick(getRewardBtn, function()
|
||||
NetManager.GuildHelpHelpOtherRequest(data.uid,data.type,function (msg)
|
||||
this.ShowRewardAndRefreshPanel(msg)
|
||||
end)
|
||||
if this.isClickAid then
|
||||
this.isClickAid = false
|
||||
NetManager.GuildHelpHelpOtherRequest(data.uid,data.type,function (msg)
|
||||
this.ShowRewardAndRefreshPanel(msg)
|
||||
end)
|
||||
end
|
||||
end)
|
||||
elseif MyGuildManager.MyFeteInfo.guildHelpTime >= guildHelpConfig[1].HelpTime[1] and MyGuildManager.MyFeteInfo.guildHelpTime < zongNum then
|
||||
--元宝
|
||||
|
|
@ -86,13 +90,16 @@ function this.SingleHelpAidDataShow(go,data)
|
|||
Util.GetGameObject(getRewardBtn, "goldAid/Text"):GetComponent("Text").text = guildHelpConfig[1].Expend[2]
|
||||
Util.GetGameObject(getRewardBtn, "Text"):GetComponent("Text").text = Language[11005]
|
||||
Util.AddOnceClick(getRewardBtn, function()
|
||||
if BagManager.GetItemCountById(guildHelpConfig[1].Expend[1]) < guildHelpConfig[1].Expend[2] then
|
||||
PopupTipPanel.ShowTip(Language[11006])
|
||||
return
|
||||
if this.isClickAid then
|
||||
this.isClickAid = false
|
||||
if BagManager.GetItemCountById(guildHelpConfig[1].Expend[1]) < guildHelpConfig[1].Expend[2] then
|
||||
PopupTipPanel.ShowTip(Language[11006])
|
||||
return
|
||||
end
|
||||
NetManager.GuildHelpHelpOtherRequest(data.uid,data.type,function (msg)
|
||||
this.ShowRewardAndRefreshPanel(msg)
|
||||
end)
|
||||
end
|
||||
NetManager.GuildHelpHelpOtherRequest(data.uid,data.type,function (msg)
|
||||
this.ShowRewardAndRefreshPanel(msg)
|
||||
end)
|
||||
end)
|
||||
else
|
||||
Util.GetGameObject(getRewardBtn, "Text"):GetComponent("Text").text = Language[11005]
|
||||
|
|
@ -123,6 +130,7 @@ function this.ShowRewardAndRefreshPanel(msg)
|
|||
PopupText(content, 0.5, 2)
|
||||
--UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1,function ()
|
||||
MyGuildManager.SetSingleGuildHelpguildHelpTimeData()
|
||||
this.isClickAid = true
|
||||
this.ShowPanelData()
|
||||
end
|
||||
return this
|
||||
|
|
@ -558,6 +558,8 @@ function MyGuildManager.BeKickOut(msg)
|
|||
local rMem = table.remove(this.MyGuildMemList, rIndex)
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.Guild.KickOut, rMem.roleUid)
|
||||
end
|
||||
--清除援助信息
|
||||
MyGuildManager.DelSingleGuildHelpInfo(msg.uid)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -622,7 +624,7 @@ end
|
|||
|
||||
|
||||
|
||||
|
||||
this.isPanelRequest = false
|
||||
--公会援助
|
||||
function MyGuildManager.SetMyAidInfo(msg)
|
||||
this.MyFeteInfo.guildHelpInfo = msg.familyUserInfo.guildHelpInfo
|
||||
|
|
@ -655,62 +657,75 @@ function MyGuildManager.SetAllGuildHelpInfo(msg)
|
|||
num = msg.guildHelpInfoIndication[i].guildHelpInfo[j].num,--总获得数量
|
||||
hadtakenum = msg.guildHelpInfoIndication[i].guildHelpInfo[j].hadtakenum, })--已领取数量
|
||||
end
|
||||
--LogRed(" msg.guildHelpInfoIndication[i].uid ".. msg.guildHelpInfoIndication[i].uid)
|
||||
table.insert(this.allGuildHelpInfo,singleHelpInfo)
|
||||
-- LogRed(" msg.guildHelpInfoIndication[i].uid ".. msg.guildHelpInfoIndication[i].uid)
|
||||
this.allGuildHelpInfo[msg.guildHelpInfoIndication[i].uid] = singleHelpInfo
|
||||
end
|
||||
MyGuildManager.RefreshAidRedPot()
|
||||
end
|
||||
|
||||
--当公会成员退出时清除求援信息
|
||||
function MyGuildManager.DelSingleGuildHelpInfo(Deluid)
|
||||
LogGreen("DelSingleGuildHelpInfo "..Deluid)
|
||||
for uid, value in pairs(this.allGuildHelpInfo) do
|
||||
if uid == Deluid then
|
||||
this.allGuildHelpInfo[uid] = nil
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.Guild.RefreshGuildAid)
|
||||
MyGuildManager.RefreshAidRedPot()
|
||||
end
|
||||
end
|
||||
end
|
||||
--推送更新工会援助信息
|
||||
function MyGuildManager.SetSingleGuildHelpInfo(msg)
|
||||
--LogGreen("msg.uid "..msg.uid)
|
||||
--LogGreen("#this.allGuildHelpInfo "..#this.allGuildHelpInfo)
|
||||
-- LogGreen("msg.uid "..msg.uid)
|
||||
-- LogGreen("#this.allGuildHelpInfo "..LengthOfTable(this.allGuildHelpInfo))
|
||||
local isStarAdd = true
|
||||
for i = 1, #this.allGuildHelpInfo do
|
||||
--LogGreen("this.allGuildHelpInfo[i].uid "..this.allGuildHelpInfo[i].uid.." "..msg.uid)
|
||||
if this.allGuildHelpInfo[i].uid == msg.uid then
|
||||
for uid, value in pairs(this.allGuildHelpInfo) do
|
||||
-- LogGreen("uid "..uid.." "..msg.uid)
|
||||
if uid == msg.uid then
|
||||
isStarAdd = false
|
||||
this.allGuildHelpInfo[i].uid = msg.uid
|
||||
this.allGuildHelpInfo[i].name = msg.name
|
||||
this.allGuildHelpInfo[i].guildHelpInfo = {}
|
||||
--LogGreen("msg.guildHelpInfo "..#msg.guildHelpInfo)
|
||||
this.allGuildHelpInfo[uid].uid = msg.uid
|
||||
this.allGuildHelpInfo[uid].name = msg.name
|
||||
this.allGuildHelpInfo[uid].guildHelpInfo = {}
|
||||
-- LogGreen("msg.guildHelpInfo "..#msg.guildHelpInfo)
|
||||
for j = 1, #msg.guildHelpInfo do
|
||||
--LogGreen(Language[10996]..msg.uid.." "..msg.guildHelpInfo[j].type)
|
||||
--LogGreen("msg.guildHelpInfo[j].type "..msg.guildHelpInfo[j].type)
|
||||
--LogGreen("msg.guildHelpInfo[j].num "..msg.guildHelpInfo[j].num)
|
||||
--LogGreen("msg.guildHelpInfo[j].hadtakenum "..msg.guildHelpInfo[j].hadtakenum)
|
||||
table.insert(this.allGuildHelpInfo[i].guildHelpInfo,{type = msg.guildHelpInfo[j].type,--碎片id
|
||||
num = msg.guildHelpInfo[j].num,--总获得数量
|
||||
hadtakenum = msg.guildHelpInfo[j].hadtakenum, })--已领取数量
|
||||
LogGreen(Language[10996]..msg.uid.." "..msg.guildHelpInfo[j].type.." "..msg.guildHelpInfo[j].num.." "..msg.guildHelpInfo[j].hadtakenum)
|
||||
if msg.guildHelpInfo[j].num ~= -1 then
|
||||
table.insert(this.allGuildHelpInfo[uid].guildHelpInfo,{type = msg.guildHelpInfo[j].type,--碎片id
|
||||
num = msg.guildHelpInfo[j].num,--总获得数量
|
||||
hadtakenum = msg.guildHelpInfo[j].hadtakenum, })--已领取数量
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
if isStarAdd then
|
||||
local singleHelpInfo = {}
|
||||
singleHelpInfo.uid = msg.uid
|
||||
singleHelpInfo.name = msg.name
|
||||
singleHelpInfo.guildHelpInfo = {}
|
||||
--LogGreen("msg.guildHelpInfo "..#msg.guildHelpInfo)
|
||||
for j = 1, #msg.guildHelpInfo do
|
||||
--LogGreen(Language[10996]..msg.uid.." "..msg.guildHelpInfo[j].type)
|
||||
table.insert(singleHelpInfo.guildHelpInfo,{type = msg.guildHelpInfo[j].type,--碎片id
|
||||
num = msg.guildHelpInfo[j].num,--总获得数量
|
||||
hadtakenum = msg.guildHelpInfo[j].hadtakenum, })--已领取数量
|
||||
if msg.uid and msg.uid > 0 then
|
||||
local singleHelpInfo = {}
|
||||
singleHelpInfo.uid = msg.uid
|
||||
singleHelpInfo.name = msg.name
|
||||
singleHelpInfo.guildHelpInfo = {}
|
||||
-- LogGreen("msg.guildHelpInfo "..#msg.guildHelpInfo)
|
||||
for j = 1, #msg.guildHelpInfo do
|
||||
-- LogGreen(Language[10996]..msg.uid.." "..msg.guildHelpInfo[j].type)
|
||||
if msg.guildHelpInfo[j].num ~= -1 then
|
||||
table.insert(singleHelpInfo.guildHelpInfo,{type = msg.guildHelpInfo[j].type,--碎片id
|
||||
num = msg.guildHelpInfo[j].num,--总获得数量
|
||||
hadtakenum = msg.guildHelpInfo[j].hadtakenum, })--已领取数量
|
||||
end
|
||||
end
|
||||
-- LogRed(" msg.uid ".. msg.uid)
|
||||
this.allGuildHelpInfo[msg.uid] = singleHelpInfo
|
||||
end
|
||||
--LogRed(" msg.uid ".. msg.uid)
|
||||
table.insert(this.allGuildHelpInfo,singleHelpInfo)
|
||||
end
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.Guild.RefreshGuildAid)
|
||||
MyGuildManager.SetSingleGuildHelpInfoRefreshMyData(msg)
|
||||
end
|
||||
--自己发的援助更新自己信息
|
||||
function MyGuildManager.SetSingleGuildHelpInfoRefreshMyData(msg)
|
||||
if msg then
|
||||
if msg.uid == PlayerManager.uid then
|
||||
--LogError("自己发的援助更新自己信息 "..msg.uid.." "..msg.guildHelpInfo[1].type)
|
||||
-- LogPink("自己发的援助更新自己信息 "..msg.uid.." "..msg.guildHelpInfo[1].type)
|
||||
this.MyFeteInfo.guildHelpInfo = msg.guildHelpInfo
|
||||
end
|
||||
end
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.Guild.RefreshGuildAid)
|
||||
MyGuildManager.RefreshAidRedPot()
|
||||
end
|
||||
--公会援助
|
||||
|
|
@ -739,29 +754,28 @@ function MyGuildManager.SetGuildHelpCDTimeData()
|
|||
end
|
||||
function MyGuildManager.GetAllGuildHelpInfo()
|
||||
local curAllGuildHelpInfo = {}
|
||||
--LogGreen("this.allGuildHelpInfo "..#this.allGuildHelpInfo)
|
||||
for i = 1, #this.allGuildHelpInfo do
|
||||
--LogGreen("#this.allGuildHelpInfo[i].guildHelpInfo "..#this.allGuildHelpInfo[i].guildHelpInfo)
|
||||
for j = 1, #this.allGuildHelpInfo[i].guildHelpInfo do
|
||||
-- LogGreen("this.allGuildHelpInfo "..LengthOfTable(this.allGuildHelpInfo))
|
||||
for key, value in pairs(this.allGuildHelpInfo) do
|
||||
-- LogGreen("value.guildHelpInfo "..#value.guildHelpInfo)
|
||||
for j = 1, #value.guildHelpInfo do
|
||||
local aidMaxNum = 5
|
||||
for k = 1, #guildHelpConfig[1].RecourseReward do
|
||||
if guildHelpConfig[1].RecourseReward[k][2] == this.allGuildHelpInfo[i].guildHelpInfo[j].type then
|
||||
if guildHelpConfig[1].RecourseReward[k][2] == value.guildHelpInfo[j].type then
|
||||
aidMaxNum = guildHelpConfig[1].RecourseReward[k][3]
|
||||
end
|
||||
end
|
||||
--LogGreen("aidMaxNum "..aidMaxNum .." ".. this.allGuildHelpInfo[i].guildHelpInfo[j].num .." "..this.allGuildHelpInfo[i].uid .." ".. PlayerManager.uid)
|
||||
--if aidMaxNum ~= (this.allGuildHelpInfo[i].guildHelpInfo[j].num or this.allGuildHelpInfo[i].guildHelpInfo[j].num ~= this.allGuildHelpInfo[i].guildHelpInfo[j].hadtakenum)
|
||||
if aidMaxNum ~= this.allGuildHelpInfo[i].guildHelpInfo[j].num and this.allGuildHelpInfo[i].uid ~= PlayerManager.uid then
|
||||
table.insert(curAllGuildHelpInfo,{type = this.allGuildHelpInfo[i].guildHelpInfo[j].type,--碎片id
|
||||
num = this.allGuildHelpInfo[i].guildHelpInfo[j].num,--总获得数量
|
||||
hadtakenum = this.allGuildHelpInfo[i].guildHelpInfo[j].hadtakenum,
|
||||
uid = this.allGuildHelpInfo[i].uid,
|
||||
name = this.allGuildHelpInfo[i].name,
|
||||
-- LogGreen("aidMaxNum "..aidMaxNum .." ".. value.guildHelpInfo[j].num .." "..value.uid .." ".. PlayerManager.uid)
|
||||
if aidMaxNum ~= value.guildHelpInfo[j].num and value.uid ~= PlayerManager.uid then
|
||||
table.insert(curAllGuildHelpInfo,{type = value.guildHelpInfo[j].type,--碎片id
|
||||
num = value.guildHelpInfo[j].num,--总获得数量
|
||||
hadtakenum = value.guildHelpInfo[j].hadtakenum,
|
||||
uid = value.uid,
|
||||
name = value.name,
|
||||
})--已领取数量
|
||||
end
|
||||
end
|
||||
end
|
||||
--LogGreen("curAllGuildHelpInfo "..#curAllGuildHelpInfo)
|
||||
-- LogGreen("curAllGuildHelpInfo "..#curAllGuildHelpInfo)
|
||||
return curAllGuildHelpInfo
|
||||
end
|
||||
this.allGuildHelpRecordInfo = {}--援助 公会援助记录所有信息
|
||||
|
|
@ -785,8 +799,8 @@ end
|
|||
--获取公会军团援助红点
|
||||
function MyGuildManager.GetMyAidOtherGuildHelpRedPoint()
|
||||
if not PlayerManager.familyId or PlayerManager.familyId == 0 then return false end
|
||||
for i = 1, #this.allGuildHelpInfo do
|
||||
if this.allGuildHelpInfo[i].uid ~= PlayerManager.uid and this.MyFeteInfo.guildHelpTime < ConfigManager.GetConfigData(ConfigName.GuildHelpConfig,1).HelpTime[1] then
|
||||
for key, value in pairs(this.allGuildHelpInfo) do
|
||||
if value.uid ~= PlayerManager.uid and this.MyFeteInfo.guildHelpTime < ConfigManager.GetConfigData(ConfigName.GuildHelpConfig,1).HelpTime[1] then
|
||||
return true
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -64,8 +64,10 @@ function this:BindEvent()
|
|||
CarbonManager.InitQuickFightData(monsterGroupId, nil, msg)
|
||||
local fightData = BattleManager.GetBattleServerData(msg)
|
||||
UIManager.OpenPanel(UIName.BattlePanel,fightData, BATTLE_TYPE.DAILY_CHALLENGE, function()
|
||||
--更新精气值
|
||||
MapTrialManager.UpdatePowerValue(msg.essenceValue)
|
||||
--更新精气值
|
||||
LogGreen("战斗后的更新精气值:"..msg.essenceValue)
|
||||
-- MapTrialManager.UpdatePowerValue(msg.essenceValue)--这句话会调用之后的event,导致召唤boss特效播放两次,直接把精气值付上就好了
|
||||
MapTrialManager.powerValue = msg.essenceValue
|
||||
--更新英雄HP
|
||||
MapTrialManager.SetHeroHp(msg.remainHpList,MapTrialManager.selectHeroDid)
|
||||
--召唤Boss
|
||||
|
|
|
|||
|
|
@ -204,8 +204,8 @@ function TrialMapPanel:OnOpen()
|
|||
end
|
||||
|
||||
function TrialMapPanel:OnShow()
|
||||
if CarbonManager.difficulty ~= 2 then return end
|
||||
this.InitShowState()
|
||||
-- if CarbonManager.difficulty ~= 2 then return end
|
||||
-- this.InitShowState()
|
||||
end
|
||||
|
||||
function this.InitShowState()
|
||||
|
|
|
|||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 46443a67ca89fda478e8c99134e8aedd
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -5,6 +5,7 @@ local this = MissionManager
|
|||
local EventPointConfig = ConfigManager.GetConfig(ConfigName.EventPointConfig)
|
||||
local carBonMissionData = ConfigManager.GetConfig(ConfigName.ChallengeMissionConfig)
|
||||
local MapPointConfig = ConfigManager.GetConfig(ConfigName.MapPointConfig)
|
||||
local FoodsConfig = ConfigManager.GetConfig(ConfigName.FoodsConfig)
|
||||
-- 精英怪panel
|
||||
local monsterPanel = require("Modules/EliteMonster/MonsterShowPanel")
|
||||
this.MissionState = {} -- 已经开启的任务
|
||||
|
|
@ -324,12 +325,15 @@ local directFight = function(showType, eventId, showValues, options)
|
|||
NetManager.QuickFightRequest(function(msg)
|
||||
CarbonManager.InitQuickFightData(monsterGroupId, eventId, msg)
|
||||
--更新精气值
|
||||
MapTrialManager.UpdatePowerValue(msg.essenceValue)
|
||||
-- LogGreen("战斗后的更新精气值:"..msg.essenceValue)
|
||||
-- MapTrialManager.UpdatePowerValue(msg.essenceValue)--这句话会调用之后的event,导致召唤boss特效播放两次,直接把精气值付上就好了
|
||||
MapTrialManager.powerValue = msg.essenceValue
|
||||
--更新英雄HP
|
||||
MapTrialManager.SetHeroHp(msg.remainHpList,MapTrialManager.selectHeroDid)
|
||||
--召唤Boss
|
||||
-- --召唤Boss
|
||||
if CarbonManager.difficulty == CARBON_TYPE.TRIAL and MapTrialManager.powerValue >= 100 then
|
||||
MapTrialManager.isHaveBoss = true
|
||||
LogGreen("召唤boss的更新精气值"..MapTrialManager.powerValue)
|
||||
MapTrialManager.UpdatePowerValue(0)
|
||||
end
|
||||
end)
|
||||
|
|
@ -526,17 +530,22 @@ function this.GetAllRewardTrigger()
|
|||
-- end)
|
||||
Timer.New(function ()
|
||||
for key, value in pairs(MapManager.mapPointList) do
|
||||
LogPink("["..key.."] "..value)
|
||||
-- LogPink("["..key.."] "..value)
|
||||
if value==2000000 then
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.Map.PointRemove,key)--删除全部宝箱点
|
||||
end
|
||||
-- if EventPointConfig[value].ShowType == 17 then
|
||||
-- Game.GlobalEvent:DispatchEvent(GameEvent.Map.PointRemove,key)--删除所有的buff点
|
||||
-- end
|
||||
if MapPointConfig[value].Style == 9 then
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.Map.PointRemove,key)--删除所有的buff点
|
||||
end
|
||||
end
|
||||
|
||||
UIManager.OpenPanel(UIName.RewardItemPopup,msg.boxDrop,1,function()
|
||||
for i = 1, #msg.buffIds do--buff加成Tips
|
||||
PopupTipPanel.ShowTip(FoodsConfig[msg.buffIds[i]].Desc)
|
||||
end
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.Event.PointTriggerEnd)
|
||||
end)
|
||||
|
||||
end , 3):Start()
|
||||
end)
|
||||
end
|
||||
|
|
|
|||
|
|
@ -672,16 +672,16 @@ function this.RefreshExpeditionNodeAndHeros(buffer)
|
|||
local data = buffer:DataByte()
|
||||
local msg = Expedition_pb.ExpeditionNodeInfoIndication()
|
||||
msg:ParseFromString(data)
|
||||
--if msg.nodeInfo then
|
||||
-- Log(" ******* 推送更新远征 msg.nodeInfo "..#msg.nodeInfo)
|
||||
--else
|
||||
-- Log(" ******* 推送更新远征 msg.nodeInfo nil")
|
||||
--end
|
||||
--if msg.heroInfo then
|
||||
-- Log(" ******* 推送更新远征 msg.heroInfo "..#msg.heroInfo)
|
||||
--else
|
||||
-- Log(" ******* 推送更新远征 msg.heroInfo nil")
|
||||
--end
|
||||
-- if msg.nodeInfo then
|
||||
-- LogGreen(" ******* 推送更新远征 msg.nodeInfo "..#msg.nodeInfo)
|
||||
-- else
|
||||
-- LogGreen(" ******* 推送更新远征 msg.nodeInfo nil")
|
||||
-- end
|
||||
-- if msg.heroInfo then
|
||||
-- LogGreen(" ******* 推送更新远征 msg.heroInfo "..#msg.heroInfo)
|
||||
-- else
|
||||
-- LogGreen(" ******* 推送更新远征 msg.heroInfo nil")
|
||||
-- end
|
||||
ExpeditionManager.UpdateHeroHpValue(msg.heroInfo)
|
||||
ExpeditionManager.UpdateNodeValue(msg.nodeInfo)
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
local isLog = false
|
||||
local isLog = true
|
||||
local function __DebugLog(str)
|
||||
if isLog then
|
||||
Log("<color=#aa55aa>" .. str .. "</color>")
|
||||
|
|
|
|||
|
|
@ -146,7 +146,7 @@ function BattleWinPopup:NextStep()
|
|||
Game.GlobalEvent:DispatchEvent(GameEvent.Expedition.RefreshPlayAniMainPanel)
|
||||
end
|
||||
end, 0,true,true)
|
||||
end
|
||||
end
|
||||
end,func2)
|
||||
end
|
||||
elseif m_fightType==9 then
|
||||
|
|
|
|||
|
|
@ -125,9 +125,6 @@ function this.OnShowData()
|
|||
end
|
||||
end
|
||||
end
|
||||
|
||||
LogGreen("curJewelResonanceConfig "..curJewelResonanceConfig.Id)
|
||||
LogGreen("nextJewelResonanceConfig "..nextJewelResonanceConfig.Id)
|
||||
--curJewelResonanceConfig = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.JewelResonanceConfig,"Type",curTabIndex,"SortId",nextJewelResonanceConfig.SortId - 1)
|
||||
for i = 1, #curHeroData.jewels do
|
||||
this.OnShowSingleEquipTreasure(equipTreasureList[i],curHeroData.jewels[i])
|
||||
|
|
|
|||
|
|
@ -152,7 +152,7 @@ function RoleEquipPanel:BindEvent()
|
|||
end
|
||||
)
|
||||
|
||||
Util.AddClick(
|
||||
Util.AddOnceClick(
|
||||
this.allEquipDown,
|
||||
function()
|
||||
this:AllEquipDownBtnOnClick()
|
||||
|
|
@ -335,13 +335,13 @@ function this:AllEquipUpBtnOnClick()
|
|||
end
|
||||
end
|
||||
if equiData.idDyn then
|
||||
--end
|
||||
--if (curHeroEquipDatas[index] and equiData.idDyn ~= curHeroEquipDatas[index].idDyn) or not curHeroEquipDatas[index] then
|
||||
table.insert(allTreasureIds, equiData.idDyn)
|
||||
--end
|
||||
table.insert(allTreasureIds, equiData.idDyn)
|
||||
else
|
||||
--if (curHeroEquipDatas[index] and equiData.did ~= curHeroEquipDatas[index].did) or not curHeroEquipDatas[index] then
|
||||
table.insert(allEquipIds, equiData.did)
|
||||
--end
|
||||
--if (curHeroEquipDatas[index] and equiData.did ~= curHeroEquipDatas[index].did) or not curHeroEquipDatas[index] then
|
||||
table.insert(allEquipIds, equiData.did)
|
||||
end
|
||||
--特效
|
||||
if curHeroEquipDatas[index] then
|
||||
|
|
@ -403,9 +403,9 @@ function this:AllEquipUpBtnOnClick()
|
|||
end
|
||||
else
|
||||
if allTreasureIds and #allTreasureIds > 0 and not isCanUpEquipTreasure then
|
||||
PopupTipPanel.ShowTip(equiptip) --没有装备可装备!
|
||||
PopupTipPanel.ShowTip(equiptip) --没有装备可装备!
|
||||
else
|
||||
PopupTipPanel.ShowTip(Language[11826]) --没有装备可装备!
|
||||
PopupTipPanel.ShowTip(Language[11826]) --没有装备可装备!
|
||||
end
|
||||
end
|
||||
PlaySoundWithoutClick(SoundConfig.Sound_Wear)
|
||||
|
|
@ -414,29 +414,29 @@ end
|
|||
|
||||
--一键卸下
|
||||
function this:AllEquipDownBtnOnClick()
|
||||
if curHeroData.equipIdList and #curHeroData.equipIdList > 0 then
|
||||
NetManager.EquipUnLoadOptRequest(
|
||||
curHeroData.dynamicId,
|
||||
curHeroData.equipIdList,
|
||||
1,
|
||||
function()
|
||||
this.UpdateEquipPosHeroData(1, 5, curHeroData.equipIdList)
|
||||
end
|
||||
)
|
||||
else
|
||||
PopupTipPanel.ShowTip(Language[11828])
|
||||
end
|
||||
--寶物
|
||||
if curHeroData.jewels and #curHeroData.jewels > 0 then
|
||||
-- 一键卸下音效
|
||||
NetManager.EquipUnLoadOptRequest(
|
||||
curHeroData.dynamicId,
|
||||
curHeroData.jewels,
|
||||
2,
|
||||
function()
|
||||
this.UpdateEquipPosHeroData(2, 5, curHeroData.jewels)
|
||||
end
|
||||
)
|
||||
if (curHeroData.equipIdList and #curHeroData.equipIdList > 0) or (curHeroData.jewels and #curHeroData.jewels > 0 and isCanUpEquipTreasure) then
|
||||
if curHeroData.equipIdList and #curHeroData.equipIdList > 0 then
|
||||
NetManager.EquipUnLoadOptRequest(
|
||||
curHeroData.dynamicId,
|
||||
curHeroData.equipIdList,
|
||||
1,
|
||||
function()
|
||||
this.UpdateEquipPosHeroData(1, 5, curHeroData.equipIdList)
|
||||
end
|
||||
)
|
||||
end
|
||||
--寶物
|
||||
if curHeroData.jewels and #curHeroData.jewels > 0 then
|
||||
-- 一键卸下音效
|
||||
NetManager.EquipUnLoadOptRequest(
|
||||
curHeroData.dynamicId,
|
||||
curHeroData.jewels,
|
||||
2,
|
||||
function()
|
||||
this.UpdateEquipPosHeroData(2, 5, curHeroData.jewels)
|
||||
end
|
||||
)
|
||||
end
|
||||
else
|
||||
PopupTipPanel.ShowTip(Language[11828])
|
||||
end
|
||||
|
|
@ -461,11 +461,11 @@ function this.ShowHeroEquip()
|
|||
this.treasurePage1.gameObject:SetActive(true)
|
||||
this.treasurePage2.gameObject:SetActive(true)
|
||||
else
|
||||
if PlayerManager.level < tonumber(lvs[2]) then
|
||||
equiptip= PopupTipPanel.ShowTip(string.format(Language[11829],lvs[2]))
|
||||
elseif curHeroData.star < tonumber(stars[2]) then
|
||||
equiptip=PopupTipPanel.ShowTip(string.format(Language[11830],stars[2]))
|
||||
end
|
||||
-- if PlayerManager.level < tonumber(lvs[2]) then
|
||||
-- equiptip = PopupTipPanel.ShowTip(string.format(Language[11829], lvs[2]))
|
||||
-- elseif curHeroData.star < tonumber(stars[2]) then
|
||||
-- equiptip = PopupTipPanel.ShowTip(string.format(Language[11830], stars[2]))
|
||||
-- end
|
||||
isCanUpEquipTreasure = false
|
||||
this.equipTreasureBtn.gameObject:SetActive(false)
|
||||
this.treasure1.gameObject:SetActive(false)
|
||||
|
|
@ -782,6 +782,7 @@ function this.SingleItemDataShow(_go, _itemData)
|
|||
else
|
||||
redPoint:SetActive(false)
|
||||
end
|
||||
Util.GetGameObject(_go.transform, "num"):SetActive(true)
|
||||
Util.GetGameObject(_go.transform, "num"):GetComponent("Text").text = _itemData.num
|
||||
Util.AddOnceClick(
|
||||
Util.GetGameObject(_go.transform, "icon"),
|
||||
|
|
|
|||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: cdf11c4964e54cd46a5196a33f53470a
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -2201,3 +2201,9 @@
|
|||
12201,保留
|
||||
12202,贪婪节点无数据
|
||||
12203,您已完成求援!
|
||||
12204,赛季挑战奖励
|
||||
12205,挑战次数
|
||||
12206,此阶段只允许调整已上阵神将的位置!
|
||||
12207,未知
|
||||
12208,已被淘汰
|
||||
12209,等待其他战斗结束
|
||||
|
|
|
|||
|
Loading…
Reference in New Issue