up

2020-07-10 13:22:24 +08:00
parent 8c154e38ba
commit 9549990b66
108 changed files with 5668 additions and 888 deletions
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewCust.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewCust.prefab
@@ -168,7 +168,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 3
+  aspectRatio: 2
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -942,7 +942,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 0.5217391
+  aspectRatio: 0.47826087
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -1618,7 +1618,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 0.05
+  aspectRatio: 0.7
  mType: 0
  mFillDirection: 4
  mFillAmount: 1
@@ -1831,7 +1831,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 0.7208158
+  aspectRatio: 512.5
  mType: 1
  mFillDirection: 4
  mFillAmount: 1
@@ -1885,7 +1885,7 @@ Transform:
  - {fileID: 3207085431439772024}
  - {fileID: 2471581978110294420}
  m_Father: {fileID: 3390144541938402065}
-  m_RootOrder: 4
+  m_RootOrder: 5
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &2560390054752067826
 BoxCollider:
@@ -2304,7 +2304,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 0.5217391
+  aspectRatio: 0.47826087
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -2417,7 +2417,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 1.0800843
+  aspectRatio: 512.5
  mType: 1
  mFillDirection: 4
  mFillAmount: 1
@@ -2501,7 +2501,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 17.695652
+  aspectRatio: 16.717392
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -2757,7 +2757,7 @@ Transform:
  - {fileID: 789262735275859317}
  - {fileID: 4628537950900338942}
  m_Father: {fileID: 3390144541938402065}
-  m_RootOrder: 2
+  m_RootOrder: 3
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &6751297851416776549
 BoxCollider:
@@ -2876,7 +2876,7 @@ MonoBehaviour:
  formatValue: 
  labeName: {fileID: 5263322817775662806}
  defaultName: 
-  canNull: 0
+  canNull: 1
  checkIDCard: 0
  minLen: 0
  maxLen: 0
@@ -3566,7 +3566,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 0.5217391
+  aspectRatio: 0.47826087
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -3977,7 +3977,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 0.05
+  aspectRatio: 0.7
  mType: 0
  mFillDirection: 4
  mFillAmount: 1
@@ -4482,7 +4482,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 3.2232704
+  aspectRatio: 512.5
  mType: 1
  mFillDirection: 4
  mFillAmount: 1
@@ -4666,7 +4666,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 0.9267631
+  aspectRatio: 512.5
  mType: 1
  mFillDirection: 4
  mFillAmount: 1
@@ -4751,7 +4751,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 0.5217391
+  aspectRatio: 0.47826087
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -4976,7 +4976,7 @@ Transform:
  - {fileID: 3482620844373148757}
  - {fileID: 5672377779080983542}
  m_Father: {fileID: 3390144541938402065}
-  m_RootOrder: 3
+  m_RootOrder: 4
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &4254620512524785935
 BoxCollider:
@@ -5240,7 +5240,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 0.8115598
+  aspectRatio: 512.5
  mType: 1
  mFillDirection: 4
  mFillAmount: 1
@@ -5325,7 +5325,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 0.5217391
+  aspectRatio: 0.47826087
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -5439,7 +5439,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 0.5217391
+  aspectRatio: 0.47826087
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -5552,7 +5552,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 3
+  aspectRatio: 2
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -5652,7 +5652,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 1.2958281
+  aspectRatio: 512.5
  mType: 1
  mFillDirection: 4
  mFillAmount: 1
@@ -5708,7 +5708,7 @@ Transform:
  - {fileID: 4071704006312063869}
  - {fileID: 3876318381393807578}
  m_Father: {fileID: 3390144541938402065}
-  m_RootOrder: 5
+  m_RootOrder: 2
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &4438659352412322114
 BoxCollider:
@@ -6072,7 +6072,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 6.40625
+  aspectRatio: 512.5
  mType: 1
  mFillDirection: 4
  mFillAmount: 1
@@ -6257,7 +6257,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 0.5217391
+  aspectRatio: 0.47826087
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -6370,7 +6370,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 2
+  aspectRatio: 16.717392
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -6470,7 +6470,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 1.6192733
+  aspectRatio: 512.5
  mType: 1
  mFillDirection: 4
  mFillAmount: 1
@@ -6518,10 +6518,10 @@ Transform:
  m_Children:
  - {fileID: 1947286080708650753}
  - {fileID: 3531660715606027067}
+  - {fileID: 1949725440338219509}
  - {fileID: 2446954691429548344}
  - {fileID: 2264218936273892500}
  - {fileID: 2477535387824468061}
-  - {fileID: 1949725440338219509}
  - {fileID: 3677179600730480648}
  - {fileID: 8621140261478235053}
  - {fileID: 691154718777512327}
@@ -7575,7 +7575,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 0.05
+  aspectRatio: 0.7
  mType: 0
  mFillDirection: 4
  mFillAmount: 1
@@ -7659,7 +7659,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 2
+  aspectRatio: 16.717392
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -8156,7 +8156,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 3
+  aspectRatio: 2
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -8256,7 +8256,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 2.1578948
+  aspectRatio: 512.5
  mType: 1
  mFillDirection: 4
  mFillAmount: 1
@@ -8340,7 +8340,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 3
+  aspectRatio: 2
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -8440,7 +8440,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 0.05
+  aspectRatio: 0.7
  mType: 0
  mFillDirection: 4
  mFillAmount: 1
@@ -8606,7 +8606,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 2
+  aspectRatio: 16.717392
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -9031,7 +9031,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 0.5217391
+  aspectRatio: 0.47826087
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -9243,7 +9243,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 0.5217391
+  aspectRatio: 0.47826087
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -9356,7 +9356,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 0.05
+  aspectRatio: 0.7
  mType: 0
  mFillDirection: 4
  mFillAmount: 1
@@ -9441,7 +9441,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 0.5217391
+  aspectRatio: 0.47826087
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}