Skip to content

Commit ac9ec0e

Browse files
sheenlisheenli
committed
修复一个适配问题
1 parent 51e3a37 commit ac9ec0e

File tree

9 files changed

+1095
-3
lines changed

9 files changed

+1095
-3
lines changed

‎.idea/.idea.U3dFrameworkTolua/.idea/contentModel.xml

Lines changed: 707 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/.idea.U3dFrameworkTolua/.idea/indexLayout.xml

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/.idea.U3dFrameworkTolua/.idea/modules.xml

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/.idea.U3dFrameworkTolua/.idea/vcs.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/.idea.U3dFrameworkTolua/.idea/workspace.xml

Lines changed: 356 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/.idea.U3dFrameworkTolua/riderModule.iml

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/YKFramwork/Editor/BuildGameCfg/ABCfg/GameCfg.asset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
--- !u!114 &11400000
44
MonoBehaviour:
55
m_ObjectHideFlags: 0
6-
m_PrefabParentObject: {fileID: 0}
6+
m_CorrespondingSourceObject: {fileID: 0}
77
m_PrefabInternal: {fileID: 0}
88
m_GameObject: {fileID: 0}
99
m_Enabled: 1

‎Assets/YKFramwork/Editor/BuildGameCfg/Collections/Test.asset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
--- !u!114 &11400000
44
MonoBehaviour:
55
m_ObjectHideFlags: 0
6-
m_PrefabParentObject: {fileID: 0}
6+
m_CorrespondingSourceObject: {fileID: 0}
77
m_PrefabInternal: {fileID: 0}
88
m_GameObject: {fileID: 0}
99
m_Enabled: 1

‎Assets/YKFramwork/Script/Core/UIMgr/BaseUI.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ protected override void OnInit()
7777
{
7878
Debug.LogError("创建物体失败");
7979
}
80-
this.contentPane.SetSize(GRoot.inst.width, GRoot.inst.height);
80+
this.SetSize(GRoot.inst.width, GRoot.inst.height);
8181

8282

8383
var obj = this.contentPane.GetChild(BlackBgName);

0 commit comments

Comments
 (0)