背包；

宝箱升级界面的页签按钮移动到通用

Assets/AssetConfigs/Addressable/CustomSearch.txt

@@ -1,4 +1,4 @@
-465
+505
 Assets/Res/Addressable/Tables/achieveRewardTable.bytes
 Assets/Res/Addressable/Fonts/ALIMAMA_SHUHEITI_BOLD_0.TTF
 Assets/Res/Addressable/Fonts/ALIMAMA_SHUHEITI_BOLD_0 SDF.asset
@@ -7,6 +7,7 @@ Assets/Res/Addressable/Tables/arena_phbTable.bytes
 Assets/Res/Addressable/Tables/arenaTable.bytes
 Assets/Res/Addressable/Map/Effects/atk_007.prefab
 Assets/Res/Addressable/Tables/AttrDescTable.bytes
+Assets/Res/Addressable/FGUI/Bag/Bag_atlas0.png
 Assets/Res/Addressable/FGUI/Bag/Bag_fui.bytes
 Assets/Res/Addressable/UI/Prefabs/MainMap/BossBattleInfo.prefab
 Assets/Res/Addressable/Playable/box_SkeletonData.asset
@@ -20,6 +21,7 @@ Assets/Res/Addressable/UI/Atlas/BuffIcon/buff_icon_20171102.jpg
 Assets/Res/Addressable/UI/Atlas/BuffIcon/buff_icon_20331101.jpg
 Assets/Res/Addressable/UI/Atlas/BuffIcon/buff_icon_205211.jpg
 Assets/Res/Addressable/Tables/BuffTable.bytes
+Assets/Res/Addressable/Map/Effects_20240703/bullet_205111.prefab
 Assets/Res/Addressable/Map/Effects_20240703/bullet_201211.prefab
 Assets/Res/Addressable/Map/Effects_20241010/bullet_20131.prefab
 Assets/Res/Addressable/Map/Effects_20241010/bullet_202111.prefab
@@ -27,7 +29,6 @@ Assets/Res/Addressable/Map/Effects_20241010/bullet_202112.prefab
 Assets/Res/Addressable/Map/Effects_20240703/bullet_203511.prefab
 Assets/Res/Addressable/Map/Effects_20241010/bullet_204211.prefab
 Assets/Res/Addressable/Map/Effects_20241010/bullet_204311.prefab
-Assets/Res/Addressable/Map/Effects_20240703/bullet_205111.prefab
 Assets/Res/Addressable/Map/Effects_20241115/bullet_205211.prefab
 Assets/Res/Addressable/Map/Effects_20241010/bullet_205311.prefab
 Assets/Res/Addressable/Map/Effects_20240703/bullet_205411.prefab
@@ -194,6 +195,7 @@ Assets/Res/Addressable/Shaders/GameShaderVariants.shadervariants
 Assets/Res/Addressable/FGUI/GmTool/GmTool_fui.bytes
 Assets/Res/Addressable/Map/Effects/hit_006.prefab
 Assets/Res/Addressable/Map/Effects/hit_007.prefab
+Assets/Res/Addressable/Map/Effects_20240703/hit_205111_1.prefab
 Assets/Res/Addressable/Map/Effects_20240703/hit_201211_1.prefab
 Assets/Res/Addressable/Map/Effects_20240703/hit_201211_2.prefab
 Assets/Res/Addressable/Map/Effects_20241010/hit_20131.prefab
@@ -212,7 +214,6 @@ Assets/Res/Addressable/Map/Effects_20241010/hit_204211.prefab
 Assets/Res/Addressable/Map/Effects_20241010/hit_204311.prefab
 Assets/Res/Addressable/Map/Effects_20241010/hit_204511.prefab
 Assets/Res/Addressable/Map/Effects_20240703/hit_205111.prefab
-Assets/Res/Addressable/Map/Effects_20240703/hit_205111_1.prefab
 Assets/Res/Addressable/Map/Effects_20241115/hit_205211.prefab
 Assets/Res/Addressable/Map/Effects_20241010/hit_205311.prefab
 Assets/Res/Addressable/Map/Effects_20240703/hit_205411_1.prefab
@@ -432,8 +433,47 @@ Assets/Res/Addressable/Tables/shop_shangpinTable.bytes
 Assets/Res/Addressable/Tables/shopTable.bytes
 Assets/Res/Addressable/UI/Atlas/SkillIcon/SkillIcon_13521.png
 Assets/Res/Addressable/UI/Atlas/SkillIcon/SkillIcon_200701.png
+Assets/Res/Addressable/UI/Atlas/SkillIcon/SkillIcon_201111.png
+Assets/Res/Addressable/UI/Atlas/SkillIcon/SkillIcon_201211.png
+Assets/Res/Addressable/UI/Atlas/SkillIcon/SkillIcon_201311.png
+Assets/Res/Addressable/UI/Atlas/SkillIcon/SkillIcon_201411.png
+Assets/Res/Addressable/UI/Atlas/SkillIcon/SkillIcon_201511.png
+Assets/Res/Addressable/UI/Atlas/SkillIcon/SkillIcon_201611.png
 Assets/Res/Addressable/UI/Atlas/SkillIcon/SkillIcon_201711.png
+Assets/Res/Addressable/UI/Atlas/SkillIcon/SkillIcon_201721.png
+Assets/Res/Addressable/UI/Atlas/SkillIcon/SkillIcon_202111.png
+Assets/Res/Addressable/UI/Atlas/SkillIcon/SkillIcon_202211.png
+Assets/Res/Addressable/UI/Atlas/SkillIcon/SkillIcon_202311.png
+Assets/Res/Addressable/UI/Atlas/SkillIcon/SkillIcon_202411.png
+Assets/Res/Addressable/UI/Atlas/SkillIcon/SkillIcon_202511.png
+Assets/Res/Addressable/UI/Atlas/SkillIcon/SkillIcon_202611.png
+Assets/Res/Addressable/UI/Atlas/SkillIcon/SkillIcon_202711.png
+Assets/Res/Addressable/UI/Atlas/SkillIcon/SkillIcon_202721.png
+Assets/Res/Addressable/UI/Atlas/SkillIcon/SkillIcon_203111.png
+Assets/Res/Addressable/UI/Atlas/SkillIcon/SkillIcon_203211.png
+Assets/Res/Addressable/UI/Atlas/SkillIcon/SkillIcon_203311.png
+Assets/Res/Addressable/UI/Atlas/SkillIcon/SkillIcon_203411.png
+Assets/Res/Addressable/UI/Atlas/SkillIcon/SkillIcon_203511.png
+Assets/Res/Addressable/UI/Atlas/SkillIcon/SkillIcon_203611.png
+Assets/Res/Addressable/UI/Atlas/SkillIcon/SkillIcon_203711.png
+Assets/Res/Addressable/UI/Atlas/SkillIcon/SkillIcon_203721.png
+Assets/Res/Addressable/UI/Atlas/SkillIcon/SkillIcon_204111.png
+Assets/Res/Addressable/UI/Atlas/SkillIcon/SkillIcon_204211.png
+Assets/Res/Addressable/UI/Atlas/SkillIcon/SkillIcon_204311.png
+Assets/Res/Addressable/UI/Atlas/SkillIcon/SkillIcon_204411.png
+Assets/Res/Addressable/UI/Atlas/SkillIcon/SkillIcon_204511.png
+Assets/Res/Addressable/UI/Atlas/SkillIcon/SkillIcon_204611.png
+Assets/Res/Addressable/UI/Atlas/SkillIcon/SkillIcon_204711.png
+Assets/Res/Addressable/UI/Atlas/SkillIcon/SkillIcon_204721.png
+Assets/Res/Addressable/UI/Atlas/SkillIcon/SkillIcon_205111.png
+Assets/Res/Addressable/UI/Atlas/SkillIcon/SkillIcon_205211.png
 Assets/Res/Addressable/UI/Atlas/SkillIcon/SkillIcon_20521101.png
