Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
fbf7c3b41d
Binary file not shown.
After Width: | Height: | Size: 24 KiB |
|
@ -0,0 +1,110 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 5c126797610b6b5499650c048ebe7479
|
||||||
|
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: 65
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 1
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
- serializedVersion: 2
|
||||||
|
buildTarget: Standalone
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: 4
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 1
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
spriteSheet:
|
||||||
|
serializedVersion: 2
|
||||||
|
sprites: []
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
bones: []
|
||||||
|
spriteID: 578ef1d8cb525bc44804cfa87c481299
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
spritePackingTag: PublicAtlas
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
|
@ -1281,7 +1281,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 252, y: -50}
|
m_AnchoredPosition: {x: 272, y: -50}
|
||||||
m_SizeDelta: {x: 88, y: 88}
|
m_SizeDelta: {x: 88, y: 88}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &2988010064167827600
|
--- !u!222 &2988010064167827600
|
||||||
|
@ -1475,7 +1475,7 @@ RectTransform:
|
||||||
m_AnchorMin: {x: 0.5, y: 1}
|
m_AnchorMin: {x: 0.5, y: 1}
|
||||||
m_AnchorMax: {x: 0.5, y: 1}
|
m_AnchorMax: {x: 0.5, y: 1}
|
||||||
m_AnchoredPosition: {x: 1.7, y: -784.34}
|
m_AnchoredPosition: {x: 1.7, y: -784.34}
|
||||||
m_SizeDelta: {x: 261.02, y: 74.29}
|
m_SizeDelta: {x: 260, y: 74}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &3939978545755520689
|
--- !u!222 &3939978545755520689
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -7375,7 +7375,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 64, y: -50}
|
m_AnchoredPosition: {x: 104, y: -50}
|
||||||
m_SizeDelta: {x: 88, y: 88}
|
m_SizeDelta: {x: 88, y: 88}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &8800813909021959947
|
--- !u!222 &8800813909021959947
|
||||||
|
@ -8021,7 +8021,7 @@ RectTransform:
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 540, y: -50}
|
m_AnchoredPosition: {x: 540, y: -50}
|
||||||
m_SizeDelta: {x: 295.63, y: 84.151}
|
m_SizeDelta: {x: 260, y: 74}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &2906563558533192014
|
--- !u!222 &2906563558533192014
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -9772,7 +9772,7 @@ RectTransform:
|
||||||
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: 5, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 880, y: 100}
|
m_SizeDelta: {x: 880, y: 100}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!114 &4244937438055540704
|
--- !u!114 &4244937438055540704
|
||||||
|
@ -9796,7 +9796,7 @@ MonoBehaviour:
|
||||||
m_StartCorner: 0
|
m_StartCorner: 0
|
||||||
m_StartAxis: 0
|
m_StartAxis: 0
|
||||||
m_CellSize: {x: 88, y: 88}
|
m_CellSize: {x: 88, y: 88}
|
||||||
m_Spacing: {x: 100, y: 0}
|
m_Spacing: {x: 80, y: 0}
|
||||||
m_Constraint: 0
|
m_Constraint: 0
|
||||||
m_ConstraintCount: 2
|
m_ConstraintCount: 2
|
||||||
--- !u!1 &6665437375554790941
|
--- !u!1 &6665437375554790941
|
||||||
|
@ -11352,7 +11352,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 628, y: -50}
|
m_AnchoredPosition: {x: 608, y: -50}
|
||||||
m_SizeDelta: {x: 88, y: 88}
|
m_SizeDelta: {x: 88, y: 88}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &2834922340142520908
|
--- !u!222 &2834922340142520908
|
||||||
|
@ -11622,7 +11622,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 1, y: 0}
|
m_AnchorMax: {x: 1, y: 0}
|
||||||
m_AnchoredPosition: {x: 0, y: 276}
|
m_AnchoredPosition: {x: 0, y: 184}
|
||||||
m_SizeDelta: {x: 0, y: 426}
|
m_SizeDelta: {x: 0, y: 426}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &718382595866002436
|
--- !u!222 &718382595866002436
|
||||||
|
@ -12089,7 +12089,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 816, y: -50}
|
m_AnchoredPosition: {x: 776, y: -50}
|
||||||
m_SizeDelta: {x: 88, y: 88}
|
m_SizeDelta: {x: 88, y: 88}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &5478089327364205584
|
--- !u!222 &5478089327364205584
|
||||||
|
@ -13272,7 +13272,7 @@ RectTransform:
|
||||||
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: -16}
|
||||||
m_SizeDelta: {x: 157.13, y: 65.07}
|
m_SizeDelta: {x: 157.13, y: 65.07}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &406472200504376089
|
--- !u!222 &406472200504376089
|
||||||
|
@ -13296,7 +13296,7 @@ MonoBehaviour:
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
m_Material: {fileID: 0}
|
m_Material: {fileID: 0}
|
||||||
m_Color: {r: 0.95294124, g: 0.86274517, b: 0.6156863, a: 1}
|
m_Color: {r: 1, g: 0.7607843, b: 0.5019608, a: 1}
|
||||||
m_RaycastTarget: 1
|
m_RaycastTarget: 1
|
||||||
m_OnCullStateChanged:
|
m_OnCullStateChanged:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
|
@ -13305,7 +13305,7 @@ MonoBehaviour:
|
||||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
m_FontData:
|
m_FontData:
|
||||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||||
m_FontSize: 45
|
m_FontSize: 38
|
||||||
m_FontStyle: 0
|
m_FontStyle: 0
|
||||||
m_BestFit: 0
|
m_BestFit: 0
|
||||||
m_MinSize: 3
|
m_MinSize: 3
|
||||||
|
@ -13428,8 +13428,8 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0}
|
m_AnchorMin: {x: 0.5, y: 0}
|
||||||
m_AnchorMax: {x: 0.5, y: 0}
|
m_AnchorMax: {x: 0.5, y: 0}
|
||||||
m_AnchoredPosition: {x: 2, y: 245}
|
m_AnchoredPosition: {x: 0, y: 241}
|
||||||
m_SizeDelta: {x: 974.2, y: 104}
|
m_SizeDelta: {x: 880, y: 104}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &5081252588848892694
|
--- !u!222 &5081252588848892694
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
|
|
@ -5000,7 +5000,7 @@ ParticleSystem:
|
||||||
--- !u!199 &199737128564699664
|
--- !u!199 &199737128564699664
|
||||||
ParticleSystemRenderer:
|
ParticleSystemRenderer:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_ObjectHideFlags: 2
|
m_ObjectHideFlags: 0
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
@ -9685,7 +9685,7 @@ ParticleSystem:
|
||||||
--- !u!199 &199374924954381556
|
--- !u!199 &199374924954381556
|
||||||
ParticleSystemRenderer:
|
ParticleSystemRenderer:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_ObjectHideFlags: 2
|
m_ObjectHideFlags: 0
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
@ -14388,7 +14388,7 @@ ParticleSystem:
|
||||||
--- !u!199 &199968943646283500
|
--- !u!199 &199968943646283500
|
||||||
ParticleSystemRenderer:
|
ParticleSystemRenderer:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_ObjectHideFlags: 2
|
m_ObjectHideFlags: 0
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
@ -14930,6 +14930,143 @@ MonoBehaviour:
|
||||||
m_FillClockwise: 1
|
m_FillClockwise: 1
|
||||||
m_FillOrigin: 0
|
m_FillOrigin: 0
|
||||||
m_UseSpriteMesh: 0
|
m_UseSpriteMesh: 0
|
||||||
|
--- !u!1 &148238089593178721
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 5389891304571508263}
|
||||||
|
- component: {fileID: 6711504830727681682}
|
||||||
|
- component: {fileID: 3483623269237308010}
|
||||||
|
- component: {fileID: 8864570728243184136}
|
||||||
|
- component: {fileID: 3273842157742655029}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: exchangeBtn
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &5389891304571508263
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 148238089593178721}
|
||||||
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 6871191882722429008}
|
||||||
|
m_RootOrder: 16
|
||||||
|
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: 440, y: -567}
|
||||||
|
m_SizeDelta: {x: 126, y: 126}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &6711504830727681682
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 148238089593178721}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &3483623269237308010
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 148238089593178721}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_RaycastTarget: 1
|
||||||
|
m_OnCullStateChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||||
|
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
|
m_Sprite: {fileID: 21300000, guid: 5c126797610b6b5499650c048ebe7479, type: 3}
|
||||||
|
m_Type: 0
|
||||||
|
m_PreserveAspect: 0
|
||||||
|
m_FillCenter: 1
|
||||||
|
m_FillMethod: 4
|
||||||
|
m_FillAmount: 1
|
||||||
|
m_FillClockwise: 1
|
||||||
|
m_FillOrigin: 0
|
||||||
|
m_UseSpriteMesh: 0
|
||||||
|
--- !u!114 &8864570728243184136
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 148238089593178721}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Navigation:
|
||||||
|
m_Mode: 3
|
||||||
|
m_SelectOnUp: {fileID: 0}
|
||||||
|
m_SelectOnDown: {fileID: 0}
|
||||||
|
m_SelectOnLeft: {fileID: 0}
|
||||||
|
m_SelectOnRight: {fileID: 0}
|
||||||
|
m_Transition: 3
|
||||||
|
m_Colors:
|
||||||
|
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||||
|
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||||
|
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||||
|
m_ColorMultiplier: 1
|
||||||
|
m_FadeDuration: 0.1
|
||||||
|
m_SpriteState:
|
||||||
|
m_HighlightedSprite: {fileID: 0}
|
||||||
|
m_PressedSprite: {fileID: 0}
|
||||||
|
m_DisabledSprite: {fileID: 0}
|
||||||
|
m_AnimationTriggers:
|
||||||
|
m_NormalTrigger: Normal
|
||||||
|
m_HighlightedTrigger: Highlighted
|
||||||
|
m_PressedTrigger: Pressed
|
||||||
|
m_DisabledTrigger: Disabled
|
||||||
|
m_Interactable: 1
|
||||||
|
m_TargetGraphic: {fileID: 3483623269237308010}
|
||||||
|
m_OnClick:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||||
|
Culture=neutral, PublicKeyToken=null
|
||||||
|
--- !u!95 &3273842157742655029
|
||||||
|
Animator:
|
||||||
|
serializedVersion: 3
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 148238089593178721}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_Avatar: {fileID: 0}
|
||||||
|
m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2}
|
||||||
|
m_CullingMode: 0
|
||||||
|
m_UpdateMode: 0
|
||||||
|
m_ApplyRootMotion: 0
|
||||||
|
m_LinearVelocityBlending: 0
|
||||||
|
m_WarningMessage:
|
||||||
|
m_HasTransformHierarchy: 1
|
||||||
|
m_AllowConstantClipSamplingOptimization: 1
|
||||||
|
m_KeepAnimatorControllerStateOnDisable: 0
|
||||||
--- !u!1 &255647109551496116
|
--- !u!1 &255647109551496116
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -23629,6 +23766,7 @@ RectTransform:
|
||||||
- {fileID: 230670702}
|
- {fileID: 230670702}
|
||||||
- {fileID: 173196096}
|
- {fileID: 173196096}
|
||||||
- {fileID: 577456932610300357}
|
- {fileID: 577456932610300357}
|
||||||
|
- {fileID: 5389891304571508263}
|
||||||
m_Father: {fileID: 6475993147429816923}
|
m_Father: {fileID: 6475993147429816923}
|
||||||
m_RootOrder: 1
|
m_RootOrder: 1
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
|
|
@ -508,6 +508,7 @@ UpViewRechargeType = {
|
||||||
TopMatchCoin = 86, -- 至尊之证
|
TopMatchCoin = 86, -- 至尊之证
|
||||||
FindFairy=87, --寻仙玉
|
FindFairy=87, --寻仙玉
|
||||||
SummonStamps=91, --召唤券
|
SummonStamps=91, --召唤券
|
||||||
|
HeroExchange=92,--神将置换
|
||||||
Iron = 1001,--铁矿石
|
Iron = 1001,--铁矿石
|
||||||
FixforDan = 1002,--修为丹
|
FixforDan = 1002,--修为丹
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,16 +2,17 @@ require("Base/BasePanel")
|
||||||
CompoundHeroPanel = Inherit(BasePanel)
|
CompoundHeroPanel = Inherit(BasePanel)
|
||||||
local this = CompoundHeroPanel
|
local this = CompoundHeroPanel
|
||||||
local TabBox = require("Modules/Common/TabBox")
|
local TabBox = require("Modules/Common/TabBox")
|
||||||
local _TabData={ [1] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "神将置换" },
|
local _TabData={ [1] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "神将合成" },
|
||||||
[2] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "神将合成" },
|
[2] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "神将置换" },
|
||||||
|
|
||||||
}
|
}
|
||||||
local _TabFontColor = { default = Color.New(130 / 255, 128 / 255, 120 / 255, 1),
|
local _TabFontColor = { default = Color.New(130 / 255, 128 / 255, 120 / 255, 1),
|
||||||
select = Color.New(243 / 255, 235 / 255, 202 / 255, 1)}
|
select = Color.New(243 / 255, 235 / 255, 202 / 255, 1)}
|
||||||
local curIndex = 1
|
local curIndex = 1
|
||||||
|
|
||||||
this.contents = {
|
this.contents = {
|
||||||
[1] = {view = require("Modules/CompoundHero/view/CompoundHero_Replace"), panelName = "CompoundHeroPanel_Replace"},
|
[2] = {view = require("Modules/CompoundHero/view/CompoundHero_Replace"), panelName = "CompoundHeroPanel_Replace"},
|
||||||
[2] = {view = require("Modules/CompoundHero/view/CompoundHero_Compound"), panelName = "CompoundHeroPanel_Compound"},
|
[1] = {view = require("Modules/CompoundHero/view/CompoundHero_Compound"), panelName = "CompoundHeroPanel_Compound"},
|
||||||
}
|
}
|
||||||
--初始化组件(用于子类重写)
|
--初始化组件(用于子类重写)
|
||||||
function CompoundHeroPanel:InitComponent()
|
function CompoundHeroPanel:InitComponent()
|
||||||
|
@ -43,12 +44,12 @@ function CompoundHeroPanel:BindEvent()
|
||||||
end
|
end
|
||||||
|
|
||||||
function CompoundHeroPanel.RefreshHelpBtn()
|
function CompoundHeroPanel.RefreshHelpBtn()
|
||||||
if curIndex==1 then
|
if curIndex==2 then
|
||||||
this.HelpBtn:SetActive(true)
|
this.HelpBtn:SetActive(true)
|
||||||
Util.AddOnceClick(this.HelpBtn, function()
|
Util.AddOnceClick(this.HelpBtn, function()
|
||||||
UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.HeroReplacement,this.helpPosition.x,this.helpPosition.y)
|
UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.HeroReplacement,this.helpPosition.x,this.helpPosition.y)
|
||||||
end)
|
end)
|
||||||
elseif curIndex==2 then
|
elseif curIndex==1 then
|
||||||
this.HelpBtn:SetActive(true)
|
this.HelpBtn:SetActive(true)
|
||||||
Util.AddOnceClick(this.HelpBtn, function()
|
Util.AddOnceClick(this.HelpBtn, function()
|
||||||
UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.HeroCompound,this.helpPosition.x,this.helpPosition.y)
|
UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.HeroCompound,this.helpPosition.x,this.helpPosition.y)
|
||||||
|
@ -111,9 +112,9 @@ function this.SwitchView(index)
|
||||||
this.prefabs[i].gameObject:SetActive(i == index)--切换子模块预设显隐
|
this.prefabs[i].gameObject:SetActive(i == index)--切换子模块预设显隐
|
||||||
end
|
end
|
||||||
--区分显示
|
--区分显示
|
||||||
if index==1 then
|
if index==2 then
|
||||||
this.upView:OnOpen({showType = UpViewOpenType.ShowLeft, panelType = PanelType.HeroReplace})
|
this.upView:OnOpen({showType = UpViewOpenType.ShowLeft, panelType = PanelType.HeroReplace})
|
||||||
elseif index==2 then
|
elseif index==1 then
|
||||||
this.upView:OnOpen({showType = UpViewOpenType.ShowLeft, panelType = PanelType.Main})
|
this.upView:OnOpen({showType = UpViewOpenType.ShowLeft, panelType = PanelType.Main})
|
||||||
end
|
end
|
||||||
this.RefreshHelpBtn()
|
this.RefreshHelpBtn()
|
||||||
|
|
|
@ -362,7 +362,7 @@ function this.SetHero(go,heroData)
|
||||||
herozs:GetComponent("Image").sprite = Util.LoadSprite(zsName)
|
herozs:GetComponent("Image").sprite = Util.LoadSprite(zsName)
|
||||||
end
|
end
|
||||||
|
|
||||||
heroyuanImage:SetActive(heroData.createtype == 1)
|
heroyuanImage:SetActive(false)
|
||||||
herolv.text=heroData.lv
|
herolv.text=heroData.lv
|
||||||
herofg.sprite = Util.LoadSprite(GetHeroCardStarFg[heroData.star])
|
herofg.sprite = Util.LoadSprite(GetHeroCardStarFg[heroData.star])
|
||||||
heropro.sprite=Util.LoadSprite(GetProStrImageByProNum(heroData.property))
|
heropro.sprite=Util.LoadSprite(GetProStrImageByProNum(heroData.property))
|
||||||
|
@ -392,11 +392,16 @@ function this.ShowCostInfo()
|
||||||
end
|
end
|
||||||
|
|
||||||
if curSelectHero and replaceCostConfig then
|
if curSelectHero and replaceCostConfig then
|
||||||
|
local t
|
||||||
local getCostByStar = string.split(replaceCostConfig.Value,"|")
|
local getCostByStar = string.split(replaceCostConfig.Value,"|")
|
||||||
if curSelectHero.star == 4 then
|
if curSelectHero.star == 4 then
|
||||||
this.costText.text = string.split(getCostByStar[1],"#")[2]
|
t = tonumber(string.split(getCostByStar[1],"#")[2])
|
||||||
elseif curSelectHero.star == 5 then
|
elseif curSelectHero.star == 5 then
|
||||||
this.costText.text = string.split(getCostByStar[2],"#")[2]
|
t = tonumber(string.split(getCostByStar[2],"#")[2])
|
||||||
|
end
|
||||||
|
this.costText.text = t
|
||||||
|
if t>BagManager.GetTotalItemNum(tonumber(replaceItemIdConfig.Value)) then
|
||||||
|
this.costText.text = "<color=red>"..t.."</color>"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -47,6 +47,7 @@ function ElementDrawCardPanel:InitComponent()
|
||||||
self.previewBtn = Util.GetGameObject(self.transform, "previewBtn")
|
self.previewBtn = Util.GetGameObject(self.transform, "previewBtn")
|
||||||
self.shopBtn = Util.GetGameObject(self.transform, "shopBtn")
|
self.shopBtn = Util.GetGameObject(self.transform, "shopBtn")
|
||||||
self.helpBtn = Util.GetGameObject(self.transform, "helpBtn")
|
self.helpBtn = Util.GetGameObject(self.transform, "helpBtn")
|
||||||
|
self.exchangeBtn = Util.GetGameObject(self.transform, "exchangeBtn")
|
||||||
screenAdapte(this.bgImage)
|
screenAdapte(this.bgImage)
|
||||||
-- RecruitManager.GetRewardPreviewData()
|
-- RecruitManager.GetRewardPreviewData()
|
||||||
|
|
||||||
|
@ -215,6 +216,9 @@ function ElementDrawCardPanel:BindEvent()
|
||||||
local pos = self.helpBtn.transform.localPosition
|
local pos = self.helpBtn.transform.localPosition
|
||||||
UIManager.OpenPanel(UIName.HelpPopup, HELP_TYPE.ElementDraw, pos.x, pos.y)
|
UIManager.OpenPanel(UIName.HelpPopup, HELP_TYPE.ElementDraw, pos.x, pos.y)
|
||||||
end)
|
end)
|
||||||
|
Util.AddClick(self.exchangeBtn, function()
|
||||||
|
UIManager.OpenPanel(UIName.CompoundHeroPanel,2)
|
||||||
|
end)
|
||||||
end
|
end
|
||||||
--添加事件监听(用于子类重写)
|
--添加事件监听(用于子类重写)
|
||||||
function ElementDrawCardPanel:AddListener()
|
function ElementDrawCardPanel:AddListener()
|
||||||
|
|
|
@ -42,6 +42,7 @@ local _ShowPlusType = {
|
||||||
UpViewRechargeType.ChinaHas,
|
UpViewRechargeType.ChinaHas,
|
||||||
UpViewRechargeType.Iron,
|
UpViewRechargeType.Iron,
|
||||||
UpViewRechargeType.SummonStamps,
|
UpViewRechargeType.SummonStamps,
|
||||||
|
UpViewRechargeType.HeroExchange,
|
||||||
}
|
}
|
||||||
|
|
||||||
-- 判断是否显示加号
|
-- 判断是否显示加号
|
||||||
|
@ -301,6 +302,8 @@ function UpView:RechargeType(_type)
|
||||||
then
|
then
|
||||||
--功能快捷购买
|
--功能快捷购买
|
||||||
UIManager.OpenPanel(UIName.QuickPurchasePanel, { type = _type })
|
UIManager.OpenPanel(UIName.QuickPurchasePanel, { type = _type })
|
||||||
|
elseif _type == UpViewRechargeType.HeroExchange then--神将置换
|
||||||
|
UIManager.OpenPanel(UIName.ElementDrawCardPanel)
|
||||||
elseif _type == UpViewRechargeType.DemonCrystal then
|
elseif _type == UpViewRechargeType.DemonCrystal then
|
||||||
-- 充值商店
|
-- 充值商店
|
||||||
if not MapManager.isInMap then
|
if not MapManager.isInMap then
|
||||||
|
|
Loading…
Reference in New Issue