神兵系统界面修改提交

wangzhenxing 2023-11-02 16:03:11 +08:00
parent 7c0cf86935
commit c67eb7f7ad
19 changed files with 4758 additions and 3863 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 868 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 MiB

View File

@ -1,110 +0,0 @@
fileFormatVersion: 2
guid: 82e06da26f41bd04b8216c1fbfde309e
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: 5aef5ca4e44123e4391d289ca7706a97
vertices: []
indices:
edges: []
weights: []
spritePackingTag: GodWeaponAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 158 KiB

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: a17091ab237775a4baa2efb1cb0376a3
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 430 KiB

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 0451429c4c6e5f74e809fc5fd49f8cfc
guid: 0e733869d01c63d49aa999ebc995023b
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
@ -73,7 +73,7 @@ TextureImporter:
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 56
textureFormat: 57
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
@ -81,15 +81,15 @@ TextureImporter:
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
@ -97,12 +97,12 @@ TextureImporter:
outline: []
physicsShape: []
bones: []
spriteID: f47d8fc29cff011458d5ef4490d3e31d
spriteID: cd4f7e3ae11117e4f92225c2ac7fdd4d
vertices: []
indices:
edges: []
weights: []
spritePackingTag: GodWeaponAtlas
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 3aa6d295bb5d2ca43a38dd836d80e91e
guid: 09bbe0b0d4de438449d12c6cf370a67e
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
@ -73,7 +73,7 @@ TextureImporter:
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 56
textureFormat: 57
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
@ -81,15 +81,15 @@ TextureImporter:
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
@ -97,12 +97,12 @@ TextureImporter:
outline: []
physicsShape: []
bones: []
spriteID: f469a96c2dc85b0488e9ee09ceba60e7
spriteID: 0646a75c0fcf2c04a9ab5492e79ad4cf
vertices: []
indices:
edges: []
weights: []
spritePackingTag: GodWeaponAtlas
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:

Binary file not shown.

After

Width:  |  Height:  |  Size: 913 KiB

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 241f896616c21014f8becee1cb35eba0
guid: 30193515985bc3743807cacb7a17f492
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
@ -73,7 +73,7 @@ TextureImporter:
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 56
textureFormat: 57
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
@ -81,15 +81,15 @@ TextureImporter:
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
@ -97,12 +97,12 @@ TextureImporter:
outline: []
physicsShape: []
bones: []
spriteID: eb400eb61f8e217409fb96c16fedac76
spriteID: 4e22e6ce549730e4bbdb33c99c8b877c
vertices: []
indices:
edges: []
weights: []
spritePackingTag: GodWeaponAtlas
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:

View File

