Merge branch 'hy_dny' of ssh://192.168.0.8:29418/xianjing into hy_dny_rgres

Assets/Content/Config/LanguagePackage_cn.csv

@@ -19219,4 +19219,5 @@ DeleteEndNtfTxt,Thank you for playing! This process will take 1-10 business days
 DeleteErrorTxt,Account deletion has been applied for, please wait patiently.
 LoginGetServerListError,Too many players online. Please try again later.
 LoginGetServerListErrorString,Too many players are logging in. Retrying in {0}s.
-SdkLinkTxt,#c00ab65\nDear Adventurers,We are currently fixing an issue with in-app purchases.\n In the meantime, please use our Web Payment Center for recharge. Enjoy extra rewards for web recharge!\n Web Payment Center: #cff9800#t#hhttps://i.dze-game.com/recharge_center{https://i.dze-game.com/recharge_center}#h#t \n#c00ab65 Sorry for the trouble.
+SdkLinkTxt,#c00ab65\nDear Adventurers,We are currently fixing an issue with in-app purchases.\n In the meantime, please use our Web Payment Center for recharge. Enjoy extra rewards for web recharge!\n Web Payment Center: #cff9800#t#hhttps://i.dze-game.com/recharge_center{https://i.dze-game.com/recharge_center}#h#t \n#c00ab65 Sorry for the trouble.
+DownloadResSize,{0}m/{1}m

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

@@ -0,0 +1,135 @@
+fileFormatVersion: 2
+guid: e822cbdef60495c41ab936cd5e094a67
+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: 0
+  cookieLightType: 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: 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
+    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: 47
+    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: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -0,0 +1,135 @@
+fileFormatVersion: 2
+guid: 76c0941ea9001484a98acf42430a261c
+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: 0
+  cookieLightType: 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: 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
+    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: 47
+    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: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Editor/AssetBundle/CheckHotUpdateRes.cs

@@ -325,6 +325,10 @@ public class CheckHotUpdateRes : EditorWindow
                 }
                 else
                 {
+                    if (isignore)
+                    {
+                        continue;
+                    }
                     Debug.Log($"新 {newlist[i].FullName} MD5=[{newlist[i].MD5}]   Base = [{baseName}]");
                     needResList.Add(newlist[i]);
                 }

Assets/Editor/AssetBundle/Hy_Dny_Test.asset

@@ -17,9 +17,10 @@ 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.8
+  ResVersion: 0.1.0.16
   IgnoreFiles: []
   rG_Ignore_Infos:
   - Field: font
@@ -32,6 +33,18 @@ 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/Config/ActivitiesCfg.lua

