Merge branch 'master' into dev_2020

* master: bug fix # Conflicts: # Assets/3rd/AndroidOpener/Plugins/release.aar
2020-08-18 10:07:04 +08:00
parent 0b577c501c 141ff4f4db
commit 9b3c793dda
13 changed files with 45 additions and 45 deletions
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelGuid.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelGuid.prefab
@@ -485,7 +485,7 @@ MonoBehaviour:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 2300498574672545280}
-  m_Enabled: 0
+  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: 40cac2ee22ec241d393cdeb505a161cd, type: 3}
  m_Name: 
@@ -504,7 +504,7 @@ MonoBehaviour:
  oldParentClipOffset: {x: 0, y: 0}
  isLimitless: 0
  isReverse: 0
-  dragSensitivity: 3
+  dragSensitivity: 10
  page1: {fileID: 8203674786200340029}
  page2: {fileID: 3901995379544073836}
  page3: {fileID: 6126386713007076957}