@ -237,8 +237,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 4.1, y: 41}
m_SizeDelta: {x: 866.97, y: 98.9}
m_AnchoredPosition: {x: -5.2575, y: 41}
m_SizeDelta: {x: 848.25, y: 98.9}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2314767277376512571
MonoBehaviour:
@ -257,8 +257,8 @@ MonoBehaviour:
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 4
m_Spacing: -3.9
m_ChildAlignment: 3
m_Spacing: 1
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
@ -635,7 +635,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: -2083.2502, y: 13.600006}
m_SizeDelta: {x: 856.5, y: 650.99}
m_SizeDelta: {x: 856.5, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &4140631636949200151
MonoBehaviour:
@ -1100,7 +1100,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 278.86, y: 31.85}
m_AnchoredPosition: {x: 278.86, y: 1.6779995}
m_SizeDelta: {x: 144.05, y: 52.91}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5778636851066645241
@ -1360,7 +1360,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -41, y: 38.4}
m_AnchoredPosition: {x: -41, y: 38.400024}
m_SizeDelta: {x: 814.7, y: 1031}
m_Pivot: {x: 0, y: 0}
--- !u!222 &5337801614256076159
@ -1438,8 +1438,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: -1233, y: -278}
m_SizeDelta: {x: 867.00006, y: 205.09998}
m_AnchoredPosition: {x: -1233, y: -249.52}
m_SizeDelta: {x: 867, y: 148.15}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1149514123027599131
GameObject:
@ -1643,10 +1643,10 @@ RectTransform:
m_Father: {fileID: 4004438615410668281}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 428.25, y: -648.99}
m_SizeDelta: {x: 856.72, y: 4}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 856.72, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1127896390522614478
CanvasRenderer:
@ -1866,10 +1866,10 @@ RectTransform:
m_Father: {fileID: 4352075039876160969}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 159.46, y: -25}
m_SizeDelta: {x: 50, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6143927582529733607
CanvasRenderer:
@ -1940,10 +1940,10 @@ RectTransform:
m_Father: {fileID: 4352075039876160969}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 25, y: -25}
m_SizeDelta: {x: 50, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5580516555455715907
CanvasRenderer:
@ -2252,10 +2252,10 @@ RectTransform:
m_Father: {fileID: 4352075039876160969}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 114.64, y: -25}
m_SizeDelta: {x: 50, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4574484424828713294
CanvasRenderer:
@ -2737,7 +2737,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -56.2, y: -73.62}
m_AnchoredPosition: {x: -56.200012, y: -73.619995}
m_SizeDelta: {x: 94, y: 92.65}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5344961657770747697
@ -2981,10 +2981,10 @@ RectTransform:
m_Father: {fileID: 4458106941359138159}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 433.4, y: -49.995}
m_SizeDelta: {x: 260, y: 74}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 260, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3624168937168555753
CanvasRenderer:
@ -3100,7 +3100,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -1.3999939, y: 71}
m_AnchoredPosition: {x: 19, y: 1095}
m_SizeDelta: {x: -9.93, y: 84}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &2945985230610853362
@ -3795,10 +3795,10 @@ RectTransform:
m_Father: {fileID: 4352075039876160969}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 69.82, y: -25}
m_SizeDelta: {x: 50, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1947203097727417635
CanvasRenderer:
@ -4721,10 +4721,10 @@ RectTransform:
m_Father: {fileID: 4004438615410668281}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 428.25, y: -596.995}
m_SizeDelta: {x: 866.8, y: 99.99}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 428.25, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &4385783224930684088
MonoBehaviour:
@ -5019,8 +5019,8 @@ MonoBehaviour:
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 45
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
m_FontSize: 36
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
@ -5070,10 +5070,10 @@ RectTransform:
m_Father: {fileID: 4004438615410668281}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 428.25, y: -273.5}
m_SizeDelta: {x: 855.2, y: 547}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 855.2, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2132218441971241185
MonoBehaviour:
@ -5209,8 +5209,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -2.7999878, y: 31.5}
m_SizeDelta: {x: -70.8, y: -80.1}
m_AnchoredPosition: {x: -2.7999878, y: -4.2749977}
m_SizeDelta: {x: -70.8, y: -8.55}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2403253193857132886
CanvasRenderer:
@ -5327,8 +5327,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -0.25, y: -3}
m_SizeDelta: {x: 227.57, y: 109.9}
m_AnchoredPosition: {x: 1.6, y: -1.3}
m_SizeDelta: {x: 164.5, y: 87.3}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3333290993396761761
CanvasRenderer:
@ -5958,7 +5958,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &838872786060196463
RectTransform:
m_ObjectHideFlags: 0
@ -6053,8 +6053,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 432.685, y: -42.99999}
m_SizeDelta: {x: 190.17, y: 83.89}
m_AnchoredPosition: {x: 403.5, y: -33.5}
m_SizeDelta: {x: 131.9, y: 64.9}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5215328543863908332
CanvasRenderer:
@ -6333,7 +6333,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &6683252957138639438
RectTransform:
m_ObjectHideFlags: 0
@ -6398,10 +6398,10 @@ RectTransform:
m_Father: {fileID: 4352075039876160969}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 204.28, y: -25}
m_SizeDelta: {x: 50, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7187056871743065327
CanvasRenderer:
@ -6670,7 +6670,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 271.8, y: 56.172}
m_AnchoredPosition: {x: 271.8, y: 26}
m_SizeDelta: {x: 118.1, y: 45.655}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3341222646732745206
@ -7286,7 +7286,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 259.26, y: 2}
m_AnchoredPosition: {x: 259.26, y: -28.172}
m_SizeDelta: {x: 93.144, y: 43.64}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6062853530043885079
@ -7643,7 +7643,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 157, y: 2.67}
m_AnchoredPosition: {x: 150.1, y: 2.67}
m_SizeDelta: {x: 82.9, y: 38.3}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4637881877804120502
@ -7681,7 +7681,7 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 40
m_Alignment: 5
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
@ -7817,7 +7817,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -304.7, y: 31.498}
m_AnchoredPosition: {x: -304.7, y: 1.3259983}
m_SizeDelta: {x: 155.1, y: 125}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4328367093429124549

View File

@ -4648,7 +4648,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &99061827347249233
RectTransform:
m_ObjectHideFlags: 0
@ -5584,7 +5584,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 22a363a0a33620f419259e82ebf04f91, type: 3}
m_Sprite: {fileID: 21300000, guid: 6ff20609e8c68014394e6b730e1c7948, type: 3}
m_Type: 0
m_PreserveAspect: 1
m_FillCenter: 1
@ -6914,7 +6914,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0.89995706, y: -283.1}
m_AnchoredPosition: {x: 0.89995706, y: -257}
m_SizeDelta: {x: 260, y: 74}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3324946295645411117
@ -6945,7 +6945,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: f615ecdbbffd77f4b89afe678ee4d8d5, type: 3}
m_Sprite: {fileID: 21300000, guid: 6ff20609e8c68014394e6b730e1c7948, type: 3}
m_Type: 0
m_PreserveAspect: 1
m_FillCenter: 1
@ -18441,8 +18441,8 @@ MonoBehaviour:
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 45
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
m_FontSize: 42
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 4
@ -34564,8 +34564,8 @@ MonoBehaviour:
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 45
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
m_FontSize: 42
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 4
@ -40769,7 +40769,7 @@ MonoBehaviour:
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
m_FontSize: 45
m_FontStyle: 0
m_BestFit: 0
@ -42173,7 +42173,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 899d77ec337556943b30b2365195276b, type: 3}
m_Sprite: {fileID: 21300000, guid: 6ff20609e8c68014394e6b730e1c7948, type: 3}
m_Type: 0
m_PreserveAspect: 1
m_FillCenter: 1

