瀏覽代碼

摘星图标资源从fgui挪到正式资源里

huangxiaoyue 1 年之前
父節點
當前提交
bfea3c6cc1
共有 23 個文件被更改,包括 2 次插入243 次删除
  1. 2 2
      GameClient/Assets/Game/HotUpdate/Utils/ResPathUtil.cs
  2. 0 1
      GameClient/Assets/Game/HotUpdate/Views/Common/Controller/LuckyBoxController.cs
  3. 二進制
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0!a.png
  4. 二進制
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0.png
  5. 二進制
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_1!a.png
  6. 二進制
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_1.png
  7. 二進制
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_2!a.png
  8. 二進制
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_2.png
  9. 二進制
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_3!a.png
  10. 二進制
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_3.png
  11. 二進制
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_4!a.png
  12. 二進制
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_4.png
  13. 二進制
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_5!a.png
  14. 二進制
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_5.png
  15. 二進制
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_6!a.png
  16. 二進制
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_6.png
  17. 二進制
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_7!a.png
  18. 二進制
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_7.png
  19. 二進制
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_8!a.png
  20. 0 120
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_8!a.png.meta
  21. 二進制
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_8.png
  22. 0 120
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_8.png.meta
  23. 二進制
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_fui.bytes

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Utils/ResPathUtil.cs

@@ -33,7 +33,7 @@ namespace GFGGame
         public static readonly string Model_DIR_PATH = $"{RES_ROOT_DIR_PATH}/model";
         public static readonly string STUDIO_FILING_DIR_PATH = $"{RES_ROOT_DIR_PATH}/Texture/Studios/CYJD/";
         public static readonly string MINIGAME_DIR_PATH = $"{TEXTURE_DIR_PATH}/MiniGame/";
-        public static readonly string LUCKY_BOX_TITLE_PATH = $"{TEXTURE_DIR_PATH}/LuckyBoxTitle/";
+        public static readonly string LUCKY_BOX_TITLE_PATH = $"{TEXTURE_DIR_PATH}/LuckyBoxTitleImg/";
 
         public static readonly string SQLITE_FILE_PATH = CONFIG_DIR_PATH + "/" + LauncherConfig.SQL_FILE_NAME;
 
@@ -307,7 +307,7 @@ namespace GFGGame
 
         public static string GetLuckyBoxTitlePath(string res, string extName = "png")
         {
-            return $"{LUCKY_BOX_TITLE_PATH}/{res}.{extName}";
+            return $"{LUCKY_BOX_TITLE_PATH}{res}.{extName}";
         }
     }
 }

+ 0 - 1
GameClient/Assets/Game/HotUpdate/Views/Common/Controller/LuckyBoxController.cs

@@ -95,7 +95,6 @@ namespace GFGGame
                 //comRes.m_loaRes.url = string.Format("ui://LuckyBox/{0}", _luckyBoxCfg.resArr[_modelIndex]);
                 comRes.m_loaRes.url = ResPathUtil.GetBgImgPath(_luckyBoxCfg.resArr[_modelIndex]);
                 comRes.m_loaTitle.url = ResPathUtil.GetLuckyBoxTitlePath(_luckyBoxCfg.resArr[_modelIndex]);
-                // "ui://LuckyBox/" + _luckyBoxCfg.resArr[_modelIndex];
                 comRes.m_loaRes.SetPosition(-110, -170, 1);
                 int direction = _luckyBoxCfg.scaleArr[_modelIndex] >= 0 ? 1 : -1;
                 float scale = _luckyBoxCfg.scaleArr.Length > 0 ? Math.Abs(_luckyBoxCfg.scaleArr[_modelIndex]) / 10000f : 1;

二進制
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0!a.png


二進制
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0.png


二進制
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_1!a.png


二進制
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_1.png


二進制
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_2!a.png


二進制
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_2.png


二進制
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_3!a.png


二進制
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_3.png


二進制
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_4!a.png


二進制
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_4.png


二進制
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_5!a.png


二進制
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_5.png


二進制
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_6!a.png


二進制
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_6.png


二進制
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_7!a.png


二進制
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_7.png


二進制
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_8!a.png


+ 0 - 120
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_8!a.png.meta

@@ -1,120 +0,0 @@
-fileFormatVersion: 2
-guid: 1179efef6c0604a44a840ce62038780b
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 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
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: 50
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 1
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Android
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: 50
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 1
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

二進制
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_8.png


+ 0 - 120
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_8.png.meta

@@ -1,120 +0,0 @@
-fileFormatVersion: 2
-guid: 5af6ff1c9a762fd428df4fda4068be6f
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 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
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: 50
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 1
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Android
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: 50
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 1
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

二進制
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_fui.bytes