From 9ff9f48c63ba94ec25d3ba698aef7c5429f639e4 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期四, 20 九月 2018 16:54:53 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_client
---
Assets/Resources/UI/Prefabs/VersionUpdateWin.prefab | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Assets/Resources/UI/Prefabs/VersionUpdateWin.prefab b/Assets/Resources/UI/Prefabs/VersionUpdateWin.prefab
index 732b2eb..0b08ce1 100644
--- a/Assets/Resources/UI/Prefabs/VersionUpdateWin.prefab
+++ b/Assets/Resources/UI/Prefabs/VersionUpdateWin.prefab
@@ -505,7 +505,7 @@
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
- m_Font: {fileID: 12800000, guid: a2da6f2c6e6a12948841e6822d8dc8dc, type: 3}
+ m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
@@ -561,7 +561,6 @@
m_ContainerHint: {fileID: 224741050502191776}
m_Content: {fileID: 114377505950779510}
m_Confirm: {fileID: 114734808994317816}
- m_Cancel: {fileID: 0}
m_ContainerProgress: {fileID: 224080366820109920}
m_ProgressSlider: {fileID: 114455964283363334}
m_Progress: {fileID: 114747068201865994}
@@ -586,7 +585,7 @@
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
- m_Font: {fileID: 12800000, guid: a2da6f2c6e6a12948841e6822d8dc8dc, type: 3}
+ m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 22
m_FontStyle: 0
m_BestFit: 0
@@ -605,7 +604,8 @@
m_faceSize: 32
m_unline: 1
m_HrefClick: 0
- m_TextAsset: {fileID: 0}
+ m_EnableDisplay:
+ m_Language: 0
m_AutoNewLine: 0
m_LockImgSize: 0
m_ModifyImgSize: 0
@@ -778,7 +778,7 @@
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
- m_Font: {fileID: 12800000, guid: a2da6f2c6e6a12948841e6822d8dc8dc, type: 3}
+ m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 22
m_FontStyle: 0
m_BestFit: 0
@@ -811,7 +811,7 @@
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
- m_Font: {fileID: 12800000, guid: a2da6f2c6e6a12948841e6822d8dc8dc, type: 3}
+ m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 22
m_FontStyle: 0
m_BestFit: 0
--
Gitblit v1.8.0