snxxz_client.git

parent: ad8c872d | 补丁 | 提交 | ignore whitespace

client_Wu Xijin

2018-09-20 eca98ac7da1b84ffb71f868a0b86beb2d9159e35

3335 修改ui资源打包机制

2个文件已删除

4个文件已修改

	Assets/Resources/Font/方正准圆简体.ttf	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Assets/Resources/Font/方正准圆简体.ttf.meta	21 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Assets/Resources/UI/Prefabs/DownLoadWin.prefab	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Assets/Resources/UI/Prefabs/FirstScreenWin.prefab	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Assets/Resources/UI/Prefabs/LaunchWin.prefab	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Assets/Resources/UI/Prefabs/VersionUpdateWin.prefab	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 Assets/Resources/Font/方正准圆简体.ttf

Binary files differ

 Assets/Resources/Font/方正准圆简体.ttf.meta

File was deleted

 Assets/Resources/UI/Prefabs/DownLoadWin.prefab

@@ -741,7 +741,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
@@ -920,7 +920,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
@@ -1022,7 +1022,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
@@ -1103,7 +1103,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
@@ -1138,7 +1138,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

 Assets/Resources/UI/Prefabs/FirstScreenWin.prefab

@@ -99,7 +99,7 @@
      m_Calls: []
    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
  m_Sprite: {fileID: 0}
  m_Type: 1
  m_PreserveAspect: 0
  m_FillCenter: 1
@@ -126,7 +126,7 @@
      m_Calls: []
    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
  m_Sprite: {fileID: 21300000, guid: a866c788c47264842a202ea8a8938e22, type: 3}
  m_Sprite: {fileID: 0}
  m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1

 Assets/Resources/UI/Prefabs/LaunchWin.prefab

@@ -218,7 +218,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: 24
    m_FontStyle: 0
    m_BestFit: 0
@@ -265,7 +265,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: 24
    m_FontStyle: 0
    m_BestFit: 0
@@ -346,7 +346,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: 28
    m_FontStyle: 0
    m_BestFit: 0

 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

			@@ -741,7 +741,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
			@@ -920,7 +920,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
			@@ -1022,7 +1022,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
			@@ -1103,7 +1103,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
			@@ -1138,7 +1138,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

			@@ -99,7 +99,7 @@
			m_Calls: []
			m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
			Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
			m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
			m_Sprite: {fileID: 0}
			m_Type: 1
			m_PreserveAspect: 0
			m_FillCenter: 1
			@@ -126,7 +126,7 @@
			m_Calls: []
			m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
			Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
			m_Sprite: {fileID: 21300000, guid: a866c788c47264842a202ea8a8938e22, type: 3}
			m_Sprite: {fileID: 0}
			m_Type: 0
			m_PreserveAspect: 0
			m_FillCenter: 1

			@@ -218,7 +218,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: 24
			m_FontStyle: 0
			m_BestFit: 0
			@@ -265,7 +265,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: 24
			m_FontStyle: 0
			m_BestFit: 0
			@@ -346,7 +346,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: 28
			m_FontStyle: 0
			m_BestFit: 0

			@@ -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