소스 검색

小修改

123 1 년 전
부모
커밋
ffe7c9cb51

+ 0 - 8
Assets/Content/Icons/ShopIcons/充值货币档位修改.meta

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

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 174 - 142
Assets/Content/Prefabs/UI/UILanuch/UILanuch.prefab


+ 9 - 9
Assets/Content/Raw_Art/UI/UILanuch/LOGO1.png.meta

@@ -6,7 +6,7 @@ TextureImporter:
   serializedVersion: 12
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 1
+    enableMipMap: 0
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -36,13 +36,13 @@ TextureImporter:
     filterMode: 1
     aniso: 1
     mipBias: 0
-    wrapU: 0
-    wrapV: 0
+    wrapU: 1
+    wrapV: 1
     wrapW: 0
-  nPOTScale: 1
+  nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
-  spriteMode: 0
+  spriteMode: 1
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
@@ -53,7 +53,7 @@ TextureImporter:
   alphaUsage: 1
   alphaIsTransparency: 1
   spriteTessellationDetail: -1
-  textureType: 0
+  textureType: 8
   textureShape: 1
   singleChannelComponent: 0
   flipbookRows: 1
@@ -76,7 +76,7 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 1
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
     buildTarget: iPhone
     maxTextureSize: 2048
@@ -124,14 +124,14 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 1
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 
+    spriteID: 5e97eb03825dee720800000000000000
     internalID: 0
     vertices: []
     indices: 

BIN
Assets/Content/Raw_Art/UI/UILanuch/LOGO1.psd


+ 0 - 135
Assets/Content/Raw_Art/UI/UILanuch/LOGO1.psd.meta

@@ -1,135 +0,0 @@
-fileFormatVersion: 2
-guid: 1b13b6f00f1200541a6bf6e422d10886
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 12
-  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
-  ignoreMasterTextureLimit: 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: 1
-  cookieLightType: 1
-  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: 1
-  - 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: 1
-  - serializedVersion: 3
-    buildTarget: Android
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: 47
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 1
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 1
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: 12
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 1
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 1
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 1
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 10 - 0
Assets/Editor/AssetBundle/CheckHotUpdateRes.cs

@@ -156,6 +156,10 @@ public class CheckHotUpdateRes : EditorWindow
         {
             CopyTexture();
         }
+        if (GUILayout.Button("复制PSD资源到输出路径"))
+        {
+            CopyPsd();
+        }
 
         GUILayout.Box("", GUILayout.Width(790));
         GUILayout.BeginHorizontal();
@@ -365,4 +369,10 @@ public class CheckHotUpdateRes : EditorWindow
         string datapath = $"{Application.dataPath}/Content/Icons/";
         FileHelper.CopyDir(datapath, info.OutputPath, "meta");
     }
+
+    private void CopyPsd()
+    {
+        string datapath = $"{Application.dataPath}/";
+        FileHelper.CopyDir_Only(datapath, info.OutputPath, ".psd");
+    }
 }

+ 5 - 5
Assets/Lua/Core/PlatformPack.lua

@@ -1,9 +1,9 @@
 local PlatformPack = {
-	URL_KEY = 'http://110.40.223.119:81//',
-	SERVERLIST_URL = 'http://110.40.223.119:81//serverlist',
-	NOTIFY_URL = 'http://165.154.29.92:88/res/NoticeNew/',
-	SPECIAL_INFO_URL = 'http://110.40.223.119:81//channel',
-	CUSTOMER_SERVICE_INFO_URL = 'http://110.40.223.119:81//vipService',
+	URL_KEY = 'http://43.248.187.68:81//',
+	SERVERLIST_URL = 'http://43.248.187.68:81//serverlist',
+	NOTIFY_URL = 'http://43.248.187.68:88//res/NoticeNew/',
+	SPECIAL_INFO_URL = 'http://43.248.187.68:81//channel',
+	CUSTOMER_SERVICE_INFO_URL = 'http://43.248.187.68:81//vipService',
 }
 
 return PlatformPack

+ 58 - 0
Assets/Src/Core/DownLoad/FileHelper.cs

@@ -267,6 +267,48 @@ public class FileHelper
         return paths.ToArray();
     }
 
+    public static string[] GetAllFileNmae_Only(string path, string include, bool isfullName = false, bool isGetSubPath = true, string perName = "")
+    {
+        List<string> paths = new List<string>();
+        string pername = string.IsNullOrEmpty(perName) ? "" : $"{perName}/";
+
+        if (Directory.Exists(path))
+        {
+            DirectoryInfo dir = new DirectoryInfo(path);
+            FileInfo[] fileInfos = dir.GetFiles();
+
+            foreach (var item in fileInfos)
+            {
+                if (include != null && !item.Name.EndsWith(include)) continue;
+
+                if (!isfullName)
+                {
+                    paths.Add(pername + item.Name);
+                }
+                else
+                    paths.Add(item.FullName);
+            }
+
+
+            DirectoryInfo[] directoryInfos = dir.GetDirectories();
+            if (isGetSubPath)
+            {
+                if (directoryInfos != null && directoryInfos.Length > 0)
+                {
+                    foreach (var item in directoryInfos)
+                    {
+                        string[] names = GetAllFileNmae_Only(item.FullName, include, isfullName, isGetSubPath, pername + item.Name);
+                        if (names != null && names.Length > 0)
+                        {
+                            paths.AddRange(names);
+                        }
+                    }
+                }
+            }
+        }
+
+        return paths.ToArray();
+    }
 
     public static void CopyDir(string dir, string outDir, string exclude)
     {
@@ -285,7 +327,23 @@ public class FileHelper
         }
 
     }
+    public static void CopyDir_Only(string dir, string outDir, string include)
+    {
+        string[] files1 = GetAllFileNmae_Only(dir, include);
+        if (dir.LastIndexOf('/') != dir.Length - 1)
+        {
+            dir += "/";
+        }
 
+        foreach (var item in files1)
+        {
+            Debug.Log("===============File : " + item);
+            byte[] fdatas = File.ReadAllBytes(dir + item);
+
+            WirteToFile($"{outDir}/{item}", fdatas);
+        }
+
+    }
     public static string GetSubPath(string path, string mainPath, bool isRemoveName = true)
     {
 

이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.