parent
cd220c0f35
commit
6b4cf31c3c
Binary file not shown.
After Width: | Height: | Size: 31 KiB |
|
@ -0,0 +1,110 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 2e05a6b33f1f3934580de99bffa64d9e
|
||||||
|
TextureImporter:
|
||||||
|
fileIDToRecycleName: {}
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 9
|
||||||
|
mipmaps:
|
||||||
|
mipMapMode: 0
|
||||||
|
enableMipMap: 0
|
||||||
|
sRGBTexture: 1
|
||||||
|
linearTexture: 0
|
||||||
|
fadeOut: 0
|
||||||
|
borderMipMap: 0
|
||||||
|
mipMapsPreserveCoverage: 0
|
||||||
|
alphaTestReferenceValue: 0.5
|
||||||
|
mipMapFadeDistanceStart: 1
|
||||||
|
mipMapFadeDistanceEnd: 3
|
||||||
|
bumpmap:
|
||||||
|
convertToNormalMap: 0
|
||||||
|
externalNormalMap: 0
|
||||||
|
heightScale: 0.25
|
||||||
|
normalMapFilter: 0
|
||||||
|
isReadable: 0
|
||||||
|
streamingMipmaps: 0
|
||||||
|
streamingMipmapsPriority: 0
|
||||||
|
grayScaleToAlpha: 0
|
||||||
|
generateCubemap: 6
|
||||||
|
cubemapConvolution: 0
|
||||||
|
seamlessCubemap: 0
|
||||||
|
textureFormat: 1
|
||||||
|
maxTextureSize: 2048
|
||||||
|
textureSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
filterMode: 2
|
||||||
|
aniso: -1
|
||||||
|
mipBias: -100
|
||||||
|
wrapU: 1
|
||||||
|
wrapV: 1
|
||||||
|
wrapW: 1
|
||||||
|
nPOTScale: 0
|
||||||
|
lightmap: 0
|
||||||
|
compressionQuality: 50
|
||||||
|
spriteMode: 1
|
||||||
|
spriteExtrude: 1
|
||||||
|
spriteMeshType: 1
|
||||||
|
alignment: 0
|
||||||
|
spritePivot: {x: 0.5, y: 0.5}
|
||||||
|
spritePixelsToUnits: 100
|
||||||
|
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
spriteGenerateFallbackPhysicsShape: 1
|
||||||
|
alphaUsage: 1
|
||||||
|
alphaIsTransparency: 1
|
||||||
|
spriteTessellationDetail: -1
|
||||||
|
textureType: 8
|
||||||
|
textureShape: 1
|
||||||
|
singleChannelComponent: 0
|
||||||
|
maxTextureSizeSet: 0
|
||||||
|
compressionQualitySet: 0
|
||||||
|
textureFormatSet: 0
|
||||||
|
platformSettings:
|
||||||
|
- serializedVersion: 2
|
||||||
|
buildTarget: Android
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: 65
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 1
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
- serializedVersion: 2
|
||||||
|
buildTarget: iPhone
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: 56
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 1
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
- serializedVersion: 2
|
||||||
|
buildTarget: DefaultTexturePlatform
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
spriteSheet:
|
||||||
|
serializedVersion: 2
|
||||||
|
sprites: []
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
bones: []
|
||||||
|
spriteID: 9860262fdbe9aae45984ccee709cf5f5
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
spritePackingTag: FightLevelAtlas
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
Binary file not shown.
After Width: | Height: | Size: 29 KiB |
|
@ -0,0 +1,110 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 26553690691363e4dbd712054216dc15
|
||||||
|
TextureImporter:
|
||||||
|
fileIDToRecycleName: {}
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 9
|
||||||
|
mipmaps:
|
||||||
|
mipMapMode: 0
|
||||||
|
enableMipMap: 0
|
||||||
|
sRGBTexture: 1
|
||||||
|
linearTexture: 0
|
||||||
|
fadeOut: 0
|
||||||
|
borderMipMap: 0
|
||||||
|
mipMapsPreserveCoverage: 0
|
||||||
|
alphaTestReferenceValue: 0.5
|
||||||
|
mipMapFadeDistanceStart: 1
|
||||||
|
mipMapFadeDistanceEnd: 3
|
||||||
|
bumpmap:
|
||||||
|
convertToNormalMap: 0
|
||||||
|
externalNormalMap: 0
|
||||||
|
heightScale: 0.25
|
||||||
|
normalMapFilter: 0
|
||||||
|
isReadable: 0
|
||||||
|
streamingMipmaps: 0
|
||||||
|
streamingMipmapsPriority: 0
|
||||||
|
grayScaleToAlpha: 0
|
||||||
|
generateCubemap: 6
|
||||||
|
cubemapConvolution: 0
|
||||||
|
seamlessCubemap: 0
|
||||||
|
textureFormat: 1
|
||||||
|
maxTextureSize: 2048
|
||||||
|
textureSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
filterMode: 2
|
||||||
|
aniso: -1
|
||||||
|
mipBias: -100
|
||||||
|
wrapU: 1
|
||||||
|
wrapV: 1
|
||||||
|
wrapW: 1
|
||||||
|
nPOTScale: 0
|
||||||
|
lightmap: 0
|
||||||
|
compressionQuality: 50
|
||||||
|
spriteMode: 1
|
||||||
|
spriteExtrude: 1
|
||||||
|
spriteMeshType: 1
|
||||||
|
alignment: 0
|
||||||
|
spritePivot: {x: 0.5, y: 0.5}
|
||||||
|
spritePixelsToUnits: 100
|
||||||
|
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
spriteGenerateFallbackPhysicsShape: 1
|
||||||
|
alphaUsage: 1
|
||||||
|
alphaIsTransparency: 1
|
||||||
|
spriteTessellationDetail: -1
|
||||||
|
textureType: 8
|
||||||
|
textureShape: 1
|
||||||
|
singleChannelComponent: 0
|
||||||
|
maxTextureSizeSet: 0
|
||||||
|
compressionQualitySet: 0
|
||||||
|
textureFormatSet: 0
|
||||||
|
platformSettings:
|
||||||
|
- serializedVersion: 2
|
||||||
|
buildTarget: Android
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: 65
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 1
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
- serializedVersion: 2
|
||||||
|
buildTarget: iPhone
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: 56
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 1
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
- serializedVersion: 2
|
||||||
|
buildTarget: DefaultTexturePlatform
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
spriteSheet:
|
||||||
|
serializedVersion: 2
|
||||||
|
sprites: []
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
bones: []
|
||||||
|
spriteID: 539a0e29e94963047986f3504bd8d211
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
spritePackingTag: FightLevelAtlas
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
|
@ -131,11 +131,11 @@ RectTransform:
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 2722845707200469405}
|
m_Father: {fileID: 2722845707200469405}
|
||||||
m_RootOrder: 3
|
m_RootOrder: 2
|
||||||
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: -867}
|
m_AnchoredPosition: {x: 0, y: -759.78}
|
||||||
m_SizeDelta: {x: 400, y: 50}
|
m_SizeDelta: {x: 400, y: 50}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &574636202942191252
|
--- !u!222 &574636202942191252
|
||||||
|
@ -215,9 +215,10 @@ RectTransform:
|
||||||
- {fileID: 1968134460030524142}
|
- {fileID: 1968134460030524142}
|
||||||
- {fileID: 2432821337814637930}
|
- {fileID: 2432821337814637930}
|
||||||
- {fileID: 1312041157774796170}
|
- {fileID: 1312041157774796170}
|
||||||
- {fileID: 7659087971039171543}
|
- {fileID: 428544739976164713}
|
||||||
- {fileID: 2732743975332295968}
|
- {fileID: 2732743975332295968}
|
||||||
- {fileID: 612721485868657344}
|
- {fileID: 612721485868657344}
|
||||||
|
- {fileID: 7659087971039171543}
|
||||||
m_Father: {fileID: 2722845707200469405}
|
m_Father: {fileID: 2722845707200469405}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
@ -622,7 +623,7 @@ RectTransform:
|
||||||
- {fileID: 3746285910407252570}
|
- {fileID: 3746285910407252570}
|
||||||
- {fileID: 1019011625307048480}
|
- {fileID: 1019011625307048480}
|
||||||
m_Father: {fileID: 2722845707200469405}
|
m_Father: {fileID: 2722845707200469405}
|
||||||
m_RootOrder: 4
|
m_RootOrder: 3
|
||||||
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}
|
||||||
|
@ -860,7 +861,6 @@ GameObject:
|
||||||
- component: {fileID: 2722845707200469409}
|
- component: {fileID: 2722845707200469409}
|
||||||
- component: {fileID: 2722845707200469408}
|
- component: {fileID: 2722845707200469408}
|
||||||
- component: {fileID: 2722845707200469407}
|
- component: {fileID: 2722845707200469407}
|
||||||
- component: {fileID: 2722845707200469406}
|
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: FightLevelTrialPanel
|
m_Name: FightLevelTrialPanel
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
|
@ -880,7 +880,6 @@ RectTransform:
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 528284362519553911}
|
- {fileID: 528284362519553911}
|
||||||
- {fileID: 428544739976164713}
|
|
||||||
- {fileID: 6006527021929537398}
|
- {fileID: 6006527021929537398}
|
||||||
- {fileID: 5735099440662043762}
|
- {fileID: 5735099440662043762}
|
||||||
- {fileID: 9041930354262948749}
|
- {fileID: 9041930354262948749}
|
||||||
|
@ -940,20 +939,6 @@ MonoBehaviour:
|
||||||
m_BlockingMask:
|
m_BlockingMask:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_Bits: 4294967295
|
m_Bits: 4294967295
|
||||||
--- !u!114 &2722845707200469406
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 2722845707200469404}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: 7fdc50ec1a2f1534f93155e67c3708ab, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
bgList:
|
|
||||||
- {fileID: 1547217150760750672}
|
|
||||||
--- !u!1 &2933571424160175832
|
--- !u!1 &2933571424160175832
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -979,7 +964,7 @@ RectTransform:
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 2933571424160175832}
|
m_GameObject: {fileID: 2933571424160175832}
|
||||||
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: []
|
||||||
|
@ -988,7 +973,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: -120, y: 279}
|
m_AnchoredPosition: {x: -120, y: 330.84998}
|
||||||
m_SizeDelta: {x: 752, y: 248}
|
m_SizeDelta: {x: 752, y: 248}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &6514796785374385067
|
--- !u!222 &6514796785374385067
|
||||||
|
@ -1574,7 +1559,7 @@ RectTransform:
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 2722845707200469405}
|
m_Father: {fileID: 2722845707200469405}
|
||||||
m_RootOrder: 6
|
m_RootOrder: 5
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 1, y: 1}
|
m_AnchorMin: {x: 1, y: 1}
|
||||||
m_AnchorMax: {x: 1, y: 1}
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
|
@ -1788,12 +1773,12 @@ RectTransform:
|
||||||
- {fileID: 8169970129080536604}
|
- {fileID: 8169970129080536604}
|
||||||
- {fileID: 5191677563802171479}
|
- {fileID: 5191677563802171479}
|
||||||
- {fileID: 6937367107277986352}
|
- {fileID: 6937367107277986352}
|
||||||
m_Father: {fileID: 2722845707200469405}
|
m_Father: {fileID: 528284362519553911}
|
||||||
m_RootOrder: 1
|
m_RootOrder: 5
|
||||||
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: 360, y: 264.9}
|
m_AnchoredPosition: {x: 360, y: 316.75}
|
||||||
m_SizeDelta: {x: 238, y: 241}
|
m_SizeDelta: {x: 238, y: 241}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &8642970326408271104
|
--- !u!222 &8642970326408271104
|
||||||
|
@ -2006,9 +1991,9 @@ RectTransform:
|
||||||
m_Father: {fileID: 528284362519553911}
|
m_Father: {fileID: 528284362519553911}
|
||||||
m_RootOrder: 1
|
m_RootOrder: 1
|
||||||
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: 1}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 613.6}
|
m_AnchoredPosition: {x: 0, y: -292}
|
||||||
m_SizeDelta: {x: 1132, y: 582}
|
m_SizeDelta: {x: 1132, y: 582}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &81397844308720428
|
--- !u!222 &81397844308720428
|
||||||
|
@ -2073,7 +2058,7 @@ RectTransform:
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 5792072093877216370}
|
m_GameObject: {fileID: 5792072093877216370}
|
||||||
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:
|
||||||
|
@ -2085,8 +2070,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.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: -2.47, y: 75.71}
|
m_AnchoredPosition: {x: -2.47, y: 127.55994}
|
||||||
m_SizeDelta: {x: 910.34, y: 52.59}
|
m_SizeDelta: {x: 910.34, y: 52.590027}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &3736047418023058408
|
--- !u!222 &3736047418023058408
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -2298,7 +2283,7 @@ GameObject:
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 1
|
m_IsActive: 0
|
||||||
--- !u!224 &2080496099792934752
|
--- !u!224 &2080496099792934752
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -2311,7 +2296,7 @@ RectTransform:
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 2722845707200469405}
|
m_Father: {fileID: 2722845707200469405}
|
||||||
m_RootOrder: 5
|
m_RootOrder: 4
|
||||||
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: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
|
@ -2594,12 +2579,12 @@ RectTransform:
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 2722845707200469405}
|
m_Father: {fileID: 2722845707200469405}
|
||||||
m_RootOrder: 2
|
m_RootOrder: 1
|
||||||
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: -379.74002}
|
m_AnchoredPosition: {x: 0, y: -264.4}
|
||||||
m_SizeDelta: {x: 912.8, y: 859.52}
|
m_SizeDelta: {x: 912.8, y: 727.8}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &5046759020616761030
|
--- !u!222 &5046759020616761030
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -2664,7 +2649,7 @@ RectTransform:
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 8385209400641795231}
|
m_GameObject: {fileID: 8385209400641795231}
|
||||||
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:
|
||||||
|
@ -2677,7 +2662,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: 140.7}
|
m_AnchoredPosition: {x: 0, y: 192.54993}
|
||||||
m_SizeDelta: {x: 755, y: 58}
|
m_SizeDelta: {x: 755, y: 58}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &3630629496191085909
|
--- !u!222 &3630629496191085909
|
||||||
|
@ -2770,11 +2755,11 @@ RectTransform:
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 528284362519553911}
|
m_Father: {fileID: 528284362519553911}
|
||||||
m_RootOrder: 5
|
m_RootOrder: 8
|
||||||
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: 63.5}
|
m_AnchoredPosition: {x: 0, y: 396}
|
||||||
m_SizeDelta: {x: 0, y: 126.9}
|
m_SizeDelta: {x: 0, y: 126.9}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &6892353935827929238
|
--- !u!222 &6892353935827929238
|
||||||
|
@ -2846,9 +2831,9 @@ RectTransform:
|
||||||
m_Father: {fileID: 528284362519553911}
|
m_Father: {fileID: 528284362519553911}
|
||||||
m_RootOrder: 2
|
m_RootOrder: 2
|
||||||
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: 1}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 286}
|
m_AnchoredPosition: {x: 0, y: -624}
|
||||||
m_SizeDelta: {x: 1080, y: 1348}
|
m_SizeDelta: {x: 1080, y: 1348}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &3738449801269377702
|
--- !u!222 &3738449801269377702
|
||||||
|
@ -2922,8 +2907,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.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: -301.4}
|
m_AnchoredPosition: {x: 0, y: -164}
|
||||||
m_SizeDelta: {x: 1080, y: 1283}
|
m_SizeDelta: {x: 1080, y: 1151.7}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &7111698776255495627
|
--- !u!222 &7111698776255495627
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
|
|
@ -533,4 +533,5 @@ SubUIConfig = {
|
||||||
[36] = {name = "page17",assetName = "page17",script = "Modules/Incarnation/IncarnationLottery"},
|
[36] = {name = "page17",assetName = "page17",script = "Modules/Incarnation/IncarnationLottery"},
|
||||||
[37] = {name = "RecruitTreasurePanel",assetName = "RecruitTreasurePanel",script = "Modules/TreasureOfHeaven/RecruitTreasurePanel"},
|
[37] = {name = "RecruitTreasurePanel",assetName = "RecruitTreasurePanel",script = "Modules/TreasureOfHeaven/RecruitTreasurePanel"},
|
||||||
[38] = {name = "UpStarGift",assetName = "UpStarGift",script = "Modules/DynamicActivity/UpStarGift"},
|
[38] = {name = "UpStarGift",assetName = "UpStarGift",script = "Modules/DynamicActivity/UpStarGift"},
|
||||||
|
[39] = {name = "FightLevelTrialPanel",assetName = "FightLevelTrialPanel",script = "Modules/FightLevel/FightLevelTrialPanel"},
|
||||||
}
|
}
|
|
@ -198,6 +198,7 @@ function ArenaTrialPanel:OnDestroy()
|
||||||
poolManager:UnLoadLive(self.live.gameObject.name, self.live)
|
poolManager:UnLoadLive(self.live.gameObject.name, self.live)
|
||||||
self.live = nil
|
self.live = nil
|
||||||
end
|
end
|
||||||
|
self.spLoader:Destroy()
|
||||||
end
|
end
|
||||||
|
|
||||||
return ArenaTrialPanel
|
return ArenaTrialPanel
|
|
@ -1,16 +1,25 @@
|
||||||
require("Base/BasePanel")
|
|
||||||
local FightLevelTrialPanel = Inherit(BasePanel)
|
local FightLevelTrialPanel = {}
|
||||||
local STATE = {
|
local STATE = {
|
||||||
[0] = {Img = "s_slbz_1anniuhuangse",text = Language[11948]},
|
[0] = {Img = "s_slbz_1anniuhuangse",text = Language[11948]},
|
||||||
[1] = {Img = "s_slbz_1anniuongse",text = Language[11948]},
|
[1] = {Img = "s_slbz_1anniuongse",text = Language[11948]},
|
||||||
[2] = {Img = "s_slbz_1anniuhuise",text = Language[10101]},
|
[2] = {Img = "s_slbz_1anniuhuise",text = Language[10101]},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function FightLevelTrialPanel:New(gameObject)
|
||||||
|
local b = {}
|
||||||
|
b.gameObject = gameObject
|
||||||
|
b.transform = gameObject.transform
|
||||||
|
setmetatable(b, { __index = FightLevelTrialPanel })
|
||||||
|
return b
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
--初始化组件(用于子类重写)
|
--初始化组件(用于子类重写)
|
||||||
function FightLevelTrialPanel:InitComponent()
|
function FightLevelTrialPanel:InitComponent()
|
||||||
self.spLoader = SpriteLoader.New()
|
self.spLoader = SpriteLoader.New()
|
||||||
self.UpView = SubUIManager.Open(SubUIConfig.UpView, self.transform)
|
self.UpView = SubUIManager.Open(SubUIConfig.UpView, self.transform)
|
||||||
self.btnBack = Util.GetGameObject(self.gameObject,"BackBtn")
|
--self.btnBack = Util.GetGameObject(self.gameObject,"BackBtn")
|
||||||
|
|
||||||
self.nextStar = Util.GetGameObject(self.gameObject,"bg/text/num"):GetComponent("Text")
|
self.nextStar = Util.GetGameObject(self.gameObject,"bg/text/num"):GetComponent("Text")
|
||||||
self.Text = Util.GetGameObject(self.gameObject,"bg/text/Text"):GetComponent("Text")
|
self.Text = Util.GetGameObject(self.gameObject,"bg/text/Text"):GetComponent("Text")
|
||||||
|
@ -37,9 +46,9 @@ end
|
||||||
|
|
||||||
--绑定事件(用于子类重写)
|
--绑定事件(用于子类重写)
|
||||||
function FightLevelTrialPanel:BindEvent()
|
function FightLevelTrialPanel:BindEvent()
|
||||||
Util.AddClick(self.btnBack, function()
|
-- Util.AddClick(self.btnBack, function()
|
||||||
self:ClosePanel()
|
-- self:ClosePanel()
|
||||||
end)
|
-- end)
|
||||||
|
|
||||||
Util.AddClick(self.goBtn, function()
|
Util.AddClick(self.goBtn, function()
|
||||||
UIManager.OpenPanel(UIName.FightLevelChapterPanel)
|
UIManager.OpenPanel(UIName.FightLevelChapterPanel)
|
||||||
|
@ -60,18 +69,37 @@ function FightLevelTrialPanel:RemoveListener()
|
||||||
end
|
end
|
||||||
|
|
||||||
--界面打开时调用(用于子类重写)
|
--界面打开时调用(用于子类重写)
|
||||||
function FightLevelTrialPanel:OnOpen()
|
function FightLevelTrialPanel:OnOpen(_activityConfig,_index,parent)
|
||||||
|
self.actConfig = _activityConfig
|
||||||
|
self.pageIndex = _index
|
||||||
|
self.parent = parent
|
||||||
end
|
end
|
||||||
|
|
||||||
--界面打开或者重新打开后,界面刷新时调用(用于子类重写)
|
--界面打开或者重新打开后,界面刷新时调用(用于子类重写)
|
||||||
function FightLevelTrialPanel:OnShow()
|
function FightLevelTrialPanel:OnShow()
|
||||||
FightLevelTrialPanel:Refresh(true,true)
|
self.gameObject:SetActive(true)
|
||||||
|
self.sortingOrder = _sortingOrder or self.sortingOrder
|
||||||
|
self.actId = self.actConfig.ActId
|
||||||
|
self.actType = self.actConfig.ActiveType > 0 and self.actConfig.ActiveType or self.actConfig.FunType
|
||||||
|
if self.actConfig.IfBack == 1 then
|
||||||
|
if self.actConfig.ActiveType > 0 then
|
||||||
|
local id = ActivityGiftManager.IsActivityTypeOpen(self.actConfig.ActiveType)
|
||||||
|
if id and id > 0 then
|
||||||
|
self.actId = id
|
||||||
|
local config = ConfigManager.TryGetConfigDataByThreeKey(ConfigName.ActivityGroups,"PageType",self.actConfig.PageType,"ActiveType",self.actConfig.ActiveType,"ActId",id)
|
||||||
|
if config then
|
||||||
|
self.actConfig = config
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
self:Refresh(true,true)
|
||||||
end
|
end
|
||||||
|
|
||||||
function FightLevelTrialPanel:Refresh(isTop,isAni)
|
function FightLevelTrialPanel:Refresh(isTop,isAni)
|
||||||
self.actData = CommonActPageManager.GetData(ActivityTypeDef.ShanHeShiLian)
|
self.actData = CommonActPageManager.GetData(ActivityTypeDef.ShanHeShiLian)
|
||||||
FightLevelTrialPanel:SetNumbers()
|
self:SetNumbers()
|
||||||
FightLevelTrialPanel:SetRewards(isTop,isAni)
|
self:SetRewards(isTop,isAni)
|
||||||
end
|
end
|
||||||
|
|
||||||
function FightLevelTrialPanel:SetNumbers()
|
function FightLevelTrialPanel:SetNumbers()
|
||||||
|
@ -107,7 +135,7 @@ end
|
||||||
|
|
||||||
function FightLevelTrialPanel:SetRewards(isTop,isAni)
|
function FightLevelTrialPanel:SetRewards(isTop,isAni)
|
||||||
self.ScrollView:SetData(self.actData.rewards, function (index, go)
|
self.ScrollView:SetData(self.actData.rewards, function (index, go)
|
||||||
FightLevelTrialPanel:SingleDataShow(go, self.actData.rewards[index],index)
|
self:SingleDataShow(go, self.actData.rewards[index],index)
|
||||||
end,not isTop,not isAni)
|
end,not isTop,not isAni)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -145,7 +173,7 @@ function FightLevelTrialPanel:SingleDataShow(item,data,index)
|
||||||
elseif state == 1 then
|
elseif state == 1 then
|
||||||
NetManager.GetActivityRewardRequest(data.missionId,self.actData.activityId,function (_drop)
|
NetManager.GetActivityRewardRequest(data.missionId,self.actData.activityId,function (_drop)
|
||||||
UIManager.OpenPanel(UIName.RewardItemPopup,_drop,1,function()
|
UIManager.OpenPanel(UIName.RewardItemPopup,_drop,1,function()
|
||||||
FightLevelTrialPanel:Refresh(false,false)
|
self:Refresh(false,false)
|
||||||
end)
|
end)
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
@ -159,6 +187,7 @@ function FightLevelTrialPanel:OnClose()
|
||||||
self.timer:Stop()
|
self.timer:Stop()
|
||||||
self.timer = nil
|
self.timer = nil
|
||||||
end
|
end
|
||||||
|
self.gameObject:SetActive(false)
|
||||||
end
|
end
|
||||||
|
|
||||||
--界面销毁时调用(用于子类重写)
|
--界面销毁时调用(用于子类重写)
|
||||||
|
@ -168,6 +197,7 @@ function FightLevelTrialPanel:OnDestroy()
|
||||||
self.timer = nil
|
self.timer = nil
|
||||||
end
|
end
|
||||||
self.itemList = {}
|
self.itemList = {}
|
||||||
|
self.spLoader:Destroy()
|
||||||
end
|
end
|
||||||
|
|
||||||
return FightLevelTrialPanel
|
return FightLevelTrialPanel
|
|
@ -1086,7 +1086,7 @@ function this:TabBtnAction(id,actType,data)
|
||||||
-- UIManager.OpenPanel(UIName.TeHuiShenZhuangPanel)
|
-- UIManager.OpenPanel(UIName.TeHuiShenZhuangPanel)
|
||||||
UIManager.OpenPanel(UIName.ContinuePackagePanel,8601)
|
UIManager.OpenPanel(UIName.ContinuePackagePanel,8601)
|
||||||
elseif id == ActivityTypeDef.ShanHeShiLian then--山河试炼
|
elseif id == ActivityTypeDef.ShanHeShiLian then--山河试炼
|
||||||
UIManager.OpenPanel(UIName.FightLevelTrialPanel)
|
UIManager.OpenPanel(UIName.ActivityMainPanel,42,31)
|
||||||
elseif id == ActivityTypeDef.PowerRice then--山河试炼
|
elseif id == ActivityTypeDef.PowerRice then--山河试炼
|
||||||
UIManager.OpenPanel(UIName.PowerRicePanel)
|
UIManager.OpenPanel(UIName.PowerRicePanel)
|
||||||
elseif id == ActivityTypeDef.ChaoZhiJiJin_128 then
|
elseif id == ActivityTypeDef.ChaoZhiJiJin_128 then
|
||||||
|
|
Loading…
Reference in New Issue