浏览代码

神识ui修改

lzx 3 天之前
父节点
当前提交
5ac2df08c6
共有 47 个文件被更改,包括 1149 次插入627 次删除
  1. 0 0
      Assets/Art/UIAssets/TextrueJson/daoju.txt
  2. 1 1
      Assets/Art/UIAssets/TextrueJson/fabao.txt
  3. 0 0
      Assets/Art/UIAssets/TextrueJson/tongyong.txt
  4. 二进制
      Assets/Art/UIAssets/decorate/dec_juxing_135.png
  5. 203 0
      Assets/Art/UIAssets/decorate/dec_juxing_135.png.meta
  6. 二进制
      Assets/Art/UIAssets/decorate/dec_shengji_db.png
  7. 2 2
      Assets/Art/UIAssets/decorate/dec_shengji_db.png.meta
  8. 二进制
      Assets/Art/UIAssets/icon/icon_shenshitishengfu2.png
  9. 2 2
      Assets/Art/UIAssets/icon/icon_shenshitishengfu2.png.meta
  10. 二进制
      Assets/Art/UIAssets/icon/icon_shenshitishengfu3.png
  11. 2 2
      Assets/Art/UIAssets/icon/icon_shenshitishengfu3.png.meta
  12. 14 14
      Assets/Res/Config/EventNPC.json
  13. 6 6
      Assets/Res/Config/ItemConfig.json
  14. 5 5
      Assets/Res/UI/AppBarPanel/AppBarPanel.prefab
  15. 382 21
      Assets/Res/UI/DivineSence/DivineSenceInfoBtnWidget.prefab
  16. 243 152
      Assets/Res/UI/DivineSence/DivineSenceInfoPanel.prefab
  17. 1 1
      Assets/Res/UI/DivineSence/DivineSenceLevelPreviewPanel.prefab
  18. 二进制
      Assets/Res/UI/DivineSence/主界面-神识.png
  19. 4 4
      Assets/Res/UI/DivineSence/主界面-神识.png.meta
  20. 二进制
      Assets/Res/UI/DivineSence/仙途事件.png
  21. 二进制
      Assets/Res/UI/DivineSence/战斗详情.png
  22. 二进制
      Assets/Res/UI/DivineSence/挂机.png
  23. 0 203
      Assets/Res/UI/DivineSence/挂机.png.meta
  24. 二进制
      Assets/Res/UI/DivineSence/神识探索-神识符.png
  25. 二进制
      Assets/Res/UI/DivineSence/神识探索.png
  26. 二进制
      Assets/Res/UI/DivineSence/通用来源.png
  27. 0 203
      Assets/Res/UI/DivineSence/通用来源.png.meta
  28. 1 1
      Assets/Res/UI/ShopPanel/ShopItemWidgetType1.prefab
  29. 96 1
      Assets/Res/UI/ShopPanel/ShopItemWidgetType2.prefab
  30. 98 3
      Assets/Res/UI/WidgetItem.prefab
  31. 2 0
      Assets/Res/UIAtlas/daoju.spriteatlasv2
  32. 1 0
      Assets/Res/UIAtlas/tongyong.spriteatlasv2
  33. 21 4
      Assets/Scripts/GameUI/UI/DivineSence/DivineSenceInfoBtnWidget.cs
  34. 22 0
      Assets/Scripts/GameUI/UI/DivineSence/DivineSenceInfoBtnWidgetData.cs
  35. 10 1
      Assets/Scripts/GameUI/UI/RewardsPanel/WidgetItem.cs
  36. 11 0
      Assets/Scripts/GameUI/UI/RewardsPanel/WidgetItemData.cs
  37. 10 0
      Assets/Scripts/GameUI/UI/ShopPanel/ShopItemWidgetType2.cs
  38. 11 0
      Assets/Scripts/GameUI/UI/ShopPanel/ShopItemWidgetType2Data.cs
  39. 二进制
      Excel2Json/Excel/Item.xlsx
  40. 0 0
      UGUIPack/uguiconfig.db
  41. 0 0
      美术/unity_use_ui/TextrueJson/daoju.txt
  42. 1 1
      美术/unity_use_ui/TextrueJson/fabao.txt
  43. 0 0
      美术/unity_use_ui/TextrueJson/tongyong.txt
  44. 二进制
      美术/unity_use_ui/decorate/dec_juxing_135.png
  45. 二进制
      美术/unity_use_ui/decorate/dec_shengji_db.png
  46. 二进制
      美术/unity_use_ui/icon/icon_shenshitishengfu2.png
  47. 二进制
      美术/unity_use_ui/icon/icon_shenshitishengfu3.png

文件差异内容过多而无法显示
+ 0 - 0
Assets/Art/UIAssets/TextrueJson/daoju.txt


+ 1 - 1
Assets/Art/UIAssets/TextrueJson/fabao.txt