@@ -1917,8 +1917,8 @@ local ActivitiesCfg = {
 ['Type']=12,
 ['Name']='ActCfg_Name134',
 ['Order']=1,
-['BG']='ActivityImg/shuang11charge1_cn',
-['ActivityBG']='ActivityImg/shuang11charge1_cn',
+['BG']='Activity_NewYear/shuang11charge1_cn',
+['ActivityBG']='Activity_NewYear/shuang11charge1_cn',
 ['PageId']=335,
 ['Entrance']={159},
 ['NeedShow']=true,
@@ -1959,8 +1959,8 @@ local ActivitiesCfg = {
 ['Type']=4,
 ['Name']='ActCfg_Name137',
 ['Order']=2,
-['BG']='ActivityImg/shuang11Signin_cn',
-['ActivityBG']='ActivityImg/img_shuang11Signin_cn',
+['BG']='Activity_NewYear/img_shuang11Signin_cn',
+['ActivityBG']='Activity_NewYear/img_shuang11Signin_cn',
 ['PageId']=304,
 ['Entrance']={159},
 ['NeedShow']=true,

Assets/Lua/Config/RuneShopGiftsCfg.lua

@@ -76,7 +76,7 @@ local RuneShopGiftsCfg = {
 ['Name']='RSGCfg_Name_7',
 ['Pic']='ShopIcons/bt_market_giftbox6',
 ['Type']=1,
-['RMB']=49.99,
+['RMB']=19.99,
 ['Reward']={{523,1},{141,5},{137,2}},
 ['FirstBuyPic']='',
 ['ExtraBuyPic']='',
@@ -101,7 +101,7 @@ local RuneShopGiftsCfg = {
     ['Name']='RSGCfg_Name_9',
     ['Pic']='ShopIcons/market_giftbox04',
     ['Type']=1,
-    ['RMB']=99.99,
+    ['RMB']=49.99,
     ['Reward']={{846,1},{141,5},{529,5}},
     ['FirstBuyPic']='',
     ['ExtraBuyPic']='',
@@ -149,7 +149,7 @@ local RuneShopGiftsCfg = {
         ['Name']='RSGCfg_Name_13',
         ['Pic'] = 'ShopIcons/market_giftbox19',
         ['Type'] = 1,
-        ['RMB'] = 49.9,
+        ['RMB'] = 19.9,
         ['Reward'] = {  { 11202, 1 } },
         ['FirstBuyPic'] = '',
         ['ExtraBuyPic'] = '',
@@ -161,7 +161,7 @@ local RuneShopGiftsCfg = {
         ['Name']='RSGCfg_Name_14',
         ['Pic'] = 'ShopIcons/market_giftbox19',
         ['Type'] = 1,
-        ['RMB'] = 49.9,
+        ['RMB'] = 19.9,
         ['Reward'] = {  { 11562, 1 }  },
         ['FirstBuyPic'] = '',
         ['ExtraBuyPic'] = '',
@@ -173,7 +173,7 @@ local RuneShopGiftsCfg = {
     ['Name']='RSGCfg_Name_15',
     ['Pic']='ShopIcons/market_giftbox19',
     ['Type']=1,
-    ['RMB']=49.9,
+    ['RMB']=19.9,
     ['Reward']={ { 11565, 1 } },
     ['FirstBuyPic']='',
     ['ExtraBuyPic']='',
@@ -245,7 +245,7 @@ local RuneShopGiftsCfg = {
 ['Name']='RSGCfg_Name_22',
 ['Pic']='ShopIcons/bt_market_giftbox1',
 ['Type']=2,
-['RMB']=49.99,
+['RMB']=19.99,
 ['Reward']={{102,2500},{2,1000000}},
 ['FirstBuyPic']='',
 ['ExtraBuyPic']='',
@@ -257,7 +257,7 @@ local RuneShopGiftsCfg = {
 ['Name']='RSGCfg_Name_23',
 ['Pic']='ShopIcons/bt_market_giftbox1',
 ['Type']=2,
-['RMB']=49.99,
+['RMB']=19.99,
 ['Reward']={{101,2500},{2,1000000}},
 ['FirstBuyPic']='',
 ['ExtraBuyPic']='',
@@ -317,7 +317,7 @@ local RuneShopGiftsCfg = {
 ['Name']='RSGCfg_Name_34',
 ['Pic']='ShopIcons/bt_market_giftbox5',
 ['Type']=2,
-['RMB']=49.99,
+['RMB']=19.99,
 ['Reward']={{513,5},{268,50},{139,4}},
 ['FirstBuyPic']='',
 ['ExtraBuyPic']='',
@@ -353,7 +353,7 @@ local RuneShopGiftsCfg = {
     ['Name']='RSGCfg_Name_37',
     ['Pic']='ShopIcons/market_giftbox10',
     ['Type']=2,
-    ['RMB']=99.99,
+    ['RMB']=49.99,
     ['Reward']={{513,10},{268,100},{139,4}},
     ['FirstBuyPic']='',
     ['ExtraBuyPic']='',
@@ -365,7 +365,7 @@ local RuneShopGiftsCfg = {
     ['Name']='RSGCfg_Name_38',
     ['Pic']='ShopIcons/market_giftbox11',
     ['Type']=2,
-    ['RMB']=99.99,
+    ['RMB']=49.99,
     ['Reward']={{607,10},{115,50},{2,2000000}},
     ['FirstBuyPic']='',
     ['ExtraBuyPic']='',

Assets/Lua/Core/Constant.lua

@@ -11,6 +11,8 @@ local Constant = {
 
     OpenSystemLink = false,
     OpenSdkGameStartNtf = false,
+    OpenLanguageSetting = false,
+    LanguageNames = {'cn','en','vi','th'},
 
     HeroLeaderIcon = "FrameNew/label_main",
     HeroBattleIcon = "FrameNew/label_battling",

Assets/Lua/Core/LuaMain.lua

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

Assets/Lua/UI/UIMain/UIMainView.lua

@@ -208,7 +208,7 @@ function UIMainView:Init()
 	self:RefreshData()
 	self:RefreshBoliShopState()
 
-	if ManagerContainer.SDKEventReportMgr ~= nil then
+	if ManagerContainer.SDKEventReportMgr ~= nil and ManagerContainer.LuaBattleMgr:GetCurSimpleLvID() >= 20001 then
 		ManagerContainer.SDKEventReportMgr:GetSDKNtfAndShow()
 	end
   

Assets/Lua/UI/UISettings/UISettingsView.lua

@@ -32,6 +32,7 @@ function UISettingsView:Init()
 	self:RefreshMusic()
 	self:RefreshSound()
 	self:RefreshDeleteAcount()
+	self:InitLanguageSelect()
 end
 
 function UISettingsView:RemoveEventListener()
@@ -285,5 +286,24 @@ function UISettingsView:OnDeleteSuc()
 				ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UINoticeTips, data)
             end, nil)
 end
+
+
+function UISettingsView:InitLanguageSelect()
+	if not Constant.OpenLanguageSetting then
+		self.languageSetting:SetActive(false)
+		return
+	end
+	self.languageSetting:SetActive(true)
+	self.uiBase:AddDropdownEventListener(self.lgsDropdown.dropdown, function (dropdown, value)
+		LogError("lgs dropdown value = "..value)
+	end)
+	self.lgsDropdown.dropdown.value = 0
+	DropDownHelper.ClearDropDown(self.lgsDropdown.dropdown);
+	DropDownHelper.SetStartName(self.lgsDropdown.dropdown, I18N.T('lgn_'..Constant.LanguageNames[1]))
+	for i = 1, #Constant.LanguageNames do
+		DropDownHelper.SetDropDownItems(self.lgsDropdown.dropdown, I18N.T('lgn_'..Constant.LanguageNames[i]));
+	end
+end
+
 return UISettingsView
 

Assets/Lua/UI/UISettings/UISettingsView_Generate.lua

@@ -2,6 +2,14 @@
 ---@field public gameObject UnityEngine.GameObject
 ---@field public text UnityEngine.UI.Text
 
+---@class UISettings__Generate_lgsDropdown
+---@field public gameObject UnityEngine.GameObject
+---@field public dropdown UnityEngine.UI.Dropdown
+
+---@class UISettings__Generate_languageSelectTxt
+---@field public gameObject UnityEngine.GameObject
+---@field public text UnityEngine.UI.Text
+
 ---@class UISettings__Generate_sound_toggle
 ---@field public gameObject UnityEngine.GameObject
 ---@field public toggle UnityEngine.UI.Toggle
@@ -81,6 +89,9 @@
 ---@field private deleteTimeTxt UISettings__Generate_deleteTimeTxt
 ---@field private music UISettings__Generate_music
 ---@field private sound UISettings__Generate_sound
+---@field private languageSetting UnityEngine.GameObject
+---@field private languageSelectTxt UISettings__Generate_languageSelectTxt
+---@field private lgsDropdown UISettings__Generate_lgsDropdown
 ---@field private verText UISettings__Generate_verText
 local UISettingsView = class("UISettingsView", require("UIViewBase"))
 
@@ -121,6 +132,9 @@ function UISettingsView:InitGenerate(Root, data)
 	self:InitGenerate__18(Root,data)
 	self:InitGenerate__19(Root,data)
 	self:InitGenerate__20(Root,data)
+	self:InitGenerate__21(Root,data)
+	self:InitGenerate__22(Root,data)
+	self:InitGenerate__23(Root,data)
 
 
 end
@@ -377,6 +391,46 @@ end
 
 ---@private
 function UISettingsView:InitGenerate__20(Root, data)
+--[[
+	UIAnimator/Window/Bg/LanguageSetting
+--]]
+	local tmp = Root:Find("UIAnimator/Window/Bg/LanguageSetting").gameObject
+	if tolua.getpeer(tmp) == nil then
+		tolua.setpeer(tmp, {})
+	end
+	self.languageSetting = tmp
+end
+
+---@private
+function UISettingsView:InitGenerate__21(Root, data)
+--[[
+	UIAnimator/Window/Bg/LanguageSetting/languageSelectTxt
+--]]
+	local tmp = Root:Find("UIAnimator/Window/Bg/LanguageSetting/languageSelectTxt").gameObject
+	if tolua.getpeer(tmp) == nil then
+		tolua.setpeer(tmp, {})
+	end
+	self.languageSelectTxt = tmp
+
+	tmp.text = tmp:GetComponent(Enum.TypeInfo.Text)
+end
+
+---@private
+function UISettingsView:InitGenerate__22(Root, data)
+--[[
+	UIAnimator/Window/Bg/LanguageSetting/LgsDropdown
+--]]
+	local tmp = Root:Find("UIAnimator/Window/Bg/LanguageSetting/LgsDropdown").gameObject
+	if tolua.getpeer(tmp) == nil then
+		tolua.setpeer(tmp, {})
+	end
+	self.lgsDropdown = tmp
+
+	tmp.dropdown = tmp:GetComponent(Enum.TypeInfo.Dropdown)
+end
+
+---@private
+function UISettingsView:InitGenerate__23(Root, data)
 --[[
 	UIAnimator/Window/Bg/VerBox/VerText
 --]]
@@ -459,6 +513,18 @@ function UISettingsView:GenerateDestroy()
 		tolua.setpeer(self.sound, nil)
 	end
 	self.sound = nil
+	if tolua.getpeer(self.languageSetting) ~= nil then
+		tolua.setpeer(self.languageSetting, nil)
+	end
+	self.languageSetting = nil
+	if tolua.getpeer(self.languageSelectTxt) ~= nil then
+		tolua.setpeer(self.languageSelectTxt, nil)
+	end
+	self.languageSelectTxt = nil
+	if tolua.getpeer(self.lgsDropdown) ~= nil then
+		tolua.setpeer(self.lgsDropdown, nil)
+	end
+	self.lgsDropdown = nil
 	if tolua.getpeer(self.verText) ~= nil then
 		tolua.setpeer(self.verText, nil)
 	end

Assets/Src/Core/DownLoad/DownloadMgr.cs

@@ -184,7 +184,7 @@ public class DownloadMgr : Singleton<DownloadMgr>
             downloadUrl = GetDownloadUrl();
 
 
-            downloadTaskMaxNum = 5;
+            downloadTaskMaxNum = 1;
             localFilePath = GetLocalResPath();//FileSystem.LocalDocumentPath;
 
 #if UNITY_IOS

Assets/Src/GameLogic/LaunchLoadMgr.cs

@@ -165,14 +165,15 @@ public class LaunchLoadMgr
 
     private IEnumerator CheckResUpdate()
     {
+        DownloadMgr Dmgr = DownloadMgr.Instance;
         m_LoadingRootGo.SetActive(true);
-        DownloadMgr.Instance.CheckVersion();
+        Dmgr.CheckVersion();
         SetLoadDes("CheckRes");
         SetLoadPrecent(0);
         int pre = 0;
         yield return new WaitUntil(() =>
         {
-            if (!DownloadMgr.Instance.CheckFinish)
+            if (!Dmgr.CheckFinish)
             {
                 pre += 10;
                 if (pre >= 100)
@@ -185,22 +186,22 @@ public class LaunchLoadMgr
                 pre = 100;
             }
             SetLoadPrecent(pre);
-            return DownloadMgr.Instance.CheckFinish;
+            return Dmgr.CheckFinish;
         });
 
 
-        if (DownloadMgr.Instance.CheckNeedDownload())
+        if (Dmgr.CheckNeedDownload())
         {
             SetLoadDes("DownloadRes");
             SetLoadPrecent(0);
             yield return new WaitUntil(() =>
             {
-                bool isFinish = DownloadMgr.Instance.DownLoadFinish();
+                bool isFinish = Dmgr.DownLoadFinish();
                 if (isFinish)
                 {
 
                     //#if UNITY_IOS
-                    if (DownloadMgr.Instance.DowmloadError)
+                    if (Dmgr.DowmloadError)
                     {
                         isFinish = false;
                         SetLoadDes("GameLogin20");
@@ -213,16 +214,28 @@ public class LaunchLoadMgr
                 }
                 else
                 {
-                    float dsize = DownloadMgr.Instance.DownloadSize;
-                    float tsize = DownloadMgr.Instance.TotalSize;
+                    float dsize = Dmgr.DownloadSize;
+                    float tsize = Dmgr.TotalSize;
                     float press = (dsize / tsize) * 100;
                     SetLoadPrecent((int)press);
+                    if (Dmgr.DownloadTaskMaxNum == 1)
+                    {
+                        string tstr = (tsize / (1024 * 1024)).ToString("f2");
+                        string dstr = (dsize / (1024 * 1024)).ToString("f2");
+
+                        string str = I18N.T("DownloadResSize");
+                        if (str == "DownloadResSize")
+                        {
+                            str = "资源下载：{0}m/{1}m";
+                        }
+                        SetLoadDes(string.Format(str, dstr, tstr));
+                    }                    
                 }
                     return isFinish;
             });
         }
         yield return new WaitForSeconds(1);
-        DownloadMgr.Instance.Free();
+        Dmgr.Free();
         OnEndDownload();
     }