+Assets/Res/Addressable/UI/Atlas/SkillIcon/SkillIcon_205311.png
+Assets/Res/Addressable/UI/Atlas/SkillIcon/SkillIcon_205411.png
+Assets/Res/Addressable/UI/Atlas/SkillIcon/SkillIcon_205511.png
+Assets/Res/Addressable/UI/Atlas/SkillIcon/SkillIcon_205611.png
+Assets/Res/Addressable/UI/Atlas/SkillIcon/SkillIcon_205711.png
+Assets/Res/Addressable/UI/Atlas/SkillIcon/SkillIcon_205721.png
 Assets/Res/Addressable/Tables/SkillTable.bytes
 Assets/Res/Addressable/Tables/SkillVfxsTable.bytes
 Assets/Res/Addressable/Tables/taskAchieveTable.bytes

Assets/AssetConfigs/Addressable/ProductAssetManifest.asset

@@ -45,6 +45,10 @@ MonoBehaviour:
     addressableName: attrdesctable
     assetGUID: d1f6bdab9b6630947aaf9962d9514752
     relativePath: 
+  - addressableId: 4136636880
+    addressableName: bag_atlas0
+    assetGUID: 36b2ccaeb6a74ec49beae475dae7259c
+    relativePath: 
   - addressableId: 2295353524
     addressableName: bag_fui
     assetGUID: cfb1b4c0a624fad4997bd292d0c9dbcc
@@ -101,6 +105,10 @@ MonoBehaviour:
     addressableName: bullet_201211
     assetGUID: d77662bf43b333a47a6e58f50abe6603
     relativePath: 
+  - addressableId: 169147319
+    addressableName: bullet_201211_bd373930
+    assetGUID: bd373930b8353a34397050b53dea1270
+    relativePath: 
   - addressableId: 2239041831
     addressableName: bullet_20131
     assetGUID: 7bfa8be18304ad24288e7e4883ddc0bf
@@ -125,10 +133,6 @@ MonoBehaviour:
     addressableName: bullet_204311
     assetGUID: c34b5caaf59175b419e761709208f9a8
     relativePath: 
-  - addressableId: 3352116549
-    addressableName: bullet_205111
-    assetGUID: 7c73b3081d2821f4d9c5333a5999ee5f
-    relativePath: 
   - addressableId: 3267157328
     addressableName: bullet_205211
     assetGUID: 076df5fc3c512194297f04294e3d3a54
@@ -797,6 +801,10 @@ MonoBehaviour:
     addressableName: hit_201211_1
     assetGUID: 810bc40ce0851d445b7ad6fcb84974e9
     relativePath: 
+  - addressableId: 3005893766
+    addressableName: hit_201211_1_5642e036
+    assetGUID: 5642e03649d82dc4eb8a9aba47380dbc
+    relativePath: 
   - addressableId: 2894663539
     addressableName: hit_201211_2
     assetGUID: 7b3ee1ac394e00b42a4d0e21cecf0135
@@ -865,10 +873,6 @@ MonoBehaviour:
     addressableName: hit_205111
     assetGUID: fb693b86f81906740bc61f5e08854c1f
     relativePath: 
-  - addressableId: 3748816028
-    addressableName: hit_205111_1
-    assetGUID: df2712930b0e18342aa8e8d6ddadf59b
-    relativePath: 
   - addressableId: 3471651943
     addressableName: hit_205211
     assetGUID: 2a916686cd3fa3848b34d1a73de480e7
@@ -1745,14 +1749,170 @@ MonoBehaviour:
     addressableName: skillicon_200701
     assetGUID: 14c6a7a260d3b464ea5fe787559c5849
     relativePath: 
+  - addressableId: 1913580955
+    addressableName: skillicon_201111
+    assetGUID: fe878bae5c25e5f4983488f02c3e043a
+    relativePath: 
+  - addressableId: 3447821692
+    addressableName: skillicon_201211
+    assetGUID: 0fb595c5d6441c64590731d049694e3f
+    relativePath: 
+  - addressableId: 3912490923
+    addressableName: skillicon_201311
+    assetGUID: 34c0ab8e5ad196d4e80cbe91c9d275c7
+    relativePath: 
+  - addressableId: 4242464066
+    addressableName: skillicon_201411
+    assetGUID: b2c9d6e53e819d1459527b4f1370cbde
+    relativePath: 
+  - addressableId: 1969280134
+    addressableName: skillicon_201511
+    assetGUID: 093fabef49be52b4b9e2633f9a9fcf7b
+    relativePath: 
+  - addressableId: 4118230786
+    addressableName: skillicon_201611
+    assetGUID: 429b500996049b346aad419646a0ee50
+    relativePath: 
   - addressableId: 213130530
     addressableName: skillicon_201711
     assetGUID: a8ebcff948302dc40a6796275173488c
     relativePath: 
+  - addressableId: 4001498068
+    addressableName: skillicon_201721
+    assetGUID: e78f9415ea1952a40adfd75bda1a0921
+    relativePath: 
+  - addressableId: 2442066944
+    addressableName: skillicon_202111
+    assetGUID: 26073c292d15d5e47ba55a235ac08c07
+    relativePath: 
+  - addressableId: 3721052563
+    addressableName: skillicon_202211
+    assetGUID: 50205bf456a9abf41a0fd1d51a774178
+    relativePath: 
+  - addressableId: 4032575231
+    addressableName: skillicon_202311
+    assetGUID: eb783e4104694844999f7fe79947e985
+    relativePath: 
+  - addressableId: 1750449229
+    addressableName: skillicon_202411
+    assetGUID: c2563edd0711d5f429b9a043ce921acf
+    relativePath: 
+  - addressableId: 1948808494
+    addressableName: skillicon_202511
+    assetGUID: 1120bef4b9139ff4ab42080664de3589
+    relativePath: 
+  - addressableId: 1297131503
+    addressableName: skillicon_202611
+    assetGUID: d69207bec2130b14cb65e0a8cbe33b7b
+    relativePath: 
+  - addressableId: 2043893370
+    addressableName: skillicon_202711
+    assetGUID: dd4249362a2ce4349a0f24fcdab99e86
+    relativePath: 
+  - addressableId: 390311205
+    addressableName: skillicon_202721
+    assetGUID: ee7942a4b4531e34d854c4052fecda5d
+    relativePath: 
+  - addressableId: 1483456136
+    addressableName: skillicon_203111
+    assetGUID: fc611546b4d1d614fb2c02f98cdcc291
+    relativePath: 
+  - addressableId: 1239335337
+    addressableName: skillicon_203211
+    assetGUID: 368dfeab669450e41b3bf6a33a2b489c
+    relativePath: 
+  - addressableId: 662499281
+    addressableName: skillicon_203311
+    assetGUID: 9e4e964082d3c7e498c0b6a807155847
+    relativePath: 
+  - addressableId: 2268988766
+    addressableName: skillicon_203411
+    assetGUID: b3c31f96d6f35304b9549815c13edf51
+    relativePath: 
+  - addressableId: 1932098689
+    addressableName: skillicon_203511
+    assetGUID: 0eae66f469433894bb78c404d1d5dd7f
+    relativePath: 
+  - addressableId: 1538922173
+    addressableName: skillicon_203611
+    assetGUID: 18d680db340f2084989f7dc66b738553
+    relativePath: 
+  - addressableId: 1199904306
+    addressableName: skillicon_203711
+    assetGUID: 2a779bdf8897ba04485af057865e57e3
+    relativePath: 
+  - addressableId: 1174986692
+    addressableName: skillicon_203721
+    assetGUID: 7981276d5c484f84d998749585ed5fcf
+    relativePath: 
+  - addressableId: 525527053
+    addressableName: skillicon_204111
+    assetGUID: 4b02fc802b31e3f49942e9e379784ef8
+    relativePath: 
+  - addressableId: 4198758715
+    addressableName: skillicon_204211
+    assetGUID: 77c005ac32b21194a91f4b2c7e893f0f
+    relativePath: 
+  - addressableId: 523318123
+    addressableName: skillicon_204311
+    assetGUID: d80f6d2785f904740ac92c78848e2d7c
+    relativePath: 
+  - addressableId: 266864556
+    addressableName: skillicon_204411
+    assetGUID: a68ac26d16227b4439dd22df28a1baf4
+    relativePath: 
+  - addressableId: 1729835541
+    addressableName: skillicon_204511
+    assetGUID: 76321309f0a16ad42b65c562b27155bb
+    relativePath: 
+  - addressableId: 3123291375
+    addressableName: skillicon_204611
+    assetGUID: ed7e5c8bd930c424da239e84ebad1ed6
+    relativePath: 
+  - addressableId: 2127102484
+    addressableName: skillicon_204711
+    assetGUID: 3c1576000163de846850a309e6b9c531
+    relativePath: 
+  - addressableId: 2292070151
+    addressableName: skillicon_204721
+    assetGUID: d871888e3dff6b24d86887410860f759
+    relativePath: 
+  - addressableId: 1666844669
+    addressableName: skillicon_205111
+    assetGUID: ac4da3727f20e21449d87b30fc6a12bb
+    relativePath: 
+  - addressableId: 214357521
+    addressableName: skillicon_205211
+    assetGUID: 7d048249b6ecc334493e90225b0cffb2
+    relativePath: 
   - addressableId: 3002255891
     addressableName: skillicon_20521101
     assetGUID: 86bb72a2ce0056b49ac28e4a0904043f
     relativePath: 