@@ -1 +1 @@
-{"packName":"fabao","isTyPack":false,"newTextureJson":[{"textrueName":"dec_fbBiaotiDIban","filePath":"/decorate/dec_fbBiaotiDIban.png"},{"textrueName":"dec_fbDengjiDiban","filePath":"/decorate/dec_fbDengjiDiban.png"},{"textrueName":"dec_fbfangyu","filePath":"/decorate/dec_fbfangyu.png"},{"textrueName":"dec_fbgong","filePath":"/decorate/dec_fbgong.png"},{"textrueName":"dec_fbGuangbian","filePath":"/decorate/dec_fbGuangbian.png"},{"textrueName":"dec_fbjia","filePath":"/decorate/dec_fbjia.png"},{"textrueName":"dec_fbjian","filePath":"/decorate/dec_fbjian.png"},{"textrueName":"dec_fbshuziDiban","filePath":"/decorate/dec_fbshuziDiban.png"},{"textrueName":"dec_fbxiaDiban","filePath":"/decorate/dec_fbxiaDiban.png"},{"textrueName":"dec_fbXuanzhe","filePath":"/decorate/dec_fbXuanzhe.png"},{"textrueName":"dec_fbxue","filePath":"/decorate/dec_fbxue.png"},{"textrueName":"dec_fbzhongDiban","filePath":"/decorate/dec_fbzhongDiban.png"},{"textrueName":"dec_fbZhuangbeiDiban","filePath":"/decorate/dec_fbZhuangbeiDiban.png"}],"keyToValue":{}}
+{"packName":"fabao","isTyPack":false,"newTextureJson":[{"textrueName":"dec_fbBiaotiDIban","filePath":"/decorate/dec_fbBiaotiDIban.png"},{"textrueName":"dec_fbDengjiDiban","filePath":"/decorate/dec_fbDengjiDiban.png"},{"textrueName":"dec_fbfangyu","filePath":"/decorate/dec_fbfangyu.png"},{"textrueName":"dec_fbgong","filePath":"/decorate/dec_fbgong.png"},{"textrueName":"dec_fbGuangbian","filePath":"/decorate/dec_fbGuangbian.png"},{"textrueName":"dec_fbjia","filePath":"/decorate/dec_fbjia.png"},{"textrueName":"dec_fbjian","filePath":"/decorate/dec_fbjian.png"},{"textrueName":"dec_fbshuziDiban","filePath":"/decorate/dec_fbshuziDiban.png"},{"textrueName":"dec_fbxiaDiban","filePath":"/decorate/dec_fbxiaDiban.png"},{"textrueName":"dec_fbXuanzhe","filePath":"/decorate/dec_fbXuanzhe.png"},{"textrueName":"dec_fbxue","filePath":"/decorate/dec_fbxue.png"},{"textrueName":"dec_fbzhongDiban","filePath":"/decorate/dec_fbzhongDiban.png"},{"textrueName":"dec_fbZhuangbeiDiban","filePath":"/decorate/dec_fbZhuangbeiDiban.png"},{"textrueName":"dec_shengji_db","filePath":"/decorate/dec_shengji_db.png"}],"keyToValue":{}}

文件差异内容过多而无法显示
+ 0 - 0
Assets/Art/UIAssets/TextrueJson/tongyong.txt


二进制
Assets/Art/UIAssets/decorate/dec_juxing_135.png


+ 203 - 0
Assets/Art/UIAssets/decorate/dec_juxing_135.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: WXsdtS37UShQum/UubqydyO+rCRQVH2apRG2gH9Krz2d9n9CLU1sBDdBf5Ua
+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: 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: 30, y: 0, z: 31, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  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: iPhone
+    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: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    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: HMIAndroid
+    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: OpenHarmony
+    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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 1537655665
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

二进制
Assets/Art/UIAssets/decorate/dec_shengji_db.png


+ 2 - 2
Assets/Res/UI/DivineSence/仙途事件.png.meta → Assets/Art/UIAssets/decorate/dec_shengji_db.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: DX9J4Hj+Vn1MJv7dQq1EbSWfy0aKY5PZN6b0yqyJtQODO90MjfMfpMoR7yon
+guid: Cywd4Sv4VnpuiNo+JEXIXBCPaazoNtxk0boLAITWJd0ibbtMQCkUdDYHqs+q
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -42,7 +42,7 @@ TextureImporter:
     mipBias: 0
     wrapU: 1
     wrapV: 1
-    wrapW: 0
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50

二进制
Assets/Art/UIAssets/icon/icon_shenshitishengfu2.png


+ 2 - 2
Assets/Res/UI/DivineSence/神识探索-神识符.png.meta → Assets/Art/UIAssets/icon/icon_shenshitishengfu2.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: Cykaty+rU3gQIVUo9/zRq+/4r2olIwVO3qEx0xS7U2897uB3XXg+Wu8mEqOd
+guid: DH8atCv/ByloUiWQgkcerWN340a/8+JWdCdAgF6apQgd1hHxodxg7Xu5uTVL
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -42,7 +42,7 @@ TextureImporter:
     mipBias: 0
     wrapU: 1
     wrapV: 1
-    wrapW: 0
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50

二进制
Assets/Art/UIAssets/icon/icon_shenshitishengfu3.png


+ 2 - 2
Assets/Res/UI/DivineSence/战斗详情.png.meta → Assets/Art/UIAssets/icon/icon_shenshitishengfu3.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: CC8dvSqkUCjrPHD+ViDHAN2eWqNnkxoSthUcZnVHvaT487GJXh7CX3TN2tqL
+guid: DisX5in4B3JUbRUmoczwjaFRo8LBHusqcQ3DlkXh2PA5MkVnXJkLGxPldrFH
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -42,7 +42,7 @@ TextureImporter:
     mipBias: 0
     wrapU: 1
     wrapV: 1
-    wrapW: 0
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50

+ 14 - 14
Assets/Res/Config/EventNPC.json

