Assets/Content/Icons/ActivityImg/active_icon_taqinhaoli.png.meta

@@ -86,43 +86,31 @@ TextureImporter:
     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: 0
+    overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
-    buildTarget: WebGL
+    buildTarget: Android
     maxTextureSize: 2048
     resizeAlgorithm: 0
-    textureFormat: -1
+    textureFormat: 47
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
-    buildTarget: Android
+    buildTarget: iPhone
     maxTextureSize: 2048
     resizeAlgorithm: 0
-    textureFormat: 47
+    textureFormat: 50
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:

Assets/Content/Icons/ActivityImg/active_icon_taqinqiandao.png.meta

@@ -86,43 +86,31 @@ TextureImporter:
     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: 0
+    overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
-    buildTarget: WebGL
+    buildTarget: Android
     maxTextureSize: 2048
     resizeAlgorithm: 0
-    textureFormat: -1
+    textureFormat: 47
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
-    buildTarget: Android
+    buildTarget: iPhone
     maxTextureSize: 2048
     resizeAlgorithm: 0
-    textureFormat: 47
+    textureFormat: 50
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:

Assets/Content/Icons/Activity_NewYear/img_shuang11Signin_cn.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e822cbdef60495c41ab936cd5e094a67
+guid: cf33950e3635bf44aaecbfef93de67a8
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -90,10 +90,10 @@ TextureImporter:
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
-    buildTarget: iPhone
+    buildTarget: Android
     maxTextureSize: 2048
     resizeAlgorithm: 0
-    textureFormat: 50
+    textureFormat: 47
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
@@ -102,10 +102,10 @@ TextureImporter:
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
-    buildTarget: Android
+    buildTarget: iPhone
     maxTextureSize: 2048
     resizeAlgorithm: 0
-    textureFormat: 47
+    textureFormat: 50
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0

Assets/Content/Icons/Activity_NewYear/shuang11charge1_cn.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 76c0941ea9001484a98acf42430a261c
+guid: c40892b4ae731444c90d92db5763d527
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -90,10 +90,10 @@ TextureImporter:
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
-    buildTarget: iPhone
+    buildTarget: Android
     maxTextureSize: 2048
     resizeAlgorithm: 0
-    textureFormat: 50
+    textureFormat: 47
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
@@ -102,10 +102,10 @@ TextureImporter:
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
-    buildTarget: Android
+    buildTarget: iPhone
     maxTextureSize: 2048
     resizeAlgorithm: 0
-    textureFormat: 47
+    textureFormat: 50
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0

Assets/Content/Icons/Items/icon_luomituanzi.png.meta

@@ -90,10 +90,10 @@ TextureImporter:
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
-    buildTarget: iPhone
+    buildTarget: Android
     maxTextureSize: 2048
     resizeAlgorithm: 0
-    textureFormat: 50
+    textureFormat: 47
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
@@ -102,22 +102,10 @@ TextureImporter:
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
-    buildTarget: WebGL
-    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: Android
+    buildTarget: iPhone
     maxTextureSize: 2048
     resizeAlgorithm: 0
-    textureFormat: 47
+    textureFormat: 50
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
@@ -139,7 +127,7 @@ TextureImporter:
     weights: []
     secondaryTextures: []
     nameFileIdTable: {}
-  spritePackingTag: ItemIcons_1024_8
+  spritePackingTag: 
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 

Assets/Editor/AssetBundle/Hy_Dny_Test.asset

@@ -17,10 +17,9 @@ MonoBehaviour:
   OldPath: "D:\\\u9879\u76EE\\\u70ED\u66F4\u8D44\u6E90/2_dny_c"
   NewPath: E:/Project/Unity/bt_client_2022_S/Assets/StreamingAssets/AssetsAndroid
   OutputPath: "D:\\\u9879\u76EE\\\u70ED\u66F4\u8D44\u6E90/2_dny_c"
-  BaseNameFileInfoPath: 
   VersionFileName: Version
   mainfestFileName: mainfest
-  ResVersion: 0.1.0.16
+  ResVersion: 0.1.0.8
   IgnoreFiles: []
   rG_Ignore_Infos:
   - Field: font
@@ -33,18 +32,6 @@ MonoBehaviour:
     IsIgnore: 1
   - Field: scene
     IsIgnore: 1
-  - Field: cn
-    IsIgnore: 1
-  - Field: vi
-    IsIgnore: 1
-  - Field: th
-    IsIgnore: 1
-  Rg_Essential_Infos: []
   ChangeNum: 0
   IsIgnore: 1
   Language: 1
-  IsHx: 0
-  hxKey: 
-  abNameHxInfo:
-    HxKey: 
-    Infos: []

Assets/Lua/Core/LuaMain.lua

@@ -197,7 +197,7 @@ end
 
 function LuaMain:CheckServerState(platform)
     if IsCheckServerState then
-        local url = PlatformPack.URL_KEY .. "serverlist/serverstate?platform=" ..platform
+        local url = PlatformPack.SERVERLIST_URL .. "/serverstate?platform=" ..platform
         LogError("url = ".. url)
         self.CheckServerStateWWW = UnityEngine.WWW(url)
     end

Assets/Lua/UI/UIMain/UIMainView.lua

@@ -674,7 +674,7 @@ end
 
 function UIMainView:OnClickRuneShopBtn()
 	local curUIId = ManagerContainer.LuaUIMgr:GetCurUIId()
-	ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UIRuneShopBT, {Enum.RuneShopType.LimitTime}, curUIId)
+	ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UIRuneShopBT, nil, curUIId)
 end
 
 function UIMainView:OnClickWalletShopBtn()