+  - addressableId: 2683719631
+    addressableName: skillicon_205311
+    assetGUID: e97f9bcb1270c3643aa6a63e185b33ae
+    relativePath: 
+  - addressableId: 2712457112
+    addressableName: skillicon_205411
+    assetGUID: 696b5678f3155fe4d8e28afb4f9139f2
+    relativePath: 
+  - addressableId: 1781525047
+    addressableName: skillicon_205511
+    assetGUID: de149248fa30d86448787e87e8c7c129
+    relativePath: 
+  - addressableId: 1499064544
+    addressableName: skillicon_205611
+    assetGUID: 37cb253eba269a84b8ae3594e14e8b8f
+    relativePath: 
+  - addressableId: 737555211
+    addressableName: skillicon_205711
+    assetGUID: a24d87aa7f1837b48b14b37c907fd947
+    relativePath: 
+  - addressableId: 2031855545
+    addressableName: skillicon_205721
+    assetGUID: 41d5306e9b6ddc044a7de19e45f399af
+    relativePath: 
   - addressableId: 2169794763
     addressableName: skilltable
     assetGUID: fd528f8d76b5d1c4a9877afbeedcbea0

Assets/Res/Addressable/FGUI/Bag/Bag_atlas0.png.meta

@@ -0,0 +1,189 @@
+fileFormatVersion: 2
+guid: DHxNt3n+Ai4d4pi6I+wimZ1fspPz3S3+E3ZCEh5xijDxsRv0/BC5sh8=
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  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
+    flipGreenChannel: 0
+  isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  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: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: HMIAndroid
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Addressable/Map/Effects_20240703/bullet_201211.prefab.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d77662bf43b333a47a6e58f50abe6603
+guid: XS4csimkUHuXuTGteRW8bjK3mlreS5hKYsKWBHZA/2GJs+tin4LbMZY=
 PrefabImporter:
   externalObjects: {}
   userData: 

Assets/Res/Addressable/Map/Effects_20240703/hit_201211_1.prefab.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 810bc40ce0851d445b7ad6fcb84974e9
+guid: Cnwbt3+tUH0hXl51G5FA5ha6kcbxn2GfF1YMDSOKqn41mcWF4XWj/Jk=
 PrefabImporter:
   externalObjects: {}
   userData: 

Assets/Res/Addressable/UI/Atlas/ItemIcon/atlas_rauai_itemicon.spriteatlas

@@ -80,184 +80,12 @@ SpriteAtlas:
     bindAsDefault: 1
     isAtlasV2: 0
     cachedData: {fileID: 0}
-    packedSpriteRenderDataKeys:
-    - 961c6c60efa6c4f4ca250f0ddec2adc7: 21300000
-    - 59a71c704d4fb2f489743af33d231438: 21300000
-    - b869eff043911bd4a97b23a3cbf93635: 21300000
-    - 17434301afa05174f842e58076d75e01: 21300000
-    - 16e44b7144944ec48bc6e67ddaa3a552: 21300000
-    - 9ecf0ac151c4eb144afb54c16e8237d6: 21300000
-    - 26450dc1f7c2ecc4ab43e3944fb9c18f: 21300000
-    - a153fe422f616534caa640a7fb19551e: 21300000
-    - 7025ac521e6e9fd47b204c5eb43b46f7: 21300000
-    - 6a688d62e7000a44f94fa46c20419b08: 21300000
-    - c54ad1b2f48e38e4da939c3b2e9753e5: 21300000
-    - adda6e23389223d4c92afb7f654b17db: 21300000
-    - 0455c343f3420f841bb6c8bd665cd4b7: 21300000
-    - 03eb3483d8d1e87419a763ad09e7c945: 21300000
-    - f81f13a3e0317c74d8a6609a69e38e64: 21300000
-    - a8e872e3264e6674f95f2475419d6993: 21300000
-    - 984cff14e5800ca40859c5ab01d4eba2: 21300000
-    - 951e0a541f216534eaab0b58fab910fe: 21300000
-    - 1a504064c320a4f44a850941900f134f: 21300000
-    - 4097330583a64b943954f3d997e6d9b2: 21300000
-    - 7d1f5a957a416bf42bf130c249417a2b: 21300000
-    - 6e732db5cda607f47bd6106b4b639e40: 21300000
-    - 3f29f3363cc0f6440890902b14a5dc87: 21300000
-    - db93d8c6f016e5243876b0a9996aadd0: 21300000
-    - 4f5aa36701116f440a2203031dedb845: 21300000
-    - bbd6d487feb947042afed91d819b68f5: 21300000
-    - 269de1c724d6e324b94d9c5e0692d779: 21300000
-    - 3e2a29485d627d446b181bb711b5f62a: 21300000
-    - fd8e27b8e5b02b045a8a168d6a6b0778: 21300000
-    - c2ccc1c8caf5a624097c5b62d204482b: 21300000
-    - d1f61ec81a746684381bb3d57663a52d: 21300000
-    - 2ce265d865bf35b42a7f2d1bffdd6fad: 21300000
-    - d8f36a19c251fea43963fe3b114269c5: 21300000
-    - 2ded1f596c6ba9b44b95fc814be28291: 21300000
-    - bda8bb69083a143459dc8bb174985fe4: 21300000
-    - f80c34b9b43e15741a732ecc408ccbfc: 21300000
-    - 91d9352ab0bb95645ae90df10172d0ec: 21300000
-    - 793c3e5ad07665645afe7d4015f71f5d: 21300000
-    - d887147a341034a40a7e02adaedc7430: 21300000
-    - 71d40baaf86b80347bd16fc9e04ffb02: 21300000
-    - 01c84eea242233341935c6ada6f16cf1: 21300000
-    - ce3973fad12c3f14ba586dc1dc50775c: 21300000
-    - 02ebae1b1da4c134793c3d92ed0b39e7: 21300000
-    - 8da8d62b10fd2254ba85cb0622c5ed90: 21300000
-    - d1bb084ba3f78e742bc9781278c5d00e: 21300000
-    - 68d7d59b0002f7146a81241d44d81e7a: 21300000
-    - 34c5ceeb3f0eb2f4bbfeefbd9b1a9345: 21300000
-    - 3a9f801cbeafc9d4385dc9938422d2af: 21300000
-    - bca7503cf07c44043aa40ea5a2e4acd5: 21300000
-    - f665c1fc0f2ad624988185cc62ef3551: 21300000
-    - 0fa12ffc200c7f64fb4d350e873a41dd: 21300000
-    - 4f5c427d96599a447a7363f14044a8a0: 21300000
-    - 400743ddbbab5cb40a1534a491e3e96d: 21300000
-    - 6665f3ed45e2ed548b5a06b86b85398d: 21300000
-    - 45f4b0ae2448f9744baee018dc21583d: 21300000
-    - ce26833f5cc3e1948ac8475b2566efc1: 21300000
-    - d594797f58341904d9dbe2056c95ba03: 21300000
-    - 8bba91af604f8b045ba1dad87aaed685: 21300000
+    packedSpriteRenderDataKeys: []
   m_MasterAtlas: {fileID: 0}
   m_PackedSprites:
-  - {fileID: 21300000, guid: 961c6c60efa6c4f4ca250f0ddec2adc7, type: 3}
-  - {fileID: 21300000, guid: 59a71c704d4fb2f489743af33d231438, type: 3}
-  - {fileID: 21300000, guid: b869eff043911bd4a97b23a3cbf93635, type: 3}
-  - {fileID: 21300000, guid: 17434301afa05174f842e58076d75e01, type: 3}
-  - {fileID: 21300000, guid: 16e44b7144944ec48bc6e67ddaa3a552, type: 3}
-  - {fileID: 21300000, guid: 9ecf0ac151c4eb144afb54c16e8237d6, type: 3}
-  - {fileID: 21300000, guid: 26450dc1f7c2ecc4ab43e3944fb9c18f, type: 3}
-  - {fileID: 21300000, guid: a153fe422f616534caa640a7fb19551e, type: 3}
-  - {fileID: 21300000, guid: 7025ac521e6e9fd47b204c5eb43b46f7, type: 3}
-  - {fileID: 21300000, guid: 6a688d62e7000a44f94fa46c20419b08, type: 3}
-  - {fileID: 21300000, guid: c54ad1b2f48e38e4da939c3b2e9753e5, type: 3}
-  - {fileID: 21300000, guid: adda6e23389223d4c92afb7f654b17db, type: 3}
-  - {fileID: 21300000, guid: 0455c343f3420f841bb6c8bd665cd4b7, type: 3}
-  - {fileID: 21300000, guid: 03eb3483d8d1e87419a763ad09e7c945, type: 3}
-  - {fileID: 21300000, guid: f81f13a3e0317c74d8a6609a69e38e64, type: 3}
-  - {fileID: 21300000, guid: a8e872e3264e6674f95f2475419d6993, type: 3}
-  - {fileID: 21300000, guid: 984cff14e5800ca40859c5ab01d4eba2, type: 3}
-  - {fileID: 21300000, guid: 951e0a541f216534eaab0b58fab910fe, type: 3}
-  - {fileID: 21300000, guid: 1a504064c320a4f44a850941900f134f, type: 3}
-  - {fileID: 21300000, guid: 4097330583a64b943954f3d997e6d9b2, type: 3}
-  - {fileID: 21300000, guid: 7d1f5a957a416bf42bf130c249417a2b, type: 3}
-  - {fileID: 21300000, guid: 6e732db5cda607f47bd6106b4b639e40, type: 3}
-  - {fileID: 21300000, guid: 3f29f3363cc0f6440890902b14a5dc87, type: 3}
-  - {fileID: 21300000, guid: db93d8c6f016e5243876b0a9996aadd0, type: 3}
-  - {fileID: 21300000, guid: 4f5aa36701116f440a2203031dedb845, type: 3}
-  - {fileID: 21300000, guid: bbd6d487feb947042afed91d819b68f5, type: 3}
-  - {fileID: 21300000, guid: 269de1c724d6e324b94d9c5e0692d779, type: 3}
-  - {fileID: 21300000, guid: 3e2a29485d627d446b181bb711b5f62a, type: 3}
-  - {fileID: 21300000, guid: fd8e27b8e5b02b045a8a168d6a6b0778, type: 3}
-  - {fileID: 21300000, guid: c2ccc1c8caf5a624097c5b62d204482b, type: 3}
-  - {fileID: 21300000, guid: d1f61ec81a746684381bb3d57663a52d, type: 3}
-  - {fileID: 21300000, guid: 2ce265d865bf35b42a7f2d1bffdd6fad, type: 3}
-  - {fileID: 21300000, guid: d8f36a19c251fea43963fe3b114269c5, type: 3}
-  - {fileID: 21300000, guid: 2ded1f596c6ba9b44b95fc814be28291, type: 3}
-  - {fileID: 21300000, guid: bda8bb69083a143459dc8bb174985fe4, type: 3}
-  - {fileID: 21300000, guid: f80c34b9b43e15741a732ecc408ccbfc, type: 3}
-  - {fileID: 21300000, guid: 91d9352ab0bb95645ae90df10172d0ec, type: 3}
-  - {fileID: 21300000, guid: 793c3e5ad07665645afe7d4015f71f5d, type: 3}
-  - {fileID: 21300000, guid: d887147a341034a40a7e02adaedc7430, type: 3}
-  - {fileID: 21300000, guid: 71d40baaf86b80347bd16fc9e04ffb02, type: 3}
-  - {fileID: 21300000, guid: 01c84eea242233341935c6ada6f16cf1, type: 3}
-  - {fileID: 21300000, guid: ce3973fad12c3f14ba586dc1dc50775c, type: 3}
-  - {fileID: 21300000, guid: 02ebae1b1da4c134793c3d92ed0b39e7, type: 3}
-  - {fileID: 21300000, guid: 8da8d62b10fd2254ba85cb0622c5ed90, type: 3}
-  - {fileID: 21300000, guid: d1bb084ba3f78e742bc9781278c5d00e, type: 3}
-  - {fileID: 21300000, guid: 68d7d59b0002f7146a81241d44d81e7a, type: 3}
-  - {fileID: 21300000, guid: 34c5ceeb3f0eb2f4bbfeefbd9b1a9345, type: 3}
-  - {fileID: 21300000, guid: 3a9f801cbeafc9d4385dc9938422d2af, type: 3}
-  - {fileID: 21300000, guid: bca7503cf07c44043aa40ea5a2e4acd5, type: 3}
-  - {fileID: 21300000, guid: f665c1fc0f2ad624988185cc62ef3551, type: 3}
-  - {fileID: 21300000, guid: 0fa12ffc200c7f64fb4d350e873a41dd, type: 3}
-  - {fileID: 21300000, guid: 4f5c427d96599a447a7363f14044a8a0, type: 3}
-  - {fileID: 21300000, guid: 400743ddbbab5cb40a1534a491e3e96d, type: 3}
-  - {fileID: 21300000, guid: 6665f3ed45e2ed548b5a06b86b85398d, type: 3}
-  - {fileID: 21300000, guid: 45f4b0ae2448f9744baee018dc21583d, type: 3}
-  - {fileID: 21300000, guid: ce26833f5cc3e1948ac8475b2566efc1, type: 3}
-  - {fileID: 21300000, guid: d594797f58341904d9dbe2056c95ba03, type: 3}
-  - {fileID: 21300000, guid: 8bba91af604f8b045ba1dad87aaed685, type: 3}
+  - {fileID: 21300000, guid: 8b6458543cadab045bde92a02b23b600, type: 3}
   m_PackedSpriteNamesToIndex:
-  - ItemIcon_610201
-  - ItemIcon_210601
-  - daojukuang5
-  - daojukuang7
-  - ItemIcon_510501
-  - ItemIcon_110601
-  - daojukuang6
-  - ItemIcon_110401
-  - ItemIcon_4
-  - ItemIcon_110501
-  - ItemIcon_610601
-  - ItemIcon_6
-  - daojukuang1
-  - ItemIcon_310601
-  - ItemIcon_410601
-  - ItemIcon_610501
-  - ItemIcon_410201
-  - ItemIcon_510201
-  - daojukuang10
-  - ItemIcon_210201
-  - daojukuang11
-  - ItemIcon_510601
-  - ItemIcon_310301
-  - ItemIcon_210101
-  - ItemIcon_2
-  - ItemIcon_410301
-  - ItemIcon_3001
-  - ItemIcon_110201
-  - ItemIcon_410401
-  - ItemIcon_210501
-  - ItemIcon_610301
-  - ItemIcon_610401
-  - ItemIcon_110101
-  - ItemIcon_210301
-  - ItemIcon_110301
-  - ItemIcon_310401
-  - daojukuang3
-  - ItemIcon_310201
-  - daojukuang4
-  - ItemIcon_1
-  - ItemIcon_power
-  - ItemIcon_410101
-  - ItemIcon_1024
-  - ItemIcon_210401
-  - ItemIcon_99
-  - ItemIcon_310501
-  - ItemIcon_610101
-  - ItemIcon_510301
-  - ItemIcon_1001
-  - ItemIcon_5
-  - ItemIcon_510101
-  - daojukuang9
-  - daojukuang2
-  - ItemIcon_3
-  - ItemIcon_510401
-  - daojukuang8
-  - ItemIcon_310101
-  - ItemIcon_410501
+  - vcard_img_mingpian_exhbition_bg
   m_RenderDataMap: {}
   m_Tag: atlas_rauai_itemicon
   m_IsVariant: 0