@@ -9,7 +9,7 @@
     {
       "ID": 2,
       "name": 1953,
-      "icon": "bg_lh_chidaoren",
+      "icon": "bg_lh_quelinger",
       "DaoyouID": 1
     },
     {
@@ -21,25 +21,25 @@
     {
       "ID": 4,
       "name": 1955,
-      "icon": "bg_lh_chidaoren",
+      "icon": "bg_lh_fengyao",
       "DaoyouID": 3
     },
     {
       "ID": 5,
       "name": 1956,
-      "icon": "bg_lh_chidaoren",
+      "icon": "bg_lh_wanxi",
       "DaoyouID": 4
     },
     {
       "ID": 6,
       "name": 1957,
-      "icon": "bg_lh_chidaoren",
+      "icon": "bg_lh_xuyou",
       "DaoyouID": 5
     },
     {
       "ID": 7,
       "name": 1958,
-      "icon": "bg_lh_chidaoren",
+      "icon": "bg_lh_fengdaoren",
       "DaoyouID": 6
     },
     {
@@ -81,13 +81,13 @@
     {
       "ID": 102,
       "name": 3002,
-      "icon": "bg_lh_chidaoren",
+      "icon": "bg_lh_quelinger",
       "DaoyouID": 0
     },
     {
       "ID": 103,
       "name": 3003,
-      "icon": "bg_lh_chidaoren",
+      "icon": "bg_lh_fengdaoren",
       "DaoyouID": 0
     },
     {
@@ -99,13 +99,13 @@
     {
       "ID": 105,
       "name": 3005,
-      "icon": "bg_lh_chidaoren",
+      "icon": "bg_lh_yao",
       "DaoyouID": 0
     },
     {
       "ID": 106,
       "name": 3006,
-      "icon": "bg_lh_chidaoren",
+      "icon": "bg_lh_xuyou",
       "DaoyouID": 0
     },
     {
@@ -129,13 +129,13 @@
     {
       "ID": 110,
       "name": 3010,
-      "icon": "bg_lh_chidaoren",
+      "icon": "bg_lh_emuzhiling",
       "DaoyouID": 0
     },
     {
       "ID": 111,
       "name": 2078,
-      "icon": "bg_lh_chidaoren",
+      "icon": "bg_lh_huizi",
       "DaoyouID": 0
     },
     {
@@ -177,7 +177,7 @@
     {
       "ID": 118,
       "name": 2094,
-      "icon": "bg_lh_chidaoren",
+      "icon": "bg_lh_gushexianzi",
       "DaoyouID": 0
     },
     {
@@ -195,13 +195,13 @@
     {
       "ID": 121,
       "name": 2097,
-      "icon": "bg_lh_chidaoren",
+      "icon": "bg_lh_zhiyao",
       "DaoyouID": 0
     },
     {
       "ID": 122,
       "name": 2098,
-      "icon": "bg_lh_chidaoren",
+      "icon": "bg_lh_fengyao",
       "DaoyouID": 0
     },
     {

+ 6 - 6
Assets/Res/Config/ItemConfig.json

@@ -4526,7 +4526,7 @@
       "ID": 21001,
       "itemName": 3194,
       "itemDesc": 3207,
-      "icon": "icon_item_21001",
+      "icon": "icon_Coin",
       "itemTag": 22,
       "quality": 3,
       "stack": 0,
@@ -4554,7 +4554,7 @@
       "ID": 21002,
       "itemName": 3195,
       "itemDesc": 3208,
-      "icon": "icon_item_21002",
+      "icon": "icon_Gem_Star_Blue",
       "itemTag": 22,
       "quality": 3,
       "stack": 0,
@@ -4582,7 +4582,7 @@
       "ID": 21003,
       "itemName": 3196,
       "itemDesc": 3209,
-      "icon": "icon_item_21003",
+      "icon": "icon_GradeBadge_Master",
       "itemTag": 22,
       "quality": 3,
       "stack": 0,
@@ -4610,7 +4610,7 @@
       "ID": 21004,
       "itemName": 3197,
       "itemDesc": 3210,
-      "icon": "icon_item_21004",
+      "icon": "icon_GradeBadge_Challenger",
       "itemTag": 22,
       "quality": 3,
       "stack": 0,
@@ -4834,7 +4834,7 @@
       "ID": 21012,
       "itemName": 3205,
       "itemDesc": 3218,
-      "icon": "icon_shenshitishengfu",
+      "icon": "icon_shenshitishengfu2",
       "itemTag": 22,
       "quality": 4,
       "stack": 0,
@@ -4863,7 +4863,7 @@
       "ID": 21013,
       "itemName": 3206,
       "itemDesc": 3219,
-      "icon": "icon_shenshitishengfu",
+      "icon": "icon_shenshitishengfu3",
       "itemTag": 22,
       "quality": 5,
       "stack": 0,

+ 5 - 5
Assets/Res/UI/AppBarPanel/AppBarPanel.prefab

@@ -142,7 +142,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.25882354, g: 0.3372549, b: 0.3529412, a: 1}
+  m_Color: {r: 0.24705884, g: 0.3372549, b: 0.3529412, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -3137,8 +3137,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: -295, y: 0}
-  m_SizeDelta: {x: 79, y: 84}
+  m_AnchoredPosition: {x: -302.4, y: 1.4000015}
+  m_SizeDelta: {x: 94, y: 94}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2585392310292376427
 CanvasRenderer:
@@ -3178,7 +3178,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_fanhui1
+  _icon_name: dec_fanhuianniu
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
@@ -3186,7 +3186,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 48eeb3c8a9b4122a73f0a85aab21a52f
-  imageH: 0
+  imageH: 84
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}

+ 382 - 21
Assets/Res/UI/DivineSence/DivineSenceInfoBtnWidget.prefab

@@ -35,7 +35,7 @@ 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: 3.7, y: -11.9}
+  m_AnchoredPosition: {x: 2.6, y: -26.9}
   m_SizeDelta: {x: 160, y: 27.4099}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &3341532780360034025
@@ -59,7 +59,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.8117648, g: 0.8117648, b: 0.8000001, a: 1}
+  m_Color: {r: 0.27058825, g: 0.17254902, b: 0.0627451, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -68,10 +68,10 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 19
+    m_FontSize: 24
     m_FontStyle: 1
     m_BestFit: 0
-    m_MinSize: 10
+    m_MinSize: 2
     m_MaxSize: 40
     m_Alignment: 7
     m_AlignByGeometry: 0
@@ -79,7 +79,96 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 100/300
+  m_Text: 300/100
+--- !u!1 &364238586563760327
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8648284526392700935}
+  - component: {fileID: 4402029607075676247}
+  - component: {fileID: 1415214869558899927}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8648284526392700935
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 364238586563760327}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7812643512891689521}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4402029607075676247
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 364238586563760327}
+  m_CullTransparentMesh: 1
+--- !u!114 &1415214869558899927
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 364238586563760327}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.7019608, g: 0.6784314, b: 0.54901963, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_ty_yuan
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 0dc26aad2093bf99c21596c28053b889
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &511574632764892455
 GameObject:
   m_ObjectHideFlags: 0
