lzx před 2 dny
rodič
revize
8aa2b1f256
26 změnil soubory, kde provedl 210 přidání a 1 odebrání
  1. 0 0
      Assets/Art/UIAssets/TextrueJson/tongyong.txt
  2. binární
      Assets/Art/UIAssets/decorate/dec_wupin_pinzhi1.png
  3. binární
      Assets/Art/UIAssets/decorate/dec_wupin_pinzhi2.png
  4. binární
      Assets/Art/UIAssets/decorate/dec_wupin_pinzhi3.png
  5. binární
      Assets/Art/UIAssets/decorate/dec_wupin_pinzhi4.png
  6. binární
      Assets/Art/UIAssets/decorate/dec_wupin_pinzhi5.png
  7. binární
      Assets/Art/UIAssets/decorate/dec_wupin_pinzhi6.png
  8. 203 0
      Assets/Art/UIAssets/decorate/dec_wupin_pinzhi6.png.meta
  9. 5 0
      Assets/Res/UI/ItemDetailsPanel/ItemDetailsPanel.prefab
  10. 1 1
      Assets/Res/UIAtlas/tongyong.spriteatlasv2
  11. 1 0
      Assets/Scripts/GameUI/UI/ItemDetailsPanel/ItemDetailsPanel.cs
  12. 0 0
      UGUIPack/uguiconfig.db
  13. binární
      美术/art_use_ui/tongyong/dec_wupin_pinzhi0.png
  14. binární
      美术/art_use_ui/tongyong/dec_wupin_pinzhi1.png
  15. binární
      美术/art_use_ui/tongyong/dec_wupin_pinzhi2.png
  16. binární
      美术/art_use_ui/tongyong/dec_wupin_pinzhi3.png
  17. binární
      美术/art_use_ui/tongyong/dec_wupin_pinzhi4.png
  18. binární
      美术/art_use_ui/tongyong/dec_wupin_pinzhi5.png
  19. binární
      美术/art_use_ui/tongyong/dec_wupin_pinzhi6.png
  20. 0 0
      美术/unity_use_ui/TextrueJson/tongyong.txt
  21. binární
      美术/unity_use_ui/decorate/dec_wupin_pinzhi1.png
  22. binární
      美术/unity_use_ui/decorate/dec_wupin_pinzhi2.png
  23. binární
      美术/unity_use_ui/decorate/dec_wupin_pinzhi3.png
  24. binární
      美术/unity_use_ui/decorate/dec_wupin_pinzhi4.png
  25. binární
      美术/unity_use_ui/decorate/dec_wupin_pinzhi5.png
  26. binární
      美术/unity_use_ui/decorate/dec_wupin_pinzhi6.png

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
Assets/Art/UIAssets/TextrueJson/tongyong.txt


binární
Assets/Art/UIAssets/decorate/dec_wupin_pinzhi1.png


binární
Assets/Art/UIAssets/decorate/dec_wupin_pinzhi2.png


binární
Assets/Art/UIAssets/decorate/dec_wupin_pinzhi3.png


binární
Assets/Art/UIAssets/decorate/dec_wupin_pinzhi4.png


binární
Assets/Art/UIAssets/decorate/dec_wupin_pinzhi5.png


binární
Assets/Art/UIAssets/decorate/dec_wupin_pinzhi6.png


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

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: CHxNsHypUX+DAxolCtJlsIMHCM6s2gTRm31YQ4nCbITb8twuNYUwJS1CgKQn
+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: 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: 

+ 5 - 0
Assets/Res/UI/ItemDetailsPanel/ItemDetailsPanel.prefab

@@ -1305,4 +1305,9 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Icon_Quality
+    gameObject: {fileID: 705275978297865375}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 0

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

@@ -92,13 +92,13 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: e7b5a1267ffb6a14eb24c0c1739a033f, type: 3}
     - {fileID: 2800000, guid: f593799232862834892b4cf56dce0c93, type: 3}
     - {fileID: 2800000, guid: 5ab57f908954d5d4f9e1299df3ddbc9c, type: 3}
-    - {fileID: 2800000, guid: f155a2e938bd00145849a2f70613d7a3, type: 3}
     - {fileID: 2800000, guid: bc734c3886fa7eb49a88bb9e297d938e, type: 3}
     - {fileID: 2800000, guid: fd1c06d00670f43409ef94f2571832b1, type: 3}
     - {fileID: 2800000, guid: 1e9bd989dd911de4484b02bd32ac0b60, type: 3}
     - {fileID: 2800000, guid: 6f6e0c21c7e3b244c91db4619c22896d, type: 3}
     - {fileID: 2800000, guid: 103b62b17c84d6244bc5c1faeca600c4, type: 3}
     - {fileID: 2800000, guid: 8ecfbe29019754047916ed69ee538aec, type: 3}
+    - {fileID: 2800000, guid: 76b5f424081ae1c4882a1f6ba7ec0fb8, type: 3}
     - {fileID: 2800000, guid: 9bfe4fd79eb566f4ea8a19c63dd1f5ec, type: 3}
     - {fileID: 2800000, guid: 43ee7ca9b6e77b041a5a5c40598a7267, type: 3}
     - {fileID: 2800000, guid: 2d2e9b702b9dc20418741c36f06c90b5, type: 3}

+ 1 - 0
Assets/Scripts/GameUI/UI/ItemDetailsPanel/ItemDetailsPanel.cs

@@ -35,6 +35,7 @@ namespace Fort23.Mono
             Icon_ItemIcon.icon_name = itemInfo.config.icon;
             Text_Name.text = LanguageManager.Instance.Text(itemInfo.config.itemName);
             Text_Desc.text = LanguageManager.Instance.Text(itemInfo.config.itemDesc2);
+            Icon_Quality.icon_name  = "dec_wupin_pinzhi" + itemInfo.config.quality;
 
             ItemDetailsWidget itemDetailsWidget1 = await UIManager.Instance.CreateGComponent<ItemDetailsWidget>(null, Connect);
             itemDetailsWidget1.CustomInit("用途", LanguageManager.Instance.Text(itemInfo.config.itemDesc));

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
UGUIPack/uguiconfig.db


binární
美术/art_use_ui/tongyong/dec_wupin_pinzhi0.png


binární
美术/art_use_ui/tongyong/dec_wupin_pinzhi1.png


binární
美术/art_use_ui/tongyong/dec_wupin_pinzhi2.png


binární
美术/art_use_ui/tongyong/dec_wupin_pinzhi3.png


binární
美术/art_use_ui/tongyong/dec_wupin_pinzhi4.png


binární
美术/art_use_ui/tongyong/dec_wupin_pinzhi5.png


binární
美术/art_use_ui/tongyong/dec_wupin_pinzhi6.png


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
美术/unity_use_ui/TextrueJson/tongyong.txt


binární
美术/unity_use_ui/decorate/dec_wupin_pinzhi1.png


binární
美术/unity_use_ui/decorate/dec_wupin_pinzhi2.png


binární
美术/unity_use_ui/decorate/dec_wupin_pinzhi3.png


binární
美术/unity_use_ui/decorate/dec_wupin_pinzhi4.png


binární
美术/unity_use_ui/decorate/dec_wupin_pinzhi5.png


binární
美术/unity_use_ui/decorate/dec_wupin_pinzhi6.png


Některé soubory nejsou zobrazeny, neboť je v těchto rozdílových datech změněno mnoho souborů