Assets/Scripts/Business/Domain/Database/Metadatas/EItemType.cs

@@ -4,13 +4,13 @@
 namespace XGame.Database
 {
     /// <summary>
-    /// 0:资源\n1:代币类\n2:抽奖道具\n3:宝箱\n4:礼包\n5:头衔\n6：外观\n7:特权卡\n8:红包\n9:符石\n10:装备\n11:飞剑(随从)\n12:技能
+    /// 0:资源\n1:代币类\n2:常规道具\n3:宝箱\n4:礼包\n5:头衔\n6：外观\n7:特权卡\n8:红包\n9:符石\n10:装备\n11:飞剑(随从)\n12:技能\n13:坐骑
     /// </summary>
     public enum EItemType : int
     {
         Res,
         Currency,
-        Lottery,
+        Props,
         TreasureChest,
         Gift,
         Title,
@@ -21,5 +21,6 @@ namespace XGame.Database
         Equip,
         Partner,
         Skill,
+        Mount,
     }
 }

Assets/Scripts/Business/Runtime/Data/Items/ItemData.cs

@@ -124,6 +124,15 @@ namespace FL.Data
             return false;
         }
 
+        /// <summary>
+        /// 获取礼包|红包类型道具(道具页签)，常规道具类型(材料页签)用来在背包界面显示
+        /// </summary>
+        /// <returns></returns>
+        public Dictionary<int, BagItemData> GetBackpackData()
+        {
+            return _bagItemDataDic;
+        }
+
         void IDisposable.Dispose()
         {
             if (_bagItemDataDic?.Count > 0) 

Assets/Scripts/Business/Runtime/FGUI/Bag.meta

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

Assets/Scripts/Business/Runtime/FGUI/Bag/BackpackPanel.meta

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

Assets/Scripts/Business/Runtime/FGUI/Bag/BackpackPanel/BagBackpackPanelCtrl.cs

@@ -0,0 +1,124 @@
+/// #pkgName FGUI包名
+/// #panelName UIPanel名字
+/// #UIName = $"{#pkgName}{#panelName}" UIKey名字
+/// 该脚本由模板创建
+/// created by cb 2024
+
+using Codice.CM.Common;
+using FairyGUI;
+using FL.Data;
+using FL.Data.Items;
+using System;
+using System.Collections.Generic;
+using System.Net.NetworkInformation;
+using XGame.Database;
+using XGame.Framework.UI;
+
+namespace FL.FGUI
+{
+    /// <summary>
+    /// UI逻辑处理类
+    /// </summary>
+    /// <typeparam name=""></typeparam>
+    public partial class BagBackpackPanelCtrl : UIController<BagBackpackPanelVM>
+    {
+        private List<Item> _itemDataList;
+        private List<Item> _matterialDataList;
+
+        protected override void OnEnable(object intent)
+        {
+            AddUIListenres();
+            Init();
+            ShowUI();
+        }
+        protected override void OnDisable()
+        {
+            RemoveUIListenres();
+        }
+        #region UI事件
+        private void AddUIListenres()
+        {
+            VM.ItemPageBtn.onClick.Add(OnClickItemPageBtn);
+            VM.MaterialPageBtn.onClick.Add(OnClickMaterialPageBtn);
+
+        }
+        private void RemoveUIListenres()
+        {
+            VM.ItemPageBtn.onClick.Remove(OnClickItemPageBtn);
+            VM.MaterialPageBtn.onClick.Remove(OnClickMaterialPageBtn);
+
+        }
+        private void OnClickItemPageBtn(EventContext context)
+        {
+            ShowPageUI(0);
+        }
+        private void OnClickMaterialPageBtn(EventContext context)
+        {
+            ShowPageUI(1);
+        }
+
+        #endregion
+
+        private void Init()
+        {
+            if (_itemDataList == null) _itemDataList= new List<Item>();
+            if (_matterialDataList == null) _matterialDataList = new List<Item>();
+        }
+
+        private void ShowUI()
+        {
+            GetBackpackData(ItemData.Instance.GetBackpackData());
+            ShowPageUI(0);
+        }
+        private void GetBackpackData(Dictionary<int, BagItemData> bagDataMap)
+        {
+            if (bagDataMap == null || bagDataMap.Count == 0) return;
+            _itemDataList.Clear();
+            _matterialDataList.Clear();
+            foreach (var item in bagDataMap)
+            {
+                ItemTable itemInfo = ItemTableRepo.Get(item.Value.tableId);
+                if (itemInfo.Type == (int)EItemType.Gift || itemInfo.Type == (int)EItemType.RedEnvelope || itemInfo.Type == (int)EItemType.Props)
+                {
+                    Item _item = new Item();
+                    _item.Count = item.Value.num.ToString();
+                    _item.Init(itemInfo, item.Value.id);
+                    if (itemInfo.Type == (int)EItemType.Props)
+                        _matterialDataList.Add(_item);
+                    else
+                        _itemDataList.Add(_item);
+                }
+            }
+        }
+
+        private void ShowPageUI(int pageIndex)
+        {
+            VM.PageCtrl.selectedIndex = pageIndex;
+            if (pageIndex == 0)
+            {
+                ShowItemsUI(_itemDataList);
+            }
+            else
+            {
+                ShowItemsUI(_matterialDataList);
+            }
+        }
+
+        private void ShowItemsUI(List<Item> dataList)
+        {
+            VM.ItemsList.BindDatas(dataList);
+            ShowNum(dataList.Count);
+            VM.EmptyLabel.visible = dataList.Count == 0;
+        }
+
+        /// <summary>
+        /// 背包格子数量
+        /// </summary>
+        /// <param name="num"></param>
+        private void ShowNum(int num) 
+        {
+            VM.NumLabel.text = num.ToString();
+        }
+
+    }
+}

Assets/Scripts/Business/Runtime/FGUI/Bag/BackpackPanel/BagBackpackPanelCtrl.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: DHgXvSOkAH5ApbidLbdZyFovN7iueJz/jeuNGQoPd5v4dlmvIYnnq/E=
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Business/Runtime/FGUI/Bag/BackpackPanel/BagBackpackPanelVM.Gen.cs

@@ -0,0 +1,45 @@
+/// #pkgName FGUI包名
+/// #panelName UIPanel名字
+/// #UIName = $"{#pkgName}{#panelName}" UIKey名字
+/// #PropertyDefineArea 属性定义区域
+/// #PropertyAssignArea 属性赋值区域
+/// #ComponentType 组件类型
+/// #PropertyName 属性名字
+/// 该脚本由模板创建，不可编辑
+/// created by cb 2024
+using FairyGUI;
+using XGame.Framework.FGUI;
+using XGame.Framework.UI;
+
+namespace FL.FGUI
+{
+    /// <summary>
+    /// 该脚本由模板创建，不可修改，不可编辑
+    /// </summary>
+    public partial class BagBackpackPanelVM : FguiViewModel
+    {
+        public Controller PageCtrl { get; private set; }
+        public CommonBackGroundNestedView MaskBg { get; private set; }
+        public GLabel PopWin { get; private set; }
+        public GList ItemsList { get; private set; }
+        public GButton ItemPageBtn { get; private set; }
+        public GButton MaterialPageBtn { get; private set; }
+        public GTextField NumLabel { get; private set; }
+        public GTextField EmptyLabel { get; private set; }
+
+        protected override void BindComponents(GComponent panel, IUIViewAdapter adapter)
+        {
+            PageCtrl = panel.GetController("PageCtrl");
+            MaskBg = adapter.CreateNested<CommonBackGroundNestedView>(new FguiNested(panel.GetChild("MaskBg").asCom), true);
+            AddChild(MaskBg);
+            PopWin = panel.GetChild("PopWin") as GLabel;
+            ItemsList = panel.GetChild("ItemsList") as GList;
+            ItemsList.Init(typeof(CommonItemBaseView), adapter.CreateListItem);
+            ItemPageBtn = panel.GetChild("ItemPageBtn") as GButton;
+            MaterialPageBtn = panel.GetChild("MaterialPageBtn") as GButton;
+            NumLabel = panel.GetChild("NumLabel") as GTextField;
+            EmptyLabel = panel.GetChild("EmptyLabel") as GTextField;
+
+        }
+    }
+}

Assets/Scripts/Business/Runtime/FGUI/Bag/BackpackPanel/BagBackpackPanelVM.Gen.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: XChK4yKtAnmoqzCI8ag+WOOzMqaKBSfLVDvn4FxTKqGAKGZvbDqlPTQ=
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Business/Runtime/FGUI/Bag/BackpackPanel/BagBackpackPanelView.cs

@@ -0,0 +1,34 @@
+/// #pkgName FGUI包名
+/// #panelName UIPanel名字
+/// #UIName = $"{#pkgName}{#panelName}" UIKey名字
+/// 该脚本由模板创建
+/// created by cb 2024
+
+using XGame.Framework.UI;
+
+namespace FL.FGUI
+{
+    public static partial class UIKeys
+    {
+        private static UIKey _BagBackpackPanel;
+        public static UIKey BagBackpackPanel => _BagBackpackPanel ?? (_BagBackpackPanel = new UIKey("Bag", "BackpackPanel", typeof(BagBackpackPanelView)));
+    }
+    public partial class BagBackpackPanelView : UIView
+    {
+        public static UILayer Layer => UILayer.Popup;
+        protected override void AddController(IUIControllerGroup group)
+        {
+            group.Add(new BagBackpackPanelCtrl());
+        }
+
+        protected override IUIViewModel CreateViewModel()
+        {
+            return new BagBackpackPanelVM();
+        }
+
+        protected override void OnDispose()
+        {
+        }
+    }
+}
+

Assets/Scripts/Business/Runtime/FGUI/Bag/BackpackPanel/BagBackpackPanelView.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: CXNJsSuoU3sLoxqki6O1p2xF06Uvwyigd2gSnyV+pvGyPmgeMM/e9rM=
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Business/Runtime/FGUI/Common/ItemBase/CommonItemBaseCtrl.cs

@@ -130,5 +130,19 @@ namespace FL.FGUI
             }
         }
 