@@ -116,7 +205,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0.0000076293945, y: 0}
-  m_SizeDelta: {x: 69.3171, y: 69.317}
+  m_SizeDelta: {x: 101.52, y: 101.5205}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9051072163415767268
 CanvasRenderer:
@@ -156,14 +245,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: icon_eq_2_2_2
+  _icon_name: icon_shenshitishengfu
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 1ef03ad075d5c504196a7354786d23e8, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 77f77eea85838ad4b8734050364b4892, type: 3}
   packInfo:
-    packName: allIcon
-    packgJsonPath: /Art/UIAssets/TextrueJson/allIcon.txt
-    packgSpritePath: Assets/Res/UIAtlas/allIcon.spriteatlasv2
-    lasetJsonGUID: 4b54a953fcd0950cece7d4eeea1f40a9
+    packName: daoju
+    packgJsonPath: /Art/UIAssets/TextrueJson\daoju.txt
+    packgSpritePath: Assets/Res/UIAtlas/daoju.spriteatlasv2
+    lasetJsonGUID: 5065c0aff242263ba988030a4cf3800f
   imageH: 100
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
@@ -182,7 +271,7 @@ GameObject:
   - component: {fileID: 4425294020748255511}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: myImage
+  m_Name: icon_Jia
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -291,16 +380,20 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 8648284526392700935}
+  - {fileID: 5044022333376343538}
   - {fileID: 1210481472512527899}
   - {fileID: 8115934941119590487}
+  - {fileID: 5369822510332594471}
   - {fileID: 7829594341012787606}
   - {fileID: 1538816196695707703}
+  - {fileID: 8326230013166911713}
   m_Father: {fileID: 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: 87, y: 87}
+  m_SizeDelta: {x: 99, y: 99}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &5650926104719368414
 CanvasRenderer:
@@ -317,13 +410,13 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2379435185511732205}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.7686275, g: 0.7686275, b: 0.7686275, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -425,7 +518,186 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Icon_ItemIcon2
+    gameObject: {fileID: 3382349380848057439}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: icon_Jia
+    gameObject: {fileID: 1470643818085188078}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
+--- !u!1 &4275214247737657955
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5369822510332594471}
+  - component: {fileID: 9001500274700589474}
+  - component: {fileID: 3382349380848057439}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon_ItemIcon2
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &5369822510332594471
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4275214247737657955}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7812643512891689521}
+  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: 13.6, y: -18.592}
+  m_SizeDelta: {x: 50.3853, y: 50.3855}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &9001500274700589474
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4275214247737657955}
+  m_CullTransparentMesh: 1
+--- !u!114 &3382349380848057439
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4275214247737657955}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: icon_Coin
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 77f77eea85838ad4b8734050364b4892, type: 3}
+  packInfo:
+    packName: daoju
+    packgJsonPath: /Art/UIAssets/TextrueJson\daoju.txt
+    packgSpritePath: Assets/Res/UIAtlas/daoju.spriteatlasv2
+    lasetJsonGUID: 5065c0aff242263ba988030a4cf3800f
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &5634475421249097445
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8326230013166911713}
+  - component: {fileID: 7934257558778184182}
+  - component: {fileID: 5027329524236827713}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text_ItemCount (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8326230013166911713
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5634475421249097445}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7812643512891689521}
+  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: 2.6, y: -59.1}
+  m_SizeDelta: {x: 160, y: 27.4099}
+  m_Pivot: {x: 0.5, y: 0}
+--- !u!222 &7934257558778184182
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5634475421249097445}
+  m_CullTransparentMesh: 1
+--- !u!114 &5027329524236827713
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5634475421249097445}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.27058825, g: 0.17254902, b: 0.0627451, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 24
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 7
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u795E\u8BC6\u6D88\u8017"
 --- !u!1 &7870696938869026474
 GameObject:
   m_ObjectHideFlags: 0
@@ -444,7 +716,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &7829594341012787606
 RectTransform:
   m_ObjectHideFlags: 0
@@ -461,8 +733,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.0000076293945, y: 0}
-  m_SizeDelta: {x: 59.171, y: 59.1709}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 92, y: 91}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5212170371116405064
 CanvasRenderer:
