Merge branch 'china/local' into china/test
commit
3fb8ba2334
|
|
@ -1048,7 +1048,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 170}
|
||||
m_SizeDelta: {x: 0, y: 90}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5350368570713940310
|
||||
CanvasRenderer:
|
||||
|
|
@ -1318,7 +1318,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 170}
|
||||
m_SizeDelta: {x: 0, y: 90}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1845886911478177509
|
||||
CanvasRenderer:
|
||||
|
|
@ -2108,7 +2108,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 170}
|
||||
m_SizeDelta: {x: 0, y: 90}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8738210985427038121
|
||||
CanvasRenderer:
|
||||
|
|
@ -2230,7 +2230,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 170}
|
||||
m_SizeDelta: {x: 0, y: 90}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &278730815618771922
|
||||
CanvasRenderer:
|
||||
|
|
@ -2426,7 +2426,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 170}
|
||||
m_SizeDelta: {x: 0, y: 90}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5163823925775907519
|
||||
CanvasRenderer:
|
||||
|
|
@ -2919,8 +2919,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 877.5, y: 0}
|
||||
m_SizeDelta: {x: 135, y: 170}
|
||||
m_AnchoredPosition: {x: 877.5, y: -39.6}
|
||||
m_SizeDelta: {x: 135, y: 90}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7042496047279250599
|
||||
CanvasRenderer:
|
||||
|
|
@ -3783,7 +3783,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 170}
|
||||
m_SizeDelta: {x: 0, y: 90}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6060723747781559980
|
||||
CanvasRenderer:
|
||||
|
|
@ -3904,7 +3904,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 170}
|
||||
m_SizeDelta: {x: 0, y: 90}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3937947005754332091
|
||||
CanvasRenderer:
|
||||
|
|
|
|||
|
|
@ -113,7 +113,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 91, y: -71.5}
|
||||
m_AnchoredPosition: {x: 45, y: -71.5}
|
||||
m_SizeDelta: {x: 64.04, y: 57.1}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!222 &1926325275717871179
|
||||
|
|
@ -626,7 +626,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 72.66498, y: -71.4999}
|
||||
m_AnchoredPosition: {x: 26.664978, y: -71.4999}
|
||||
m_SizeDelta: {x: 55.53, y: 48.41}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5262296256222781431
|
||||
|
|
|
|||
|
|
@ -761,7 +761,7 @@ namespace GameEditor.FrameTool
|
|||
_scp = EditorGUILayout.BeginScrollView(_scp);
|
||||
foreach(ResourceFile rf in diffList)
|
||||
{
|
||||
EditorGUILayout.LabelField(rf.fileName+"|"+(rf.size / 1048576)+"M");
|
||||
EditorGUILayout.LabelField(rf.fileName+"|"+(rf.size / 1048576f).ToString("0.00") + "M");
|
||||
}
|
||||
EditorGUILayout.LabelField("files.unity3d");
|
||||
EditorGUILayout.LabelField(AppConst.GameConfigFile);
|
||||
|
|
|
|||
Loading…
Reference in New Issue