+        /// <summary>
+        /// 道具背包中的物品信息
+        /// </summary>
+        /// <param name="index"></param>
+        /// <param name="itemData"></param>
+        public void OnRefresh(int index, Item itemData)
+        {
+            UiParam _uiParam = new UiParam();
+            _uiParam.bShowBtn = true;
+            _uiParam.bShowName = false;
+            _uiParam.bShowCount = true;
+            _uiParam.bShowLevel = false;
+            ShowUI(itemData, _uiParam);
+        }
     }
 }

Assets/Scripts/Business/Runtime/FGUI/Common/ItemBase/CommonItemBaseView.ListItem.cs

@@ -0,0 +1,21 @@
+/// #pkgName FGUI包名
+/// #panelName UIPanel名字
+/// #UIName = $"{#pkgName}{#panelName}" UIKey名字
+/// 该脚本由模板创建
+/// created by cb 2024
+
+using FairyGUI;
+using FL.Data.Items;
+
+namespace FL.FGUI
+{
+    public partial class CommonItemBaseView : IGListItemHandle
+    {
+        public int ItemIndex { get; private set; }
+        void IGListItemHandle.OnRefresh(int index, object data)
+        {
+            ItemIndex = index;
+            Ctrl.OnRefresh(index, data as Item);
+        }
+    }
+}

Assets/Scripts/Business/Runtime/FGUI/Common/ItemBase/CommonItemBaseView.ListItem.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: CygevHmpUig0Dx8l78fzFC0//BA3Z/YVlBbSXQ+HpxVqfK0k541/zQk=
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Business/Runtime/FGUI/Main/HomePanel/MainHomePanelCtrl.cs

@@ -34,6 +34,7 @@ namespace FL.FGUI
             VM.NoticeBtn.onClick.Add(OnClickNoticeBtn);
             VM.SettingBtn.onClick.Add(OnClickSettingBtn);
             VM.ExchangeBtn.onClick.Add(OnClickExchangeBtn);
+            VM.BagBtn.onClick.Add(OnClickBagBtn);
             VM.MapRewardBtn.onClick.Add(OnClickMapRewardBtn);
 
         }
@@ -45,6 +46,7 @@ namespace FL.FGUI
             VM.NoticeBtn.onClick.Remove(OnClickNoticeBtn);
             VM.SettingBtn.onClick.Remove(OnClickSettingBtn);
             VM.ExchangeBtn.onClick.Remove(OnClickExchangeBtn);
+            VM.BagBtn.onClick.Remove(OnClickBagBtn);
             VM.MapRewardBtn.onClick.Remove(OnClickMapRewardBtn);
         }
         private void OnClickSysMenuBtn(EventContext context)
@@ -78,6 +80,12 @@ namespace FL.FGUI
             Context.ShowTips("OnClickExchangeBtn");
             VM.SysMenuActive = false;
         }