@@ -502,14 +774,103 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_ty_ziyuan1
+  _icon_name: dec_shenshi_tu
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: cdfc87cecacbc6d43a18b124c77cdb3c, type: 3}
+  packInfo:
+    packName: shenshi
+    packgJsonPath: /Art/UIAssets/TextrueJson\shenshi.txt
+    packgSpritePath: Assets/Res/UIAtlas/shenshi.spriteatlasv2
+    lasetJsonGUID: 390613cb2a0c25f30d6ab3483d292479
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &8705315309768287312
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5044022333376343538}
+  - component: {fileID: 9202492427658381593}
+  - component: {fileID: 2068780679334432840}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage (2)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5044022333376343538
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8705315309768287312}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7812643512891689521}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: -9.045, y: -9.045}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &9202492427658381593
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8705315309768287312}
+  m_CullTransparentMesh: 1
+--- !u!114 &2068780679334432840
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8705315309768287312}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.35686275, g: 0.43529415, b: 0.38431376, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_ty_yuan
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
     packName: tongyong
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
-    lasetJsonGUID: 129d2dfcaa346e2c98412e94b22ff390
+    lasetJsonGUID: 0dc26aad2093bf99c21596c28053b889
   imageH: 100
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}

文件差异内容过多而无法显示
+ 243 - 152
Assets/Res/UI/DivineSence/DivineSenceInfoPanel.prefab


+ 1 - 1
Assets/Res/UI/DivineSence/DivineSenceLevelPreviewPanel.prefab

@@ -2655,7 +2655,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, y: 118.471375}
+  m_AnchoredPosition: {x: 0, y: 318}
   m_SizeDelta: {x: 568.7742, y: 543.7047}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2405394351587181080

二进制
Assets/Res/UI/DivineSence/主界面-神识.png


+ 4 - 4
Assets/Res/UI/DivineSence/神识探索.png.meta → Assets/Res/UI/DivineSence/主界面-神识.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: BntKsSylBy1TvUMQhYaKvVl9Zni37nMzqFwLPWZccSuyPLqOYLjN8mFtEIBC
+guid: WywYs3+qW3L8aC4u8PN2RoOAEA4ojzjIJrdvcz/8wq/pXBfKirDqwakMlJPW
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -141,7 +141,7 @@ TextureImporter:
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
-    buildTarget: HMIAndroid
+    buildTarget: WeixinMiniGame
     maxTextureSize: 2048
     maxPlaceholderSize: 32
     resizeAlgorithm: 0
@@ -155,7 +155,7 @@ TextureImporter:
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
-    buildTarget: OpenHarmony
+    buildTarget: HMIAndroid
     maxTextureSize: 2048
     maxPlaceholderSize: 32
     resizeAlgorithm: 0
@@ -169,7 +169,7 @@ TextureImporter:
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
-    buildTarget: WeixinMiniGame
+    buildTarget: OpenHarmony
     maxTextureSize: 2048
     maxPlaceholderSize: 32
     resizeAlgorithm: 0

二进制
Assets/Res/UI/DivineSence/仙途事件.png


二进制
Assets/Res/UI/DivineSence/战斗详情.png


二进制
Assets/Res/UI/DivineSence/挂机.png


+ 0 - 203
Assets/Res/UI/DivineSence/挂机.png.meta

@@ -1,203 +0,0 @@
-fileFormatVersion: 2
-guid: DnIY5ij+VX8DWCchO/+vDWP/KwAHn4PbYbzVPHvv8N8T5sO7in4hJ6EqbqyR
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 13
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 1
-    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: iPhone
-    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: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    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: HMIAndroid
-    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: OpenHarmony
-    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
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

二进制
Assets/Res/UI/DivineSence/神识探索-神识符.png


二进制
Assets/Res/UI/DivineSence/神识探索.png


二进制
Assets/Res/UI/DivineSence/通用来源.png


+ 0 - 203
Assets/Res/UI/DivineSence/通用来源.png.meta

@@ -1,203 +0,0 @@
-fileFormatVersion: 2
-guid: DnpJsSKtAnzUEBGzqXWSXEF6qtkMz6WD0oDkffzYWCffCMvX8ATVDRT+9z/X
-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: 1
-    wrapV: 1
-    wrapW: 0
-  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
-  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: iPhone
-    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: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    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: HMIAndroid
-    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: OpenHarmony
-    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
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 1 - 1
Assets/Res/UI/ShopPanel/ShopItemWidgetType1.prefab

@@ -8252,7 +8252,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 146, y: -23}
-  m_SizeDelta: {x: 0, y: 50}
+  m_SizeDelta: {x: 182, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7048921669090791528
 CanvasRenderer:

+ 96 - 1
Assets/Res/UI/ShopPanel/ShopItemWidgetType2.prefab

@@ -203,7 +203,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_gfbook_huo
+  _icon_name: icon_shenshitishengfu
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: 77f77eea85838ad4b8734050364b4892, type: 3}
   packInfo:
@@ -251,6 +251,7 @@ RectTransform:
   - {fileID: 4940957247081514446}
   - {fileID: 7224631103695397948}
   - {fileID: 7164904183015823438}
+  - {fileID: 1934165202181370364}
   - {fileID: 4391990160844781279}
   - {fileID: 7133505018926026809}
   - {fileID: 4616542265640154776}
@@ -342,6 +343,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Icon_Item2
+    gameObject: {fileID: 5754886254107738200}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!114 &143194323039995006
 MonoBehaviour:
@@ -381,6 +387,95 @@ MonoBehaviour:
   - {fileID: 0}
   AllComsStateTypes: 40000000
   CurrIndex: 0
