This commit is contained in:
2020-08-03 23:05:29 +08:00
parent f3ecc018ff
commit 9e8c6f080f
64 changed files with 325 additions and 261 deletions

View File

@@ -1525,7 +1525,7 @@ GameObject:
m_Component:
- component: {fileID: 7559427025382814600}
- component: {fileID: 7559427025382814606}
- component: {fileID: 7874584721905653174}
- component: {fileID: 3722797921129174865}
m_Layer: 5
m_Name: PanelContent
m_TagString: Untagged
@@ -1594,7 +1594,7 @@ MonoBehaviour:
mDepth: 2
mSortingOrder: 0
mClipOffset: {x: -1, y: -918.79785}
--- !u!114 &7874584721905653174
--- !u!114 &3722797921129174865
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -1603,18 +1603,18 @@ MonoBehaviour:
m_GameObject: {fileID: 7559427025382814601}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e5c85efbbc1ec4b75939e6d7f077e68c, type: 3}
m_Script: {fileID: 11500000, guid: d81807633ea807d4c8e3fff7e10c6000, type: 3}
m_Name:
m_EditorClassIdentifier:
movement: 1
dragEffect: 2
restrictWithinPanel: 1
disableDragIfFits: 0
disableDragIfFits: 1
smoothDragStart: 1
iOSDragEmulation: 1
scrollWheelFactor: 0.25
momentumAmount: 35
dampenStrength: 9
dampenStrength: 5
horizontalScrollBar: {fileID: 0}
verticalScrollBar: {fileID: 0}
showScrollBars: 1
@@ -1623,8 +1623,6 @@ MonoBehaviour:
scale: {x: 0, y: 0, z: 0}
relativePositionOnReset: {x: 0, y: 0}
centerOnChild: {fileID: 0}
loopGrid: {fileID: 7651258732160335458}
thresholDelta: {x: 0, y: -100}
--- !u!1 &8441046789887697199
GameObject:
m_ObjectHideFlags: 0

View File

@@ -499,7 +499,7 @@ MonoBehaviour:
isPause: 0
luaPath: trCRM/upgradeRes/priority/lua/ui/panel/TRPSelectServer.lua
isNeedBackplate: 1
destroyWhenHide: 0
destroyWhenHide: 1
isNeedResetAtlase: 1
isNeedMask4Init: 0
isNeedMask4InitOnlyOnce: 1