+
+        private void OnClickBagBtn(EventContext context) 
+        {
+            Context.UI.OpenAsync(UIKeys.BagBackpackPanel);
+        }
+
         private void OnClickMapRewardBtn(EventContext context)
         {
             Context.ShowTips("OnClickMapRewardBtn");

Assets/Scripts/Business/Runtime/FGUI/Main/HomePanel/MainHomePanelVM.Gen.cs

@@ -33,6 +33,7 @@ namespace FL.FGUI
         public GButton NoticeBtn { get; private set; }
         public GButton SettingBtn { get; private set; }
         public GButton ExchangeBtn { get; private set; }
+        public GButton BagBtn { get; private set; }
         public GGroup SysMenu { get; private set; }
         public GButton MapRewardBtn { get; private set; }
         public GGroup Bottom { get; private set; }
@@ -56,6 +57,7 @@ namespace FL.FGUI
             NoticeBtn = panel.GetChild("NoticeBtn") as GButton;
             SettingBtn = panel.GetChild("SettingBtn") as GButton;
             ExchangeBtn = panel.GetChild("ExchangeBtn") as GButton;
+            BagBtn = panel.GetChild("BagBtn") as GButton;
             SysMenu = panel.GetChild("SysMenu") as GGroup;
             MapRewardBtn = panel.GetChild("MapRewardBtn") as GButton;
             Bottom = panel.GetChild("Bottom") as GGroup;

fl-fgui-project/assets/Bag/BackpackPanel.xml

@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="756,1344" designImage="ui://y15iuuxvnf7w0" designImageOffsetX="-244">
+  <controller name="PageCtrl" pages="0,,1," selected="0">
+    <remark page="0" value="道具"/>
+    <remark page="1" value="材料"/>
+  </controller>
   <displayList>
-    <image id="n0_nf7w" name="n0" src="nf7w5" fileName="Images/kuang01.png" xy="378,616" pivot="0.5,0.5" anchor="true" size="728,985"/>
-    <image id="n2_nf7w" name="n2" src="nf7w7" fileName="Images/tittle01.png" xy="378,131" pivot="0.5,0.5" anchor="true"/>
-    <image id="n1_nf7w" name="n1" src="rwcw4" fileName="images/pop/tanchuangdiban2.png" pkg="gt6q23qw" xy="378,617" pivot="0.5,0.5" anchor="true" size="680,829"/>
-    <text id="n3_nf7w" name="n3" xy="378,118" pivot="0.5,0.5" anchor="true" size="88,56" fontSize="42" color="#ffffff" align="center" vAlign="middle" leading="0" text="背包"/>
-    <list id="n4_nf7w" name="ItemsList" xy="48,215" size="780,806" scale="0.85,0.85" layout="flow_hz" overflow="scroll" lineGap="16" colGap="6" defaultItem="ui://gt6q23qwme3q0" autoClearItems="true">
+    <component id="n11_ut64" name="MaskBg" src="c95i2g" fileName="BackGroundNested.xml" pkg="gt6q23qw" xy="378,672" pivot="0.5,0.5" anchor="true">
+      <relation target="" sidePair="width-width,height-height"/>
+    </component>
+    <component id="n10_ut64" name="PopWin" src="xo2n46" fileName="Components/PopWin/PopWin4.xml" pkg="gt6q23qw" xy="14,86" size="728,1022" group="n12_ut64">
+      <Label title="背包"/>
+    </component>
+    <list id="n4_nf7w" name="ItemsList" xy="48,215" size="780,806" group="n12_ut64" scale="0.85,0.85" layout="flow_hz" overflow="scroll" lineGap="16" colGap="6" defaultItem="ui://gt6q23qwme3q0" autoClearItems="true">
       <item/>
       <item/>
       <item/>
@@ -20,7 +26,18 @@
       <item/>
       <item/>
     </list>
-    <image id="n5_nf7w" name="n5" src="nf7w3" fileName="Images/shubao.png" xy="62,1068" pivot="0.5,0.5" anchor="true"/>
-    <text id="n6_nf7w" name="n6" xy="94,1068" pivot="0,0.5" anchor="true" size="89,36" fontSize="26" color="#ffffff" vAlign="middle" leading="0" strokeColor="#000000" strokeSize="2" text="13/250"/>
+    <image id="n5_nf7w" name="n5" src="nf7w3" fileName="Images/shubao.png" xy="62,1068" pivot="0.5,0.5" anchor="true" group="n12_ut64"/>
+    <component id="n8_xo2n" name="ItemPageBtn" src="jofv4y" fileName="Components/ComButtons/ComPageBtn.xml" pkg="gt6q23qw" xy="431,1101" size="150,86" group="n12_ut64">
+      <Button title="道具" icon="ui://y15iuuxvut649" selectedIcon="ui://y15iuuxvut648" controller="PageCtrl" page="1"/>
+    </component>
+    <component id="n7_xo2n" name="MaterialPageBtn" src="jofv4y" fileName="Components/ComButtons/ComPageBtn.xml" pkg="gt6q23qw" xy="585,1101" size="150,86" group="n12_ut64">
+      <Button checked="true" title="材料" controller="PageCtrl" page="0"/>
+    </component>
+    <text id="n6_nf7w" name="NumLabel" xy="94,1068" pivot="0,0.5" anchor="true" size="89,36" group="n12_ut64" fontSize="26" color="#ffffff" vAlign="middle" leading="0" strokeColor="#000000" strokeSize="2" text="13/250"/>
+    <text id="n15_tf1p" name="EmptyLabel" xy="378,596" pivot="0.5,0.5" anchor="true" size="244,79" group="n12_ut64" fontSize="60" align="center" vAlign="middle" leading="0" text="空空如也"/>
+    <group id="n12_ut64" name="n12" xy="14,86" size="814,1101" advanced="true">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </group>
   </displayList>
+  <scriptData gencodenf7w4="1" genuilayernf7w4="4"/>
 </component>

fl-fgui-project/assets/Bag/package.xml

@@ -5,10 +5,7 @@
     <image id="nf7w1" name="背包弹窗.png" path="/NoExport/"/>
     <image id="nf7w2" name="背包详情.png" path="/NoExport/"/>
     <image id="nf7w3" name="shubao.png" path="/Images/"/>
-    <component id="nf7w4" name="BackpackPanel.xml" path="/"/>
-    <image id="nf7w5" name="kuang01.png" path="/Images/" scale="9grid" scale9grid="37,119,11,50"/>
-    <image id="nf7w6" name="kuang02.png" path="/Images/" scale="9grid" scale9grid="24,28,14,18"/>
-    <image id="nf7w7" name="tittle01.png" path="/Images/"/>
+    <component id="nf7w4" name="BackpackPanel.xml" path="/" exported="true"/>
   </resources>
-  <publish name=""/>
+  <publish name="" genCode="true"/>
 </packageDescription>

fl-fgui-project/assets/Common/Components/ComButtons/ComPageBtn.xml

@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="210,78" pivot="0.5,0.5" extention="Button">
-  <controller name="button" pages="0,up,1,down" selected="0"/>
+<component size="210,80" pivot="0.5,0.5" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="1"/>
   <displayList>
-    <image id="n4_jofv" name="n1" src="8dfr8" fileName="images/yeqian02.png" xy="0,8" size="210,70">
+    <image id="n4_jofv" name="n1" src="ut6450" fileName="images/buttons/commonPageBtn01.png" xy="0,5" size="210,72">
       <gearDisplay controller="button" pages="0"/>
+      <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <image id="n5_jofv" name="n2" src="8dfr9" fileName="images/yeqian01.png" xy="0,0" size="210,78">
+    <image id="n5_jofv" name="n2" src="ut6452" fileName="images/buttons/commonPageBtn02.png" xy="0,-1" size="210,80">
       <gearDisplay controller="button" pages="1"/>
-    </image>
-    <text id="n3_jofv" name="title" xy="96,13" pivot="0.5,0.5" size="18,51" fontSize="28" color="#ffffff" align="center" vAlign="middle" leading="0" text="">
       <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n3_jofv" name="title" xy="96,13" pivot="0.5,0.5" size="18,53" fontSize="28" color="#ffffff" align="center" vAlign="middle" leading="0" text="">
+      <relation target="" sidePair="width-width,height-height,center-center"/>
     </text>
   </displayList>
   <Button mode="Check"/>

fl-fgui-project/assets/Common/Components/PopWin/PopWin4.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="728,1020" extention="Label">
+  <displayList>
+    <image id="n0_nf7w" name="n0" src="nf7w5" fileName="images/pop/kuang01.png" xy="0,17" size="728,1004"/>
+    <image id="n2_nf7w" name="n2" src="nf7w7" fileName="images/pop/tittle01.png" xy="19,0"/>
+    <image id="n5_ut64" name="n5" src="rwcw4" fileName="images/pop/tanchuangdiban2.png" xy="24,112" size="680,829"/>
+    <text id="n3_nf7w" name="title" xy="364,30" pivot="0.5,0.5" anchor="true" size="10,56" fontSize="42" color="#ffffff" align="center" vAlign="middle" leading="0" autoClearText="true" text=""/>
+  </displayList>
+</component>

fl-fgui-project/assets/Common/ItemBase.xml

@@ -8,5 +8,5 @@
     <component id="n13_negq" name="ItemBtn" src="negq2e" fileName="Components/EmptyBtn.xml" xy="7,7" size="136,136"/>
     <image id="n4_b4qr" name="MaskImg" src="me3q2b" fileName="images/img_itemMask.png" xy="7,7" pivot="0.5,0.5" size="136,136" visible="false"/>
   </displayList>
-  <scriptData gencodeme3q0="1" genuitypeme3q0="1"/>
+  <scriptData gencodeme3q0="1" genuitypeme3q0="2"/>
 </component>

fl-fgui-project/assets/Common/package.xml

@@ -56,6 +56,12 @@
     <component id="jofv4y" name="ComPageBtn.xml" path="/Components/ComButtons/" exported="true"/>
     <image id="8dfr9" name="yeqian01.png" path="/images/buttons/" scale="9grid" scale9grid="17,1,11,3"/>
     <image id="8dfr8" name="yeqian02.png" path="/images/buttons/" scale="9grid" scale9grid="17,1,11,2"/>
+    <component id="xo2n46" name="PopWin4.xml" path="/Components/PopWin/" exported="true"/>
+    <image id="nf7w5" name="kuang01.png" path="/images/pop/" scale="9grid" scale9grid="37,119,11,50"/>
+    <image id="nf7w6" name="kuang02.png" path="/images/pop/" scale="9grid" scale9grid="24,28,14,18"/>
+    <image id="nf7w7" name="tittle01.png" path="/images/pop/"/>
+    <image id="ut6450" name="commonPageBtn01.png" path="/images/buttons/" scale="9grid" scale9grid="37,20,74,40"/>
+    <image id="ut6452" name="commonPageBtn02.png" path="/images/buttons/" scale="9grid" scale9grid="38,22,76,44"/>
   </resources>
   <publish name="" genCode="true" excluded="q0v63z,ifoa3y"/>
 </packageDescription>

fl-fgui-project/assets/Main/Components1/SysMenuBtn.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="208,60" extention="Button" designImage="ui://rbw1tv9tpiud9d" designImageOffsetX="-517" designImageOffsetY="-195" designImageLayer="1">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n0_ashv" name="n0" src="piud9y" fileName="Image1/Menubutton.png" xy="0,0">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <loader id="n2_ashv" name="icon" xy="12,10" pivot="0.5,0.5" size="36,36" url="ui://rbw1tv9tpiudai" align="center" vAlign="middle" autoSize="true" clearOnPublish="true"/>
+    <text id="n1_ashv" name="title" xy="53,0" size="155,60" fontSize="24" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" strokeColor="#000000" singleLine="true" text="好友">
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+  <Button/>
+</component>

fl-fgui-project/assets/Main/HomePanel.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="756,1344" opaque="false" designImage="ui://rbw1tv9tpiud9c" designImageAlpha="40" designImageLayer="1">
-  <controller name="SysMenuCtrl" pages="0,disable,1,enable" selected="0">
+  <controller name="SysMenuCtrl" pages="0,disable,1,enable" selected="1">
     <remark page="0" value="隐藏"/>
     <remark page="1" value="显示"/>
   </controller>
@@ -21,13 +21,16 @@
     <group id="n194_dw56" name="Top" xy="24,20" size="716,158" advanced="true">
       <relation target="" sidePair="topext-top"/>
     </group>
-    <image id="n294_fnb9" name="n294" src="piud9w" fileName="Image1/Menubg.png" xy="620,362" pivot="0.5,0.5" anchor="true" size="222,356" group="n300_fnb9"/>
-    <component id="n295_fnb9" name="FriendBtn" src="ashvbb" fileName="Components1/FriendBtn.xml" xy="621,224" pivot="0.5,0.5" anchor="true" group="n300_fnb9"/>
-    <component id="n296_fnb9" name="MailBtn" src="ashvbc" fileName="Components1/MailBtn.xml" xy="621,294" pivot="0.5,0.5" anchor="true" group="n300_fnb9"/>
-    <component id="n297_fnb9" name="NoticeBtn" src="fnb9bd" fileName="Components1/NoticeBtn.xml" xy="621,361" pivot="0.5,0.5" anchor="true" group="n300_fnb9"/>
-    <component id="n298_fnb9" name="SettingBtn" src="fnb9be" fileName="Components1/SettingBtn.xml" xy="621,429" pivot="0.5,0.5" anchor="true" group="n300_fnb9"/>
-    <component id="n299_fnb9" name="ExchangeBtn" src="fnb9bf" fileName="Components1/ExchangeBtn.xml" xy="621,496" pivot="0.5,0.5" anchor="true" group="n300_fnb9"/>
-    <group id="n300_fnb9" name="SysMenu" xy="509,184" size="222,356" advanced="true">
+    <image id="n294_fnb9" name="n294" src="piud9w" fileName="Image1/Menubg.png" xy="620,184" pivot="0.5,0" anchor="true" size="222,420" group="n300_fnb9"/>
+    <component id="n295_fnb9" name="FriendBtn" src="ashvbb" fileName="Components1/FriendBtn.xml" xy="621,224" pivot="0.5,0.5" anchor="true" size="208,60" group="n300_fnb9"/>
+    <component id="n296_fnb9" name="MailBtn" src="ashvbc" fileName="Components1/MailBtn.xml" xy="621,294" pivot="0.5,0.5" anchor="true" size="208,60" group="n300_fnb9"/>
+    <component id="n297_fnb9" name="NoticeBtn" src="fnb9bd" fileName="Components1/NoticeBtn.xml" xy="621,361" pivot="0.5,0.5" anchor="true" size="208,60" group="n300_fnb9"/>
+    <component id="n298_fnb9" name="SettingBtn" src="fnb9be" fileName="Components1/SettingBtn.xml" xy="621,429" pivot="0.5,0.5" anchor="true" size="208,60" group="n300_fnb9"/>
+    <component id="n299_fnb9" name="ExchangeBtn" src="fnb9bf" fileName="Components1/ExchangeBtn.xml" xy="621,496" pivot="0.5,0.5" anchor="true" size="208,60" group="n300_fnb9"/>
+    <component id="n304_ut64" name="BagBtn" src="ut64br" fileName="Components1/SysMenuBtn.xml" xy="621,564" pivot="0.5,0.5" anchor="true" size="208,60" group="n300_fnb9">
+      <Button title="背包" icon="ui://rbw1tv9tut64bq"/>
+    </component>
+    <group id="n300_fnb9" name="SysMenu" xy="509,184" size="222,420" advanced="true">
       <gearDisplay controller="SysMenuCtrl" pages="1"/>
       <relation target="" sidePair="rightext-right,topext-top"/>
     </group>

fl-fgui-project/assets/Main/package.xml

@@ -285,6 +285,8 @@
     <component id="fnb9bg" name="SysMenuNested.xml" path="/Components1/"/>
     <component id="lgtnbi" name="RoleBtn.xml" path="/Components1/"/>
     <component id="pa7cbp" name="ClosePanelBtn.xml" path="/Components1/"/>
+    <image id="ut64bq" name="shubao.png" path="/Image1/"/>
+    <component id="ut64br" name="SysMenuBtn.xml" path="/Components1/"/>
   </resources>
   <publish name="" genCode="true" excluded="oe3g1e,oe3g1f,q5na1,q5na2,v4hi6g,q5na5o,o4lw48,m08t6w,ouxy7n,ouxy7o,hq2e96,hq2e97">
     <atlas name="Default" index="0"/>

fl-fgui-project/assets/TreasureChest/UpgradePanel.xml

@@ -4,7 +4,7 @@
     <remark page="0" value="装备概率"/>
     <remark page="1" value="宝箱收益"/>
   </controller>
-  <controller name="UpgradeCtrl" pages="0,,1," selected="1">
+  <controller name="UpgradeCtrl" pages="0,,1," selected="0">
     <remark page="0" value="常态"/>
     <remark page="1" value="处于升级中状态"/>
   </controller>
@@ -109,16 +109,16 @@
       <item/>
       <item/>
     </list>
-    <component id="n50_mrm2" name="ProbabilityBtn" src="jofv4y" fileName="Components/PageBtn.xml" xy="297,1147" size="210,80" group="n70_sw0m" pkg="gt6q23qw">
+    <component id="n50_mrm2" name="ProbabilityBtn" src="jofv4y" fileName="Components/ComButtons/ComPageBtn.xml" pkg="gt6q23qw" xy="297,1146" pivot="0.5,0" group="n70_sw0m">
       <Button checked="true" title="装备概率" controller="PageCtrl" page="0"/>
     </component>
-    <component id="n51_mrm2" name="IncomeBtn" src="jofv4y" fileName="Components/PageBtn.xml" xy="522,1147" group="n70_sw0m" pkg="gt6q23qw">
+    <component id="n51_mrm2" name="IncomeBtn" src="jofv4y" fileName="Components/ComButtons/ComPageBtn.xml" pkg="gt6q23qw" xy="522,1146" pivot="0.5,0" group="n70_sw0m">
       <Button title="宝箱收益" controller="PageCtrl" page="1"/>
     </component>
     <text id="n54_q82p" name="n54" xy="267,909" pivot="0.5,0.5" size="220,49" group="n70_sw0m" fontSize="36" color="#ff0000" align="center" vAlign="middle" leading="0" text="已达最大等级">
       <gearDisplay controller="MaxLvCtrl" pages="1"/>
     </text>
-    <group id="n70_sw0m" name="n70" xy="13,187" size="729,1040" advanced="true">
+    <group id="n70_sw0m" name="n70" xy="13,187" size="729,1039" advanced="true">
       <relation target="" sidePair="middle-middle"/>
     </group>
   </displayList>