+--- !u!1 &2501408855436190870
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1934165202181370364}
+  - component: {fileID: 6954625974057336107}
+  - component: {fileID: 5754886254107738200}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon_Item2
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1934165202181370364
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2501408855436190870}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 666260999598083492}
+  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: 11.8, y: 24.1}
+  m_SizeDelta: {x: 39.0759, y: 39.0759}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6954625974057336107
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2501408855436190870}
+  m_CullTransparentMesh: 1
+--- !u!114 &5754886254107738200
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2501408855436190870}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 1
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: icon_Coin
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 77f77eea85838ad4b8734050364b4892, type: 3}
+  packInfo:
+    packName: daoju
+    packgJsonPath: /Art/UIAssets/TextrueJson\daoju.txt
+    packgSpritePath: Assets/Res/UIAtlas/daoju.spriteatlasv2
+    lasetJsonGUID: 1d33824861d7fb9fd50c0d939197e59c
+  imageH: 78.167946
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &4510606267493267426
 GameObject:
   m_ObjectHideFlags: 0

+ 98 - 3
Assets/Res/UI/WidgetItem.prefab

@@ -125,7 +125,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 78.238, y: 78.2376}
+  m_SizeDelta: {x: 90, y: 90}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &378238944744485029
 CanvasRenderer:
@@ -165,7 +165,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_gfbook_jin
+  _icon_name: icon_shenshitishengfu
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: 77f77eea85838ad4b8734050364b4892, type: 3}
   packInfo:
@@ -210,6 +210,7 @@ RectTransform:
   m_Children:
   - {fileID: 1835098571422434311}
   - {fileID: 3545244106223690488}
+  - {fileID: 530714132054759416}
   - {fileID: 634620019119729600}
   - {fileID: 5439489424817645504}
   - {fileID: 5126391295778819725}
@@ -318,6 +319,95 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &3568714738850479019
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 530714132054759416}
+  - component: {fileID: 8294928639919309581}
+  - component: {fileID: 2875164870552254628}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon_Item2
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &530714132054759416
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3568714738850479019}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 6062762002596746888}
+  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: 9.73, y: -18.16}
+  m_SizeDelta: {x: 37.6999, y: 37.6997}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8294928639919309581
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3568714738850479019}
+  m_CullTransparentMesh: 1
+--- !u!114 &2875164870552254628
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3568714738850479019}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 1
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: icon_Coin
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 77f77eea85838ad4b8734050364b4892, type: 3}
+  packInfo:
+    packName: daoju
+    packgJsonPath: /Art/UIAssets/TextrueJson\daoju.txt
+    packgSpritePath: Assets/Res/UIAtlas/daoju.spriteatlasv2
+    lasetJsonGUID: 73bfe54518876535550be496297154c4
+  imageH: 78.167946
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &6073983424458382615
 GameObject:
   m_ObjectHideFlags: 0
@@ -353,7 +443,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: 3.7, y: 8.9}
+  m_AnchoredPosition: {x: 3.98, y: 8.8}
   m_SizeDelta: {x: 24.3777, y: 24.3777}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &775149439118876004
@@ -684,6 +774,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Icon_Item2
+    gameObject: {fileID: 2875164870552254628}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!114 &259851968356172009
 MonoBehaviour:

+ 2 - 0
Assets/Res/UIAtlas/daoju.spriteatlasv2

@@ -69,6 +69,8 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: 3a38b3d3bbc5459499bec6eaa897f06c, type: 3}
     - {fileID: 2800000, guid: 37f8647d1beb1f447bda88ef74823c15, type: 3}
     - {fileID: 2800000, guid: eac6f5da4c382644187f255959900fa7, type: 3}
+    - {fileID: 2800000, guid: 35511bdb096ae6740b6efa72c9cdaa2e, type: 3}
+    - {fileID: 2800000, guid: 1a8c3ed9ca6330047936e5f4186497d2, type: 3}
     - {fileID: 2800000, guid: d00357180b5503e4b82cdb7b52c268ba, type: 3}
     - {fileID: 2800000, guid: 77a09e7d9b9e2c149b0c2e0ea2181af5, type: 3}
     - {fileID: 2800000, guid: b77a9d9e89868084d9601eb9fd837640, type: 3}

+ 1 - 0
Assets/Res/UIAtlas/tongyong.spriteatlasv2

@@ -71,6 +71,7 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: 1b0804967bb5d8e4a8158eab712b1fe5, type: 3}
     - {fileID: 2800000, guid: bdc0ea4a000745e409dfd720c73eb1db, type: 3}
     - {fileID: 2800000, guid: 4696d2eb626039c47bd54a652e74684a, type: 3}
+    - {fileID: 2800000, guid: f1207f2c3fea54543970c1a045cf229e, type: 3}
     - {fileID: 2800000, guid: 02b70e3a04ca73d43b1c980bb9b7c829, type: 3}
     - {fileID: 2800000, guid: d3d11c3827005514aa7d289e7cffbbac, type: 3}
     - {fileID: 2800000, guid: 8858058a836c6694a8c89b729ced8ac4, type: 3}

+ 21 - 4
Assets/Scripts/GameUI/UI/DivineSence/DivineSenceInfoBtnWidget.cs

@@ -34,7 +34,8 @@ namespace Fort23.Mono
                 Icon_ItemIcon.gameObject.SetActive(false);
                 Icon_ShenIcon.gameObject.SetActive(true);
                 // Icon_ItemIcon.icon_name = ItemInfo.config.icon;
