Merge branch 'hy_tw-en' of ssh://192.168.0.8:29418/xianjing into hy_tw-en_ios

# Conflicts:
#	Assets/Editor/Pack/Platform/PackPlatformiOSBuild.cs
#	Assets/Lua/Core/PlatformPack.lua
#	Build/BuildDependenceResource/CurPackEnv.ini
#	ProjectSettings/ProjectSettings.asset
#	UserSettings/Layouts/default-2021.dwlt

Assets/Content/Config/DownLoadUrlCfg.csv

@@ -1,6 +1,6 @@
 ID,Platform,BaseUrl,ServerUrl,Param1,DownloadPath,MaxNum
 ID,Platform,BaseUrl,ServerUrl,Param1,DownloadPath,MaxNum
 int,string,string,string,string,string,int
-1,GameDebug,http://110.40.223.119:88/dny/,http://110.40.223.119:81/,dny,res/AndroidNewRes/,1
-2,Android,http://43.156.13.116:88/dny/,http://43.156.13.116:81/,dny,res/AndroidNewRes/,1
-3,IOS,http://43.156.13.116:88/dny/,http://43.156.13.116:81/,dny,res/IosRes/,1
+1,GameDebug,http://110.40.223.119:88/entw/,http://110.40.223.119:81/,entw,res/AndroidNewRes/,1
+2,Android,http://128.14.226.105:88/entw/,http://128.14.226.105:81/,entw,res/AndroidNewRes/,1
+3,IOS,http://128.14.226.105:88/entw/,http://128.14.226.105:81/,entw,res/IosRes/,1

Assets/Content/Config/IOSShopProductIDCfg.csv

@@ -1,11 +1,11 @@
 id,价格,商品ID,商品名字,其他
 id,amount,productID,productName,other
-1,0.99,ro.0.99.pro,0.99 Pack,
-2,1.99,ro.1.99.pro,1.99 Pack,
-3,2.99,ro.2.99.pro,2.99 Pack,
-4,4.99,ro.4.99.pro,4.99 Pack,
-5,9.99,ro.9.99.pro,9.99 Pack,
-6,14.99,ro.14.99.pro,14.99 Pack,
-7,19.99,ro.19.99.pro,19.99 Pack,
-8,49.99,ro.49.99.pro,49.99 Pack,
-9,99.99,ro.99.99.pro,99.99 Pack,
+1,0.99,wonderland0.99,0.99禮包,
+2,1.99,wonderland1.99,1.99禮包,
+3,2.99,wonderland2.99,2.99禮包,
+4,4.99,wonderland4.99,4.99禮包,
+5,9.99,wonderland9.99,9.99禮包,
+6,14.99,wonderland14.99,14.99禮包,
+7,19.99,wonderland19.99,19.99禮包,
+8,49.99,wonderland49.99,49.99禮包,
+9,99.99,wonderland99.99,99.99禮包,

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

@@ -1,12 +1,12 @@
 fileFormatVersion: 2
 guid: 2e75ebb89ca65b04fa80f8b75bdfd171
 TextureImporter:
-  internalIDToNameTable: []
+  fileIDToRecycleName: {}
   externalObjects: {}
-  serializedVersion: 12
+  serializedVersion: 9
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 1
+    enableMipMap: 0
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -23,8 +23,6 @@ TextureImporter:
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMasterTextureLimit: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   cubemapConvolution: 0
@@ -33,16 +31,16 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 0
-    wrapV: 0
-    wrapW: 0
-  nPOTScale: 1
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: -1
+  nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
-  spriteMode: 0
+  spriteMode: 1
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
@@ -53,19 +51,14 @@ TextureImporter:
   alphaUsage: 1
   alphaIsTransparency: 1
   spriteTessellationDetail: -1
-  textureType: 0
+  textureType: 8
   textureShape: 1
   singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
   maxTextureSizeSet: 0
   compressionQualitySet: 0
   textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  cookieLightType: 0
   platformSettings:
-  - serializedVersion: 3
+  - serializedVersion: 2
     buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
     resizeAlgorithm: 0
@@ -76,69 +69,50 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - 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: 0
-  - serializedVersion: 3
+  - serializedVersion: 2
     buildTarget: iPhone
     maxTextureSize: 2048
     resizeAlgorithm: 0
-    textureFormat: 50
+    textureFormat: 56
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 1
     androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WebGL
+  - serializedVersion: 2
+    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
+  - serializedVersion: 2
+    buildTarget: Standalone
     maxTextureSize: 2048
     resizeAlgorithm: 0
-    textureFormat: 47
+    textureFormat: 12
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 1
     androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 
-    internalID: 0
+    spriteID: dda4613ff9a57ff4388bb7a6cd6ebc84
     vertices: []
     indices: 
     edges: []
     weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
   spritePackingTag: 
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0