From f1ab44822a15cfd9c82f4bd06cb70558cc0bcc07 Mon Sep 17 00:00:00 2001
From: cehua-HWJ35 <hwj35@163.com>
Date: 星期三, 03 四月 2024 16:09:50 +0800
Subject: [PATCH] Merge branch 'hyyngame' of http://192.168.1.20:10010/r/snxxz_client into hyyngame
---
Assets/Editor/XCodeProjectMod.cs | 2 +-
Assets/Launch/windows/LaunchExWin.cs | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Assets/Editor/XCodeProjectMod.cs b/Assets/Editor/XCodeProjectMod.cs
index a743099..a1f0bbc 100644
--- a/Assets/Editor/XCodeProjectMod.cs
+++ b/Assets/Editor/XCodeProjectMod.cs
@@ -92,7 +92,7 @@
_rootDict.SetString("NSPhotoLibraryAddUsageDescription", "B岷 ph岷 c岷 quy峄乶 cho album 岷h, 膽峄� ch峄 岷h m脿n h矛nh v脿 l瓢u d峄� cho ng瓢峄漣 d霉ng");
_rootDict.SetString("NSCameraUsageDescription", "H茫y cho ph茅p quy峄乶 峄﹏g d霉ng 膽峄� truy c岷璸,n岷縰 kh么ng th矛 ch峄ヽ n膬ng s岷� kh么ng kh峄焛 膽峄檔g 膽瓢峄");
//姝ゆ爣璇嗙灏嗙敤浜庡悜鎮ㄦ帹鑽愪釜鎬у寲骞垮憡
- _rootDict.SetString("NSUserTrackingUsageDescription", "H瓢峄沶g d岷玭 n脿y s岷� xu岷 hi峄噉 gu岷g c谩o c贸 c谩 t铆nh c峄 ri锚ng b岷");
+ _rootDict.SetString("NSUserTrackingUsageDescription", "H瓢峄沶g d岷玭 n脿y s岷� xu岷 hi峄噉 qu岷g c谩o c贸 c谩 t铆nh c峄 ri锚ng b岷");
//AF
_rootDict.SetString("AFAppleId", "6476482827");
diff --git a/Assets/Launch/windows/LaunchExWin.cs b/Assets/Launch/windows/LaunchExWin.cs
index 6cf5334..ee92082 100644
--- a/Assets/Launch/windows/LaunchExWin.cs
+++ b/Assets/Launch/windows/LaunchExWin.cs
@@ -42,8 +42,6 @@
private void OnEnable()
{
- m_Version.text = StringUtility.Contact(VersionConfigEx.Get().version, "_", VersionConfigEx.Get().buildIndex, ResourcesModel.Id);
-
if (m_NetworkContainer != null)
{
m_NetworkContainer.gameObject.SetActive(false);
@@ -57,11 +55,13 @@
{
m_AndroidProgressContainer.gameObject.SetActive(false);
m_IosProgressContainer.gameObject.SetActive(true);
+ m_Version.text = string.Empty;
}
else
{
m_AndroidProgressContainer.gameObject.SetActive(true);
m_IosProgressContainer.gameObject.SetActive(false);
+ m_Version.text = StringUtility.Contact(VersionConfigEx.Get().version, "_", VersionConfigEx.Get().buildIndex, ResourcesModel.Id);
}
--
Gitblit v1.8.0