-                Text_ItemCount.text = $"{100 * 1}/{AccountFileInfo.Instance.playerData.divineSensePoint}";
+                Text_ItemCount.text =
+                    $"<color=#EF9F32>{100 * 1}</color>/{AccountFileInfo.Instance.playerData.divineSensePoint}";
             }
             else
             {
@@ -44,14 +45,28 @@ namespace Fort23.Mono
                     Icon_ItemIcon.gameObject.SetActive(false);
                     Icon_ShenIcon.gameObject.SetActive(false);
                     Text_ItemCount.text = "";
+                    icon_Jia.gameObject.SetActive(true);
                 }
                 else
                 {
+                    icon_Jia.gameObject.SetActive(false);
                     ItemInfo = PlayerManager.Instance.BagController.GetItemInfo(id);
                     Icon_ItemIcon.gameObject.SetActive(transform);
                     Icon_ShenIcon.gameObject.SetActive(false);
-                    Icon_ItemIcon.icon_name = ItemInfo.config.icon;
+
                     Text_ItemCount.text = $"{1}/{ItemInfo.count.Value.ToString()}";
+
+                    if (ItemInfo.config.associateID == 7)
+                    {
+                        Icon_ItemIcon.icon_name = "icon_shenshitishengfu";
+                        Icon_ItemIcon2.icon_name = ItemInfo.config.icon;
+                        Icon_ItemIcon2.gameObject.SetActive(true);
+                    }
+                    else
+                    {
+                        Icon_ItemIcon.icon_name = ItemInfo.config.icon;
+                        Icon_ItemIcon2.gameObject.SetActive(false);
+                    }
                 }
             }
         }
@@ -60,13 +75,15 @@ namespace Fort23.Mono
         {
             if (type == 1)
             {
-                Text_ItemCount.text = $"{100 * selectCount}/{AccountFileInfo.Instance.playerData.divineSensePoint}";
+                Text_ItemCount.text =
+                    $"<color=#EF9F32>{100 * selectCount}</color>/{AccountFileInfo.Instance.playerData.divineSensePoint}";
             }
             else
             {
                 if (ItemInfo != null)
                 {
-                    Text_ItemCount.text = $"{selectCount}/{ItemInfo.count.Value.ToString()}";
+                    selectCount = selectCount > ItemInfo.count.Value ? (int)ItemInfo.count.Value : selectCount;
+                    Text_ItemCount.text = $"<color=#EF9F32>{selectCount}</color>/{ItemInfo.count.Value.ToString()}";
                 }
             }
         }

+ 22 - 0
Assets/Scripts/GameUI/UI/DivineSence/DivineSenceInfoBtnWidgetData.cs

@@ -41,6 +41,28 @@ namespace Fort23.Mono
 	      return _Icon_ShenIcon;
 	     }
 	   }
+	  private MyImage _Icon_ItemIcon2;
+	  public MyImage Icon_ItemIcon2
+	   {
+	   get{
+	      if (_Icon_ItemIcon2 == null)
+	       {
+	         _Icon_ItemIcon2  = GetUIUnit<MyImage>("Icon_ItemIcon2"); 
+	       }
+	      return _Icon_ItemIcon2;
+	     }
+	   }
+	  private GameObject _icon_Jia;
+	  public GameObject icon_Jia
+	   {
+	   get{
+	      if (_icon_Jia == null)
+	       {
+	         _icon_Jia  = GetUIUnit<GameObject>("icon_Jia"); 
+	       }
+	      return _icon_Jia;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

+ 10 - 1
Assets/Scripts/GameUI/UI/RewardsPanel/WidgetItem.cs

@@ -79,6 +79,7 @@ namespace Fort23.Mono
                     icon.icon_name = "dec_gfbook_tu";
                 }
 
+                Icon_Item2.gameObject.SetActive(false);
                 Icon_Skill.gameObject.SetActive(true);
                 Icon_Skill.icon_name = skillConfig.icon;
             }
@@ -109,12 +110,20 @@ namespace Fort23.Mono
                     icon.icon_name = "dec_gfbook_tu";
                 }
 
-            
+                Icon_Item2.gameObject.SetActive(false);
                 Icon_Skill.gameObject.SetActive(true);
                 Icon_Skill.icon_name = skillConfig.icon;
             }
+            else if (itemInfo.config.associateID == 7)
+            {
+                Icon_Skill.gameObject.SetActive(false);
+                icon.icon_name = "icon_shenshitishengfu";
+                Icon_Item2.icon_name = itemInfo.config.icon;
+                Icon_Item2.gameObject.SetActive(true);
+            }
             else
             {
+                Icon_Item2.gameObject.SetActive(false);
                 Icon_Skill.gameObject.SetActive(false);
                 icon.icon_name = itemInfo.config.icon;
             }

+ 11 - 0
Assets/Scripts/GameUI/UI/RewardsPanel/WidgetItemData.cs

@@ -96,6 +96,17 @@ namespace Fort23.Mono
 	      return _Icon_SuiPian;
 	     }
 	   }
+	  private MyImage _Icon_Item2;
+	  public MyImage Icon_Item2
+	   {
+	   get{
+	      if (_Icon_Item2 == null)
+	       {
+	         _Icon_Item2  = GetUIUnit<MyImage>("Icon_Item2"); 
+	       }
+	      return _Icon_Item2;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

+ 10 - 0
Assets/Scripts/GameUI/UI/ShopPanel/ShopItemWidgetType2.cs

@@ -193,6 +193,7 @@ namespace Fort23.Mono
                 }
 
                 Icon_Skill.gameObject.SetActive(true);
+                Icon_Item2.gameObject.SetActive(false);
                 Icon_Skill.icon_name = skillConfig.icon;
             }
             //碎片