View File

@ -5,7 +5,7 @@ local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig)
local shenBingConfig = ConfigManager.GetConfig(ConfigName.ShenBing)
local TabBox = require("Modules/Common/TabBox")
local _TabData={
[1] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = Language[10201] },
[1] = { default = "UI_hz_gonghui_19", select = "UI_hz_gonghui_18", name = Language[10201] },
--[2] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "神兵" },
}
local _TabFontColor = { default = Color.New(130 / 255, 128 / 255, 120 / 255, 1),
@ -29,14 +29,14 @@ function this:InitComponent(gameObject)
this.ItemPre1 = Util.GetGameObject(gameObject, "GodWeaponListPanel_List/ItemPre1")
local v2 = this.ScrollParentView1:GetComponent("RectTransform").rect
this.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, this.ScrollParentView1.transform,
this.ItemPre1, nil, Vector2.New(867.1, 1112.8), 1, 1, Vector2.New(0,0))
this.ItemPre1, nil, Vector2.New(820,1030), 1, 1, Vector2.New(0,10))
this.ScrollView.moveTween.MomentumAmount = 1
this.ScrollView.moveTween.Strength = 1
this.ItemPre2 = Util.GetGameObject(gameObject, "GodWeaponListPanel_List/ItemPre2")
local v2 = this.ScrollParentView2:GetComponent("RectTransform").rect
this.ScrollView2 = SubUIManager.Open(SubUIConfig.ScrollCycleView, this.ScrollParentView2.transform,
this.ItemPre2, nil, Vector2.New(867.1, 1112.8), 1, 1, Vector2.New(0,0))
this.ItemPre2, nil, Vector2.New(820,1030), 1, 1, Vector2.New(0,10))
this.ScrollView2.moveTween.MomentumAmount = 1
this.ScrollView2.moveTween.Strength = 1
@ -217,6 +217,11 @@ function this.TabAdapter(tab, index, status)
-- tabImage:GetComponent("Image"):SetNativeSize()
tabLab:GetComponent("Text").text = GetCurLanguage() ~= 2 and _TabData[index].name or "<size=40>".._TabData[index].name.."</size>"
tabLab:GetComponent("Text").color = _TabFontColor[status]
if status=="default" then
tabLab:GetComponent("RectTransform").sizeDelta = Vector2.New(105,58)
elseif status=="select" then
tabLab:GetComponent("RectTransform").sizeDelta = Vector2.New(105,70)
end
-- tabImage.transform.localPosition = Vector3.New( tabImage.transform.localPosition.x, _TabImagePos[status], 0);
end
--切换视图

View File

@ -14,7 +14,7 @@ function this:InitComponent(gameObject)
this.ItemPre = Util.GetGameObject(gameObject, "GodWeaponListPanel_UpWar/ItemPre")
local v2 = Util.GetGameObject(gameObject, "GodWeaponListPanel_UpWar/ScrollParentView"):GetComponent("RectTransform").rect
this.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, Util.GetGameObject(gameObject, "GodWeaponListPanel_UpWar/ScrollParentView").transform,
this.ItemPre, nil, Vector2.New(-v2.x*2, -v2.y*2), 1, 1, Vector2.New(0,-12))
this.ItemPre, nil, Vector2.New(-v2.x*2, -v2.y*2), 1, 1, Vector2.New(0,10))
this.ScrollView.moveTween.MomentumAmount = 1
this.ScrollView.moveTween.Strength = 1
this.NoneImage = Util.GetGameObject(gameObject, "GodWeaponListPanel_UpWar/NoneImage")

View File

@ -687,10 +687,10 @@ function this:BindEvent()
end)
Util.AddClick(this.btnPokemon, function ()
this.FunctionClickEvent(FUNCTION_OPEN_TYPE.POKEMON, function ()
--this.FunctionClickEvent(FUNCTION_OPEN_TYPE.POKEMON, function ()
UIManager.OpenPanel(UIName.PokemonMainPanel)
end)
this.ScenceBtnClick(FUNCTION_OPEN_TYPE.POKEMON)
--end)
--this.ScenceBtnClick(FUNCTION_OPEN_TYPE.POKEMON)
end)
--神将合成、神将置换