Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
ad84124cd9
Binary file not shown.
After Width: | Height: | Size: 23 KiB |
|
@ -0,0 +1,99 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: dae020383bdcc984181454272ae9010e
|
||||||
|
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
|
||||||
|
spriteSheet:
|
||||||
|
serializedVersion: 2
|
||||||
|
sprites: []
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
bones: []
|
||||||
|
spriteID: 302677d860d568a4883a338408752efa
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
spritePackingTag: JourneyWithWindAtlas
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
|
@ -447,12 +447,12 @@ RectTransform:
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 1378783025926114137}
|
m_GameObject: {fileID: 1378783025926114137}
|
||||||
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_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 8409172568512909101}
|
m_Father: {fileID: 8409172568512909101}
|
||||||
m_RootOrder: 1
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
|
@ -1074,6 +1074,81 @@ CanvasRenderer:
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 2739825067753896380}
|
m_GameObject: {fileID: 2739825067753896380}
|
||||||
m_CullTransparentMesh: 0
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!1 &3072366347672489437
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 1772487640007916265}
|
||||||
|
- component: {fileID: 2595780383356124473}
|
||||||
|
- component: {fileID: 5408543814902697810}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: Image (2)
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &1772487640007916265
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3072366347672489437}
|
||||||
|
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:
|
||||||
|
- {fileID: 5872294087121906900}
|
||||||
|
m_Father: {fileID: 8409172568512909101}
|
||||||
|
m_RootOrder: 1
|
||||||
|
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: -100}
|
||||||
|
m_SizeDelta: {x: 150, y: 59}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &2595780383356124473
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3072366347672489437}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &5408543814902697810
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3072366347672489437}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
tweenSequeue:
|
||||||
|
- initV3: {x: 1, y: 1, z: 1}
|
||||||
|
initFloat: 0
|
||||||
|
isInit: 1
|
||||||
|
changeV3: {x: 0, y: 0, z: 0}
|
||||||
|
changeFloat: 1
|
||||||
|
duration: 1
|
||||||
|
delay: 0
|
||||||
|
curveType: 1
|
||||||
|
changeType: 8
|
||||||
|
sequeueType: 1
|
||||||
|
loop: 9999
|
||||||
|
loopType: 1
|
||||||
|
targetObj: {fileID: 1772487640007916265}
|
||||||
|
isPlayAudio: 1
|
||||||
|
isHaveCloseBtn: 0
|
||||||
|
isPlayOnOpen: 1
|
||||||
--- !u!1 &3076445599443730532
|
--- !u!1 &3076445599443730532
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -1109,6 +1184,81 @@ RectTransform:
|
||||||
m_AnchoredPosition: {x: 0, y: -77}
|
m_AnchoredPosition: {x: 0, y: -77}
|
||||||
m_SizeDelta: {x: 100, y: 100}
|
m_SizeDelta: {x: 100, y: 100}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!1 &3404209762584022943
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 2660594101558660080}
|
||||||
|
- component: {fileID: 8427039525036040954}
|
||||||
|
- component: {fileID: 8371592766176110449}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: Image (2)
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &2660594101558660080
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3404209762584022943}
|
||||||
|
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:
|
||||||
|
- {fileID: 2459407988660990100}
|
||||||
|
m_Father: {fileID: 1286930496005008643}
|
||||||
|
m_RootOrder: 1
|
||||||
|
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: 128, y: 128}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &8427039525036040954
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3404209762584022943}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &8371592766176110449
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3404209762584022943}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
tweenSequeue:
|
||||||
|
- initV3: {x: 1, y: 1, z: 1}
|
||||||
|
initFloat: 0
|
||||||
|
isInit: 1
|
||||||
|
changeV3: {x: 0, y: 0, z: 0}
|
||||||
|
changeFloat: 1
|
||||||
|
duration: 1
|
||||||
|
delay: 0
|
||||||
|
curveType: 1
|
||||||
|
changeType: 8
|
||||||
|
sequeueType: 1
|
||||||
|
loop: 9999
|
||||||
|
loopType: 1
|
||||||
|
targetObj: {fileID: 2660594101558660080}
|
||||||
|
isPlayAudio: 1
|
||||||
|
isHaveCloseBtn: 0
|
||||||
|
isPlayOnOpen: 1
|
||||||
--- !u!1 &3441141328000660988
|
--- !u!1 &3441141328000660988
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -1678,16 +1828,16 @@ RectTransform:
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 4242245080449740512}
|
m_GameObject: {fileID: 4242245080449740512}
|
||||||
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_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 8409172568512909101}
|
m_Father: {fileID: 1772487640007916265}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 100}
|
||||||
m_SizeDelta: {x: 94, y: 128}
|
m_SizeDelta: {x: 94, y: 128}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &5062665365094852757
|
--- !u!222 &5062665365094852757
|
||||||
|
@ -3137,7 +3287,6 @@ GameObject:
|
||||||
- component: {fileID: 1493999286873637050}
|
- component: {fileID: 1493999286873637050}
|
||||||
- component: {fileID: 6084527919098984606}
|
- component: {fileID: 6084527919098984606}
|
||||||
- component: {fileID: 3681248012797201854}
|
- component: {fileID: 3681248012797201854}
|
||||||
- component: {fileID: 3329096029264420244}
|
|
||||||
m_Layer: 0
|
m_Layer: 0
|
||||||
m_Name: lastBtn
|
m_Name: lastBtn
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
|
@ -3156,8 +3305,8 @@ RectTransform:
|
||||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 2459407988660990100}
|
|
||||||
- {fileID: 5101332028863551494}
|
- {fileID: 5101332028863551494}
|
||||||
|
- {fileID: 2660594101558660080}
|
||||||
m_Father: {fileID: 7783183355034074848}
|
m_Father: {fileID: 7783183355034074848}
|
||||||
m_RootOrder: 9
|
m_RootOrder: 9
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
@ -3235,35 +3384,6 @@ Animator:
|
||||||
m_HasTransformHierarchy: 1
|
m_HasTransformHierarchy: 1
|
||||||
m_AllowConstantClipSamplingOptimization: 1
|
m_AllowConstantClipSamplingOptimization: 1
|
||||||
m_KeepAnimatorControllerStateOnDisable: 0
|
m_KeepAnimatorControllerStateOnDisable: 0
|
||||||
--- !u!114 &3329096029264420244
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 6570445857952205258}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
tweenSequeue:
|
|
||||||
- initV3: {x: 1, y: 1, z: 1}
|
|
||||||
initFloat: 0
|
|
||||||
isInit: 1
|
|
||||||
changeV3: {x: 0, y: 0, z: 0}
|
|
||||||
changeFloat: 1
|
|
||||||
duration: 1
|
|
||||||
delay: 0
|
|
||||||
curveType: 1
|
|
||||||
changeType: 6
|
|
||||||
sequeueType: 1
|
|
||||||
loop: 9999
|
|
||||||
loopType: 1
|
|
||||||
targetObj: {fileID: 1286930496005008643}
|
|
||||||
isPlayAudio: 1
|
|
||||||
isHaveCloseBtn: 0
|
|
||||||
isPlayOnOpen: 1
|
|
||||||
--- !u!1 &6637538757221109800
|
--- !u!1 &6637538757221109800
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -4121,12 +4241,12 @@ RectTransform:
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 7994280117608676722}
|
m_GameObject: {fileID: 7994280117608676722}
|
||||||
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_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 1286930496005008643}
|
m_Father: {fileID: 1286930496005008643}
|
||||||
m_RootOrder: 1
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
|
@ -4651,7 +4771,6 @@ GameObject:
|
||||||
- component: {fileID: 2134566851992163499}
|
- component: {fileID: 2134566851992163499}
|
||||||
- component: {fileID: 5576907499012313130}
|
- component: {fileID: 5576907499012313130}
|
||||||
- component: {fileID: 7433405758095042398}
|
- component: {fileID: 7433405758095042398}
|
||||||
- component: {fileID: 3234496415948374011}
|
|
||||||
m_Layer: 0
|
m_Layer: 0
|
||||||
m_Name: nextBtn
|
m_Name: nextBtn
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
|
@ -4670,8 +4789,8 @@ RectTransform:
|
||||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 5872294087121906900}
|
|
||||||
- {fileID: 367888755464226821}
|
- {fileID: 367888755464226821}
|
||||||
|
- {fileID: 1772487640007916265}
|
||||||
m_Father: {fileID: 7783183355034074848}
|
m_Father: {fileID: 7783183355034074848}
|
||||||
m_RootOrder: 10
|
m_RootOrder: 10
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
@ -4749,35 +4868,6 @@ Animator:
|
||||||
m_HasTransformHierarchy: 1
|
m_HasTransformHierarchy: 1
|
||||||
m_AllowConstantClipSamplingOptimization: 1
|
m_AllowConstantClipSamplingOptimization: 1
|
||||||
m_KeepAnimatorControllerStateOnDisable: 0
|
m_KeepAnimatorControllerStateOnDisable: 0
|
||||||
--- !u!114 &3234496415948374011
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 8762792662642909041}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
tweenSequeue:
|
|
||||||
- initV3: {x: 1, y: 1, z: 1}
|
|
||||||
initFloat: 0
|
|
||||||
isInit: 1
|
|
||||||
changeV3: {x: 0, y: 0, z: 0}
|
|
||||||
changeFloat: 1
|
|
||||||
duration: 1
|
|
||||||
delay: 0
|
|
||||||
curveType: 1
|
|
||||||
changeType: 6
|
|
||||||
sequeueType: 1
|
|
||||||
loop: 9999
|
|
||||||
loopType: 1
|
|
||||||
targetObj: {fileID: 8409172568512909101}
|
|
||||||
isPlayAudio: 1
|
|
||||||
isHaveCloseBtn: 0
|
|
||||||
isPlayOnOpen: 1
|
|
||||||
--- !u!1 &8900825050447244874
|
--- !u!1 &8900825050447244874
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -5041,11 +5131,11 @@ RectTransform:
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 9007390229894132990}
|
m_GameObject: {fileID: 9007390229894132990}
|
||||||
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_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 1286930496005008643}
|
m_Father: {fileID: 2660594101558660080}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,7 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 863b74a1a8b458748977596f8f44a56c
|
||||||
|
PrefabImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
|
@ -17388,6 +17388,10 @@ MonoBehaviour:
|
||||||
extension: .png
|
extension: .png
|
||||||
resPathIndex: 69
|
resPathIndex: 69
|
||||||
resAbNameIndex: 35
|
resAbNameIndex: 35
|
||||||
|
- resName: z_zhandou_liuxue_zh
|
||||||
|
extension: .png
|
||||||
|
resPathIndex: 69
|
||||||
|
resAbNameIndex: 35
|
||||||
- resName: z_zhandou_mabizi_zh
|
- resName: z_zhandou_mabizi_zh
|
||||||
extension: .png
|
extension: .png
|
||||||
resPathIndex: 69
|
resPathIndex: 69
|
||||||
|
@ -17472,6 +17476,10 @@ MonoBehaviour:
|
||||||
extension: .png
|
extension: .png
|
||||||
resPathIndex: 69
|
resPathIndex: 69
|
||||||
resAbNameIndex: 35
|
resAbNameIndex: 35
|
||||||
|
- resName: z_zhandou_shenyou_zh
|
||||||
|
extension: .png
|
||||||
|
resPathIndex: 69
|
||||||
|
resAbNameIndex: 35
|
||||||
- resName: z_zhandou_weimingzhong_zh
|
- resName: z_zhandou_weimingzhong_zh
|
||||||
extension: .png
|
extension: .png
|
||||||
resPathIndex: 69
|
resPathIndex: 69
|
||||||
|
@ -19276,6 +19284,10 @@ MonoBehaviour:
|
||||||
extension: .png
|
extension: .png
|
||||||
resPathIndex: 85
|
resPathIndex: 85
|
||||||
resAbNameIndex: 45
|
resAbNameIndex: 45
|
||||||
|
- resName: p_piaomialzhilv_banzi21
|
||||||
|
extension: .png
|
||||||
|
resPathIndex: 85
|
||||||
|
resAbNameIndex: 45
|
||||||
- resName: p_piaomialzhilv_banzi3
|
- resName: p_piaomialzhilv_banzi3
|
||||||
extension: .png
|
extension: .png
|
||||||
resPathIndex: 85
|
resPathIndex: 85
|
||||||
|
@ -22700,6 +22712,22 @@ MonoBehaviour:
|
||||||
extension: .png
|
extension: .png
|
||||||
resPathIndex: 119
|
resPathIndex: 119
|
||||||
resAbNameIndex: 62
|
resAbNameIndex: 62
|
||||||
|
- resName: t_tequan_jiantou01
|
||||||
|
extension: .png
|
||||||
|
resPathIndex: 119
|
||||||
|
resAbNameIndex: 62
|
||||||
|
- resName: t_tequan_jiantou02
|
||||||
|
extension: .png
|
||||||
|
resPathIndex: 119
|
||||||
|
resAbNameIndex: 62
|
||||||
|
- resName: t_tequan_shangyiceng
|
||||||
|
extension: .png
|
||||||
|
resPathIndex: 119
|
||||||
|
resAbNameIndex: 62
|
||||||
|
- resName: t_tequan_xiayiceng
|
||||||
|
extension: .png
|
||||||
|
resPathIndex: 119
|
||||||
|
resAbNameIndex: 62
|
||||||
- resName: c_chouka_baoxiangdi
|
- resName: c_chouka_baoxiangdi
|
||||||
extension: .png
|
extension: .png
|
||||||
resPathIndex: 120
|
resPathIndex: 120
|
||||||
|
@ -25272,6 +25300,10 @@ MonoBehaviour:
|
||||||
extension: .png
|
extension: .png
|
||||||
resPathIndex: 158
|
resPathIndex: 158
|
||||||
resAbNameIndex: 82
|
resAbNameIndex: 82
|
||||||
|
- resName: b_baibaoshenghui_banner
|
||||||
|
extension: .jpg
|
||||||
|
resPathIndex: 159
|
||||||
|
resAbNameIndex: 82
|
||||||
- resName: b_baibao_fuzi_zh
|
- resName: b_baibao_fuzi_zh
|
||||||
extension: .png
|
extension: .png
|
||||||
resPathIndex: 159
|
resPathIndex: 159
|
||||||
|
@ -31436,6 +31468,10 @@ MonoBehaviour:
|
||||||
extension: .png
|
extension: .png
|
||||||
resPathIndex: 227
|
resPathIndex: 227
|
||||||
resAbNameIndex: 1345
|
resAbNameIndex: 1345
|
||||||
|
- resName: y_yueka_di004
|
||||||
|
extension: .png
|
||||||
|
resPathIndex: 227
|
||||||
|
resAbNameIndex: 1345
|
||||||
- resName: z_zaixianjiangli_ban
|
- resName: z_zaixianjiangli_ban
|
||||||
extension: .png
|
extension: .png
|
||||||
resPathIndex: 228
|
resPathIndex: 228
|
||||||
|
@ -35576,6 +35612,10 @@ MonoBehaviour:
|
||||||
extension: .png
|
extension: .png
|
||||||
resPathIndex: 243
|
resPathIndex: 243
|
||||||
resAbNameIndex: 2362
|
resAbNameIndex: 2362
|
||||||
|
- resName: l_yueka_zhiliyueka_zh
|
||||||
|
extension: .png
|
||||||
|
resPathIndex: 243
|
||||||
|
resAbNameIndex: 2362
|
||||||
- resName: n_niuzhuanqiankun_qian02_zh
|
- resName: n_niuzhuanqiankun_qian02_zh
|
||||||
extension: .png
|
extension: .png
|
||||||
resPathIndex: 243
|
resPathIndex: 243
|
||||||
|
@ -57272,6 +57312,10 @@ MonoBehaviour:
|
||||||
extension: .prefab
|
extension: .prefab
|
||||||
resPathIndex: 703
|
resPathIndex: 703
|
||||||
resAbNameIndex: 3197
|
resAbNameIndex: 3197
|
||||||
|
- resName: PracticeSkillInfoPanel
|
||||||
|
extension: .prefab
|
||||||
|
resPathIndex: 703
|
||||||
|
resAbNameIndex: 3197
|
||||||
- resName: PrayMainPanel
|
- resName: PrayMainPanel
|
||||||
extension: .prefab
|
extension: .prefab
|
||||||
resPathIndex: 704
|
resPathIndex: 704
|
||||||
|
@ -57676,6 +57720,10 @@ MonoBehaviour:
|
||||||
extension: .prefab
|
extension: .prefab
|
||||||
resPathIndex: 735
|
resPathIndex: 735
|
||||||
resAbNameIndex: 3225
|
resAbNameIndex: 3225
|
||||||
|
- resName: TreasureStoreSeason2
|
||||||
|
extension: .prefab
|
||||||
|
resPathIndex: 735
|
||||||
|
resAbNameIndex: 3225
|
||||||
- resName: CommonConfirmPanel
|
- resName: CommonConfirmPanel
|
||||||
extension: .prefab
|
extension: .prefab
|
||||||
resPathIndex: 736
|
resPathIndex: 736
|
||||||
|
@ -77075,6 +77123,9 @@ MonoBehaviour:
|
||||||
- lz4/dynamicatlas/commonatlas/s_slbz_anniu.unity3d
|
- lz4/dynamicatlas/commonatlas/s_slbz_anniu.unity3d
|
||||||
- lz4/dynamicatlas/commonatlas/y_yijingbaoku_qiehuan.unity3d
|
- lz4/dynamicatlas/commonatlas/y_yijingbaoku_qiehuan.unity3d
|
||||||
- lz4/dynamicatlas/l_libao_kuang.unity3d
|
- lz4/dynamicatlas/l_libao_kuang.unity3d
|
||||||
|
- lz4/dynamicatlas/r_hunyin_hunyinkuanghong.unity3d
|
||||||
|
- lz4/dynamicatlas/r_hunyin_hunyinkuanghuang001.unity3d
|
||||||
|
- lz4/dynamicatlas/r_tanchuang_chuangkou_001.unity3d
|
||||||
- lz4/dynamicatlas/r_tanchuang_erji_001.unity3d
|
- lz4/dynamicatlas/r_tanchuang_erji_001.unity3d
|
||||||
- lz4/dynamicatlas/r_tanchuang_erji_002.unity3d
|
- lz4/dynamicatlas/r_tanchuang_erji_002.unity3d
|
||||||
- lz4/dynamicatlas/r_tongyong_xiaanniu_di.unity3d
|
- lz4/dynamicatlas/r_tongyong_xiaanniu_di.unity3d
|
||||||
|
@ -77717,7 +77768,12 @@ MonoBehaviour:
|
||||||
- assetBundleName: lz4/prefabs/ui/treasurestore.unity3d
|
- assetBundleName: lz4/prefabs/ui/treasurestore.unity3d
|
||||||
dependences:
|
dependences:
|
||||||
- lz4/atlas/baibaoshanghuiatlas.unity3d
|
- lz4/atlas/baibaoshanghuiatlas.unity3d
|
||||||
|
- lz4/atlas/publicatlas.unity3d
|
||||||
|
- lz4/atlas/treasurestoreatlas.unity3d
|
||||||
|
- lz4/dynamicatlas/commonatlas/l_mrlb_biaoqian.unity3d
|
||||||
|
- lz4/dynamicatlas/commonatlas/s_slbz_1anniuhuangse.unity3d
|
||||||
- lz4/dynamicatlas/commonatlas/y_yueka_hongxian.unity3d
|
- lz4/dynamicatlas/commonatlas/y_yueka_hongxian.unity3d
|
||||||
|
- lz4/dynamicatlas/l_libao_kuang.unity3d
|
||||||
- lz4/dynamicatlas/s_shouchong_anniu.unity3d
|
- lz4/dynamicatlas/s_shouchong_anniu.unity3d
|
||||||
- lz4/effectresui/baibaoshanghui.unity3d
|
- lz4/effectresui/baibaoshanghui.unity3d
|
||||||
- lz4/effectresui/tiangongxunbao.unity3d
|
- lz4/effectresui/tiangongxunbao.unity3d
|
||||||
|
|
|
@ -972,7 +972,10 @@ RedPointType = {
|
||||||
Practice_imprint = 5002,--神印按钮
|
Practice_imprint = 5002,--神印按钮
|
||||||
Practice_fourQua = 5003,--四象心法
|
Practice_fourQua = 5003,--四象心法
|
||||||
Practice_Cultivation = 5004,--主角修为
|
Practice_Cultivation = 5004,--主角修为
|
||||||
|
playerSkill1 = 5100,--主角1技能
|
||||||
|
playerSkill2 = 5200,--主角2技能
|
||||||
|
playerSkill2 = 5300,--主角3技能
|
||||||
|
playerSkill2 = 5400,--主角4技能
|
||||||
wujinMission = 8500,
|
wujinMission = 8500,
|
||||||
wujinTreasure = 8501,
|
wujinTreasure = 8501,
|
||||||
wujinBianDui = 8502,
|
wujinBianDui = 8502,
|
||||||
|
@ -984,6 +987,9 @@ RedPointType = {
|
||||||
|
|
||||||
linglongBaojing = 671,
|
linglongBaojing = 671,
|
||||||
TaiChuMiJuan = 670,
|
TaiChuMiJuan = 670,
|
||||||
|
--玉虚论道
|
||||||
|
WorldArena_reward = 672, --玉虚论道奖励
|
||||||
|
playerSkill = 673, --主角技能
|
||||||
|
|
||||||
LikeabilityRed = 680,
|
LikeabilityRed = 680,
|
||||||
--七界试炼
|
--七界试炼
|
||||||
|
@ -993,9 +999,8 @@ RedPointType = {
|
||||||
YuJianXingMian = 870,--主界面
|
YuJianXingMian = 870,--主界面
|
||||||
YuJianXingTime = 8701,--次数
|
YuJianXingTime = 8701,--次数
|
||||||
YuJianXingRecord = 8702,--纪录
|
YuJianXingRecord = 8702,--纪录
|
||||||
--玉虚论道
|
--新百宝商会
|
||||||
WorldArena_reward = 672, --玉虚论道奖励
|
TreasureStoreSeason2 = 880--主城
|
||||||
playerSkill = 673, --主角技能
|
|
||||||
}
|
}
|
||||||
|
|
||||||
RedPointStatus = {
|
RedPointStatus = {
|
||||||
|
@ -1317,6 +1322,7 @@ ActivityTypeDef = {
|
||||||
DynamicAct_Treasure = 20002,--主题活动珍奇宝阁
|
DynamicAct_Treasure = 20002,--主题活动珍奇宝阁
|
||||||
LimitUpHero = 20003, --限时up活动 (祈愿)
|
LimitUpHero = 20003, --限时up活动 (祈愿)
|
||||||
TreasureStore = 6000,--百宝商会
|
TreasureStore = 6000,--百宝商会
|
||||||
|
TreasureStoreSeason2 = 6001,--新百宝商会
|
||||||
YiJingBaoKu = 8000,--易经宝库
|
YiJingBaoKu = 8000,--易经宝库
|
||||||
|
|
||||||
MeiRiLiBao = 10004,
|
MeiRiLiBao = 10004,
|
||||||
|
|
|
@ -422,6 +422,7 @@ UIName = {
|
||||||
GeneralTreasurePanel=420, --通用秘宝界面
|
GeneralTreasurePanel=420, --通用秘宝界面
|
||||||
YuJianXingPanel = 428,--御剑行界面
|
YuJianXingPanel = 428,--御剑行界面
|
||||||
CultivationPanel = 429,--主角修为界面
|
CultivationPanel = 429,--主角修为界面
|
||||||
|
TreasureStoreSeason2 = 431,--新百宝商会
|
||||||
PracticeSkillInfoPanel = 430, --修行主角技能信息界面
|
PracticeSkillInfoPanel = 430, --修行主角技能信息界面
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -543,7 +543,7 @@ function this.RefreshActivityProgressData(msg)
|
||||||
if missionInfo.missionId == msg.activityInfo.mission[i].missionId then
|
if missionInfo.missionId == msg.activityInfo.mission[i].missionId then
|
||||||
missionInfo.state = msg.activityInfo.mission[i].state
|
missionInfo.state = msg.activityInfo.mission[i].state
|
||||||
missionInfo.progress = msg.activityInfo.mission[i].progress
|
missionInfo.progress = msg.activityInfo.mission[i].progress
|
||||||
LogYellow(msg.activityInfo.activityId.." 刷新活动数据missionId:" .. missionInfo.missionId .. "state:" .. missionInfo.state .. "progress:" .. missionInfo.progress)
|
-- LogYellow(msg.activityInfo.activityId.." 刷新活动数据missionId:" .. missionInfo.missionId .. "state:" .. missionInfo.state .. "progress:" .. missionInfo.progress)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -1377,4 +1377,18 @@ function this.CheckSupremeMission(indexType,isHaveBigReward)
|
||||||
return isAllGet
|
return isAllGet
|
||||||
end
|
end
|
||||||
|
|
||||||
|
--新百宝商会红点检测
|
||||||
|
function this.TreasureStoreSeason2RedCheck()
|
||||||
|
local data = CommonActPageManager.GetData(ActivityTypeDef.TreasureStoreSeason2)
|
||||||
|
for i = 1, #data.FreelyData do
|
||||||
|
for j = 1, #data.FreelyData[i] do
|
||||||
|
local data = data.FreelyData[i][j]
|
||||||
|
if data.progress == 1 and data.Price == 0 then
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
return false
|
||||||
|
end
|
||||||
|
|
||||||
return this
|
return this
|
|
@ -69,6 +69,9 @@ function BattleAnalysisManager:OnAddRole(role)
|
||||||
data.info = role
|
data.info = role
|
||||||
end
|
end
|
||||||
function BattleAnalysisManager:OnAddMonster(monster)
|
function BattleAnalysisManager:OnAddMonster(monster)
|
||||||
|
if monster.uid==20100 then
|
||||||
|
monster.type=1
|
||||||
|
end
|
||||||
local data = self:GetRecordData(monster)
|
local data = self:GetRecordData(monster)
|
||||||
data.info = monster
|
data.info = monster
|
||||||
end
|
end
|
||||||
|
|
|
@ -150,7 +150,7 @@ function this.GetBattleBestData(Id)
|
||||||
-- 怪物只显示最后一层的怪物信息
|
-- 怪物只显示最后一层的怪物信息
|
||||||
if data.info and data.info.camp == 0 then
|
if data.info and data.info.camp == 0 then
|
||||||
-- 计算最大值(不计算异妖的)
|
-- 计算最大值(不计算异妖的)
|
||||||
if data.info.type == BattleUnitType.Role then
|
if data.info.type == BattleUnitType.Role and data.info.position<7 then
|
||||||
if data.damage > _MaxDamageValue then
|
if data.damage > _MaxDamageValue then
|
||||||
_MaxDamageData = {
|
_MaxDamageData = {
|
||||||
roleId = data.info.roleData.roleId,
|
roleId = data.info.roleData.roleId,
|
||||||
|
|
|
@ -325,7 +325,8 @@ function this.HeadAdapter(head, data)
|
||||||
local lv = Util.GetGameObject(head, "lv")
|
local lv = Util.GetGameObject(head, "lv")
|
||||||
local lvText = Util.GetGameObject(head, "lv/Text"):GetComponent("Text")
|
local lvText = Util.GetGameObject(head, "lv/Text"):GetComponent("Text")
|
||||||
local starRoot = Util.GetGameObject(head, "star")
|
local starRoot = Util.GetGameObject(head, "star")
|
||||||
|
local aa=0
|
||||||
|
local frameStr="r_characterbg_goden"
|
||||||
if data.type == BattleUnitType.Role then
|
if data.type == BattleUnitType.Role then
|
||||||
local roleId = data.roleData.monsterId or data.roleData.roleId
|
local roleId = data.roleData.monsterId or data.roleData.roleId
|
||||||
local roleLv = data:GetRoleData(RoleDataName.Level)
|
local roleLv = data:GetRoleData(RoleDataName.Level)
|
||||||
|
@ -333,31 +334,43 @@ function this.HeadAdapter(head, data)
|
||||||
local star = data.star
|
local star = data.star
|
||||||
|
|
||||||
local config = {}
|
local config = {}
|
||||||
if roleId > 10100 then
|
if data.position==100 then
|
||||||
local MonsterConfig = ConfigManager.GetConfigData(ConfigName.MonsterConfig, roleId)
|
config.Quality=4
|
||||||
config.Quality = MonsterConfig.Quality
|
if NameManager.roleSex==ROLE_SEX.BOY then
|
||||||
config.lv = MonsterConfig.Level
|
aa=3201
|
||||||
star=MonsterConfig.Star
|
else
|
||||||
if MonsterConfig.MonsterId > 10000 then
|
aa=3202
|
||||||
local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, MonsterConfig.MonsterId)
|
end
|
||||||
|
config.lv=PlayerManager.level
|
||||||
|
star=0
|
||||||
|
else
|
||||||
|
if roleId > 10100 then
|
||||||
|
local MonsterConfig = ConfigManager.GetConfigData(ConfigName.MonsterConfig, roleId)
|
||||||
|
config.Quality = MonsterConfig.Quality
|
||||||
|
config.lv = MonsterConfig.Level
|
||||||
|
star=MonsterConfig.Star
|
||||||
|
if MonsterConfig.MonsterId > 10000 then
|
||||||
|
local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, MonsterConfig.MonsterId)
|
||||||
|
config.Icon = heroConfig.Icon
|
||||||
|
config.Profession = heroConfig.Profession
|
||||||
|
config.PropertyName = heroConfig.PropertyName
|
||||||
|
else
|
||||||
|
local monsterViewInfo = ConfigManager.GetConfigData(ConfigName.MonsterViewConfig, MonsterConfig.MonsterId)
|
||||||
|
config.Icon = monsterViewInfo.MonsterIcon
|
||||||
|
end
|
||||||
|
else
|
||||||
|
local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, roleId)
|
||||||
|
config.Quality = heroConfig.Quality
|
||||||
config.Icon = heroConfig.Icon
|
config.Icon = heroConfig.Icon
|
||||||
config.Profession = heroConfig.Profession
|
config.Profession = heroConfig.Profession
|
||||||
config.PropertyName = heroConfig.PropertyName
|
config.PropertyName = heroConfig.PropertyName
|
||||||
else
|
config.lv = roleLv
|
||||||
local monsterViewInfo = ConfigManager.GetConfigData(ConfigName.MonsterViewConfig, MonsterConfig.MonsterId)
|
|
||||||
config.Icon = monsterViewInfo.MonsterIcon
|
|
||||||
end
|
end
|
||||||
else
|
aa=config.Icon
|
||||||
local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, roleId)
|
frameStr=GetHeroQuantityImageByquality(config.Quality, star)
|
||||||
config.Quality = heroConfig.Quality
|
|
||||||
config.Icon = heroConfig.Icon
|
|
||||||
config.Profession = heroConfig.Profession
|
|
||||||
config.PropertyName = heroConfig.PropertyName
|
|
||||||
config.lv = roleLv
|
|
||||||
end
|
end
|
||||||
-- 头像
|
-- 头像
|
||||||
frame.sprite = this.spLoader:LoadSprite(GetHeroQuantityImageByquality(config.Quality, star))
|
frame.sprite = this.spLoader:LoadSprite(frameStr)
|
||||||
local aa=config.Icon
|
|
||||||
if skinId and skinId>0 then
|
if skinId and skinId>0 then
|
||||||
local skinConfig=ConfigManager.GetConfigDataByKey(ConfigName.HeroSkin,"Type",skinId)
|
local skinConfig=ConfigManager.GetConfigDataByKey(ConfigName.HeroSkin,"Type",skinId)
|
||||||
if skinConfig then
|
if skinConfig then
|
||||||
|
|
|
@ -1018,6 +1018,8 @@ function this:TabBtnAction(id,actType,data)
|
||||||
UIManager.OpenPanel(UIName.MissionDailyPanel,2,1)
|
UIManager.OpenPanel(UIName.MissionDailyPanel,2,1)
|
||||||
elseif id == ActivityTypeDef.TreasureStore then
|
elseif id == ActivityTypeDef.TreasureStore then
|
||||||
UIManager.OpenPanel(UIName.TreasureStorePopup)
|
UIManager.OpenPanel(UIName.TreasureStorePopup)
|
||||||
|
elseif id == ActivityTypeDef.TreasureStoreSeason2 then
|
||||||
|
UIManager.OpenPanel(UIName.TreasureStoreSeason2)
|
||||||
elseif id == ActivityTypeDef.DynamicAct then
|
elseif id == ActivityTypeDef.DynamicAct then
|
||||||
-- local dynamicAct = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.DynamicAct)
|
-- local dynamicAct = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.DynamicAct)
|
||||||
-- local curindex = 1
|
-- local curindex = 1
|
||||||
|
|
|
@ -219,7 +219,38 @@ local TypeUpdateFunc = {
|
||||||
table.sort(curData.FreelyData,function (a,b)
|
table.sort(curData.FreelyData,function (a,b)
|
||||||
return a.Id < b.Id
|
return a.Id < b.Id
|
||||||
end)
|
end)
|
||||||
end
|
end,
|
||||||
|
[ActivityTypeDef.TreasureStoreSeason2] = function ()--新百宝商会
|
||||||
|
local curData = dataList[ActivityTypeDef.TreasureStoreSeason2]
|
||||||
|
local configData = ConfigManager.GetAllConfigsDataByKey(ConfigName.SurpriseBoxConfig,"ActivityId",curData.activityId)
|
||||||
|
local rechargeConfig = ConfigManager.GetConfig(ConfigName.RechargeCommodityConfig)
|
||||||
|
for i = 1, #curData.rewards do
|
||||||
|
-- LogRed("missionId:"..tostring(curData.rewards[i].missionId).." progress:"..tostring(curData.rewards[i].progress).." state:"..tostring(curData.rewards[i].state))
|
||||||
|
for j = 1, #configData do
|
||||||
|
if curData.rewards[i].missionId == configData[j].Id then
|
||||||
|
if not curData.FreelyData[configData[j].Sort] then
|
||||||
|
curData.FreelyData[configData[j].Sort] = {}
|
||||||
|
end
|
||||||
|
local tempData = {}
|
||||||
|
tempData.Id = configData[j].Id
|
||||||
|
tempData.PackId = configData[j].PackId
|
||||||
|
tempData.Sort = configData[j].Sort
|
||||||
|
tempData.BuyDay = configData[j].BuyDay
|
||||||
|
tempData.Name = rechargeConfig[configData[j].PackId].Name
|
||||||
|
tempData.Reward = rechargeConfig[configData[j].PackId].RewardShow
|
||||||
|
tempData.Price = rechargeConfig[configData[j].PackId].Price
|
||||||
|
tempData.progress = curData.rewards[i].progress
|
||||||
|
--插入数据2维 [天数][第几个]
|
||||||
|
table.insert(curData.FreelyData[configData[j].Sort],tempData)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
for i = 1,#curData.FreelyData do
|
||||||
|
table.sort(curData.FreelyData[i],function (a,b)
|
||||||
|
return a.Id < b.Id
|
||||||
|
end)
|
||||||
|
end
|
||||||
|
end,
|
||||||
}
|
}
|
||||||
|
|
||||||
--超凡入圣
|
--超凡入圣
|
||||||
|
|
|
@ -587,6 +587,8 @@ function this.RegisterRedCheckFunc()
|
||||||
RPData:AddCheckFunc(RedPointType.LikeabilityRed,LikabilityManager.CheckRedPot)
|
RPData:AddCheckFunc(RedPointType.LikeabilityRed,LikabilityManager.CheckRedPot)
|
||||||
--御剑行
|
--御剑行
|
||||||
RPData:AddCheckFunc(RedPointType.YuJianXingMian,YuJianXingManager.CheckRedPoint)
|
RPData:AddCheckFunc(RedPointType.YuJianXingMian,YuJianXingManager.CheckRedPoint)
|
||||||
|
--新百宝商会
|
||||||
|
RPData:AddCheckFunc(RedPointType.TreasureStoreSeason2,ActivityGiftManager.TreasureStoreSeason2RedCheck)
|
||||||
end
|
end
|
||||||
|
|
||||||
-- 向红点绑定物体
|
-- 向红点绑定物体
|
||||||
|
|
|
@ -0,0 +1,162 @@
|
||||||
|
require("Base/BasePanel")
|
||||||
|
local TreasureStoreSeason2 = Inherit(BasePanel)
|
||||||
|
|
||||||
|
local _DayTipImageFormat = "p_piaomialzhilv_paizi%2d"
|
||||||
|
local _DayItemFormat = "第%s天"
|
||||||
|
local _DayNum = 7
|
||||||
|
|
||||||
|
--初始化组件(用于子类重写)
|
||||||
|
function TreasureStoreSeason2:InitComponent()
|
||||||
|
self.spLoader = SpriteLoader.New()
|
||||||
|
self.helpBtn = Util.GetGameObject(self.gameObject, "helpBtn")
|
||||||
|
self.dayTip = Util.GetGameObject(self.gameObject, "curDayTipImage/curDayTip"):GetComponent("Image")
|
||||||
|
self.btnBack = Util.GetGameObject(self.gameObject, "btnBack")
|
||||||
|
|
||||||
|
--日期list
|
||||||
|
self.dayList = Util.GetGameObject(self.gameObject, "dayList")
|
||||||
|
self.dayPre = Util.GetGameObject(self.gameObject, "dayList/dayPre")
|
||||||
|
self.dayPre:SetActive(false)
|
||||||
|
self.dayScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, self.dayList.transform,self.dayPre, nil,
|
||||||
|
Vector2.New(self.dayList.transform.rect.width, self.dayList.transform.rect.height), 1, 1, Vector2.New(0, 0))
|
||||||
|
self.dayScrollView.moveTween.MomentumAmount = 1
|
||||||
|
self.dayScrollView.moveTween.Strength = 2
|
||||||
|
self.dayList = {}
|
||||||
|
|
||||||
|
--礼包list
|
||||||
|
self.giftList = Util.GetGameObject(self.gameObject, "giftList")
|
||||||
|
self.giftPre = Util.GetGameObject(self.gameObject, "giftList/giftPre")
|
||||||
|
self.giftPre:SetActive(false)
|
||||||
|
self.giftScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, self.giftList.transform,self.giftPre, nil,
|
||||||
|
Vector2.New(self.giftList.transform.rect.width, self.giftList.transform.rect.height), 1, 1, Vector2.New(0, 0))
|
||||||
|
self.giftScrollView.moveTween.MomentumAmount = 1
|
||||||
|
self.giftScrollView.moveTween.Strength = 2
|
||||||
|
self.giftList = {}
|
||||||
|
self.itemViewList = {}
|
||||||
|
self.firstIn = true
|
||||||
|
|
||||||
|
end
|
||||||
|
|
||||||
|
--绑定事件(用于子类重写)
|
||||||
|
function TreasureStoreSeason2:BindEvent()
|
||||||
|
Util.AddOnceClick(self.btnBack,function ()
|
||||||
|
self:ClosePanel()
|
||||||
|
end)
|
||||||
|
end
|
||||||
|
|
||||||
|
--添加事件监听(用于子类重写)
|
||||||
|
function TreasureStoreSeason2:AddListener()
|
||||||
|
end
|
||||||
|
|
||||||
|
--移除事件监听(用于子类重写)
|
||||||
|
function TreasureStoreSeason2:RemoveListener()
|
||||||
|
end
|
||||||
|
|
||||||
|
function TreasureStoreSeason2:OnSortingOrderChange()
|
||||||
|
end
|
||||||
|
|
||||||
|
--界面打开时调用(用于子类重写)
|
||||||
|
function TreasureStoreSeason2:OnOpen()
|
||||||
|
end
|
||||||
|
|
||||||
|
--界面打开或者重新打开后,界面刷新时调用(用于子类重写)
|
||||||
|
function TreasureStoreSeason2:OnShow()
|
||||||
|
self.actData = CommonActPageManager.GetData(ActivityTypeDef.TreasureStoreSeason2)
|
||||||
|
self:Refresh()
|
||||||
|
end
|
||||||
|
|
||||||
|
function TreasureStoreSeason2:Refresh()
|
||||||
|
if self.firstIn then
|
||||||
|
self.curSelect = self.actData.value
|
||||||
|
self.firstIn = false
|
||||||
|
end
|
||||||
|
CheckRedPointStatus(RedPointType.TreasureStoreSeason2)
|
||||||
|
self.dayTip.sprite = self.spLoader:LoadSprite("p_piaomialzhilv_paizi0"..self.curSelect)
|
||||||
|
self:SetDayButton()
|
||||||
|
self:SetGiftList()
|
||||||
|
end
|
||||||
|
|
||||||
|
--设置天数的
|
||||||
|
function TreasureStoreSeason2:SetDayButton()
|
||||||
|
self.dayScrollView:SetData(self.actData.FreelyData, function (index, item)
|
||||||
|
Util.GetGameObject(item,"name"):GetComponent("Text").text = string.format(_DayItemFormat,NumToChinese[index])
|
||||||
|
item:GetComponent("Image").sprite = self.spLoader:LoadSprite(self.curSelect == index and "p_piaomialzhilv_banzi21" or "p_piaomialzhilv_banzi2")
|
||||||
|
Util.SetGray(item,index > self.actData.value)
|
||||||
|
Util.AddOnceClick(item,function ()
|
||||||
|
if index > self.actData.value then
|
||||||
|
PopupTipPanel.ShowTip(string.format("%s天后开启!",index - self.actData.value))
|
||||||
|
else
|
||||||
|
self.curSelect = index
|
||||||
|
self:Refresh()
|
||||||
|
end
|
||||||
|
end)
|
||||||
|
local redPoint = Util.GetGameObject(item,"redPoint")
|
||||||
|
redPoint:SetActive(false)
|
||||||
|
for i = 1, #self.actData.FreelyData[index] do
|
||||||
|
if self.actData.FreelyData[index][i].progress == 1 and self.actData.FreelyData[index][i].Price == 0 then
|
||||||
|
redPoint:SetActive(true)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end,false,true)
|
||||||
|
end
|
||||||
|
|
||||||
|
--设置礼包list
|
||||||
|
function TreasureStoreSeason2:SetGiftList()
|
||||||
|
self.giftScrollView:SetData(self.actData.FreelyData[self.curSelect], function (index, item)
|
||||||
|
self:ShowSingleData(item,self.actData.FreelyData[self.curSelect][index],index)
|
||||||
|
end)
|
||||||
|
end
|
||||||
|
|
||||||
|
function TreasureStoreSeason2:ShowSingleData(_go,_data,_index)
|
||||||
|
local title = Util.GetGameObject(_go,"title/Text"):GetComponent("Text")
|
||||||
|
local box = Util.GetGameObject(_go,"box")
|
||||||
|
local buyBtn = Util.GetGameObject(_go,"buy")
|
||||||
|
local price = Util.GetGameObject(buyBtn,"Text"):GetComponent("Text")
|
||||||
|
local redPoint = Util.GetGameObject(buyBtn,"redPoint")
|
||||||
|
|
||||||
|
title.text = _data.Name
|
||||||
|
price.text = _data.Price.."元"
|
||||||
|
Util.SetGray(buyBtn,_data.progress == 8)
|
||||||
|
Util.SetGray(redPoint,false)
|
||||||
|
redPoint:SetActive(_data.progress == 1 and _data.Price == 0)
|
||||||
|
|
||||||
|
if not self.itemViewList[_go] then
|
||||||
|
self.itemViewList[_go] = {}
|
||||||
|
end
|
||||||
|
for k,v in ipairs(self.itemViewList[_go]) do
|
||||||
|
v.gameObject:SetActive(false)
|
||||||
|
end
|
||||||
|
for i = 1, #_data.Reward do
|
||||||
|
local rewardData = _data.Reward[i]
|
||||||
|
if not self.itemViewList[_go][i] then
|
||||||
|
self.itemViewList[_go][i] = SubUIManager.Open(SubUIConfig.ItemView, box.transform)
|
||||||
|
end
|
||||||
|
self.itemViewList[_go][i]:OnOpen(false, rewardData, 0.8,false,false,false,self.sortingOrder)
|
||||||
|
self.itemViewList[_go][i].gameObject:SetActive(true)
|
||||||
|
end
|
||||||
|
|
||||||
|
Util.AddOnceClick(buyBtn,function ()
|
||||||
|
if _data.progress == 1 then
|
||||||
|
PayManager.Pay(_data.PackId, function(id)
|
||||||
|
FirstRechargeManager.RefreshAccumRechargeValue(_data.PackId)
|
||||||
|
OperatingManager.SetHadBuyGoodsId({_data.PackId})
|
||||||
|
OperatingManager.RemoveItemInfoByType(GoodsTypeDef.DirectPurchaseGift, _data.PackId)
|
||||||
|
self:OnShow()
|
||||||
|
end)
|
||||||
|
end
|
||||||
|
end)
|
||||||
|
end
|
||||||
|
|
||||||
|
--界面关闭时调用(用于子类重写)
|
||||||
|
function TreasureStoreSeason2:OnClose()
|
||||||
|
self.firstIn = false
|
||||||
|
end
|
||||||
|
|
||||||
|
--界面销毁时调用(用于子类重写)
|
||||||
|
function TreasureStoreSeason2:OnDestroy()
|
||||||
|
self.spLoader:Destroy()
|
||||||
|
self.itemViewList = {}
|
||||||
|
self.giftList = {}
|
||||||
|
self.dayList = {}
|
||||||
|
end
|
||||||
|
|
||||||
|
return TreasureStoreSeason2
|
|
@ -0,0 +1,7 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 6bb7d6838dd15b5459ffb6d21b234ee6
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
Loading…
Reference in New Issue