@@ -223,10 +224,19 @@ namespace Fort23.Mono
                 }
 
                 Icon_Skill.gameObject.SetActive(true);
+                Icon_Item2.gameObject.SetActive(false);
                 Icon_Skill.icon_name = skillConfig.icon;
             }
+            else if (_itemConfig.associateID == 7)
+            {
+                Icon_Skill.gameObject.SetActive(false);
+                Icon_Item.icon_name = "icon_shenshitishengfu";
+                Icon_Item2.icon_name =_itemConfig.icon;
+                Icon_Item2.gameObject.SetActive(true);
+            }
             else
             {
+                Icon_Item2.gameObject.SetActive(false);
                 Icon_Skill.gameObject.SetActive(false);
                 Icon_Item.icon_name = _itemConfig.icon;
             }

+ 11 - 0
Assets/Scripts/GameUI/UI/ShopPanel/ShopItemWidgetType2Data.cs

@@ -140,6 +140,17 @@ namespace Fort23.Mono
 	      return _Icon_SuiPian;
 	     }
 	   }
+	  private MyImage _Icon_Item2;
+	  public MyImage Icon_Item2
+	   {
+	   get{
+	      if (_Icon_Item2 == null)
+	       {
+	         _Icon_Item2  = GetUIUnit<MyImage>("Icon_Item2"); 
+	       }
+	      return _Icon_Item2;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

二进制
Excel2Json/Excel/Item.xlsx


文件差异内容过多而无法显示
+ 0 - 0
UGUIPack/uguiconfig.db


文件差异内容过多而无法显示
+ 0 - 0
美术/unity_use_ui/TextrueJson/daoju.txt


+ 1 - 1
美术/unity_use_ui/TextrueJson/fabao.txt

@@ -1 +1 @@
-{"packName":"fabao","isTyPack":false,"newTextureJson":[{"textrueName":"dec_fbBiaotiDIban","filePath":"/decorate/dec_fbBiaotiDIban.png"},{"textrueName":"dec_fbDengjiDiban","filePath":"/decorate/dec_fbDengjiDiban.png"},{"textrueName":"dec_fbfangyu","filePath":"/decorate/dec_fbfangyu.png"},{"textrueName":"dec_fbgong","filePath":"/decorate/dec_fbgong.png"},{"textrueName":"dec_fbGuangbian","filePath":"/decorate/dec_fbGuangbian.png"},{"textrueName":"dec_fbjia","filePath":"/decorate/dec_fbjia.png"},{"textrueName":"dec_fbjian","filePath":"/decorate/dec_fbjian.png"},{"textrueName":"dec_fbshuziDiban","filePath":"/decorate/dec_fbshuziDiban.png"},{"textrueName":"dec_fbxiaDiban","filePath":"/decorate/dec_fbxiaDiban.png"},{"textrueName":"dec_fbXuanzhe","filePath":"/decorate/dec_fbXuanzhe.png"},{"textrueName":"dec_fbxue","filePath":"/decorate/dec_fbxue.png"},{"textrueName":"dec_fbzhongDiban","filePath":"/decorate/dec_fbzhongDiban.png"},{"textrueName":"dec_fbZhuangbeiDiban","filePath":"/decorate/dec_fbZhuangbeiDiban.png"}],"keyToValue":{}}
+{"packName":"fabao","isTyPack":false,"newTextureJson":[{"textrueName":"dec_fbBiaotiDIban","filePath":"/decorate/dec_fbBiaotiDIban.png"},{"textrueName":"dec_fbDengjiDiban","filePath":"/decorate/dec_fbDengjiDiban.png"},{"textrueName":"dec_fbfangyu","filePath":"/decorate/dec_fbfangyu.png"},{"textrueName":"dec_fbgong","filePath":"/decorate/dec_fbgong.png"},{"textrueName":"dec_fbGuangbian","filePath":"/decorate/dec_fbGuangbian.png"},{"textrueName":"dec_fbjia","filePath":"/decorate/dec_fbjia.png"},{"textrueName":"dec_fbjian","filePath":"/decorate/dec_fbjian.png"},{"textrueName":"dec_fbshuziDiban","filePath":"/decorate/dec_fbshuziDiban.png"},{"textrueName":"dec_fbxiaDiban","filePath":"/decorate/dec_fbxiaDiban.png"},{"textrueName":"dec_fbXuanzhe","filePath":"/decorate/dec_fbXuanzhe.png"},{"textrueName":"dec_fbxue","filePath":"/decorate/dec_fbxue.png"},{"textrueName":"dec_fbzhongDiban","filePath":"/decorate/dec_fbzhongDiban.png"},{"textrueName":"dec_fbZhuangbeiDiban","filePath":"/decorate/dec_fbZhuangbeiDiban.png"},{"textrueName":"dec_shengji_db","filePath":"/decorate/dec_shengji_db.png"}],"keyToValue":{}}

文件差异内容过多而无法显示
+ 0 - 0
美术/unity_use_ui/TextrueJson/tongyong.txt


二进制
美术/unity_use_ui/decorate/dec_juxing_135.png


二进制
美术/unity_use_ui/decorate/dec_shengji_db.png


二进制
美术/unity_use_ui/icon/icon_shenshitishengfu2.png


二进制
美术/unity_use_ui/icon/icon_shenshitishengfu3.png


部分文件因为文件数量过多而无法显示