upgrade

2021-04-02 07:25:30 +08:00
parent bf55cc7e54
commit 5a43e0d172
20 changed files with 1627 additions and 1107 deletions
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewOrder.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewOrder.prefab
@@ -63,13 +63,13 @@ MonoBehaviour:
  updateAnchors: 1
  mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1}
  mPivot: 3
-  mWidth: 230
+  mWidth: 554
  mHeight: 46
  mDepth: 5
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 5
+  aspectRatio: 12.043478
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -83,7 +83,7 @@ MonoBehaviour:
  mEffectColor: {r: 0, g: 0, b: 0, a: 1}
  mSymbols: 1
  mEffectDistance: {x: 1, y: 1}
-  mOverflow: 2
+  mOverflow: 0
  mMaterial: {fileID: 0}
  mApplyGradient: 0
  mGradientTop: {r: 1, g: 1, b: 1, a: 1}
@@ -506,7 +506,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 751446475674479924}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 461, y: 103, z: 0}
+  m_LocalPosition: {x: 461, y: 90, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 1249610349479200778}
@@ -572,13 +572,13 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  leftAnchor:
-    target: {fileID: 0}
-    relative: 0
-    absolute: 0
-  rightAnchor:
-    target: {fileID: 0}
+    target: {fileID: 9060292173203855846}
    relative: 1
-    absolute: 0
+    absolute: -69
+  rightAnchor:
+    target: {fileID: 9060292173203855846}
+    relative: 1
+    absolute: -33
  bottomAnchor:
    target: {fileID: 0}
    relative: 0
@@ -638,7 +638,7 @@ GameObject:
  - component: {fileID: 9141256182201856122}
  - component: {fileID: 6496410008280496209}
  m_Layer: 5
-  m_Name: LabelEndDate
+  m_Name: LabelStartDate
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
@@ -696,7 +696,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 59
+  aspectRatio: 5.9
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -740,7 +740,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  jsonKey: validEndTime
+  jsonKey: validStartTime
  formatValue: 
  labeName: {fileID: 0}
  defaultName: 
@@ -852,106 +852,6 @@ MonoBehaviour:
  isAppendEndingString: 0
  AppendString: '...'
  fontName: EmptyFont
--- !u!1 &1246448268994330712
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 5492273475069516787}
-  - component: {fileID: 2404477135426433860}
-  m_Layer: 5
-  m_Name: Label
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!4 &5492273475069516787
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1246448268994330712}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 89, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 1930179077374056429}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &2404477135426433860
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1246448268994330712}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  leftAnchor:
-    target: {fileID: 9060292173203855846}
-    relative: 1
-    absolute: -199
-  rightAnchor:
-    target: {fileID: 9060292173203855846}
-    relative: 1
-    absolute: -115
-  bottomAnchor:
-    target: {fileID: 0}
-    relative: 0
-    absolute: 0
-  topAnchor:
-    target: {fileID: 0}
-    relative: 1
-    absolute: 0
-  updateAnchors: 0
-  mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
-  mPivot: 4
-  mWidth: 84
-  mHeight: 42
-  mDepth: 7
-  autoResizeBoxCollider: 0
-  hideIfOffScreen: 0
-  keepAspectRatio: 0
-  aspectRatio: 2
-  keepCrispWhenShrunk: 1
-  mTrueTypeFont: {fileID: 0}
-  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
-  mText: "\u64CD\u4F5C"
-  mFontSize: 42
-  mFontStyle: 0
-  mAlignment: 0
-  mEncoding: 1
-  mMaxLineCount: 0
-  mEffectStyle: 0
-  mEffectColor: {r: 0, g: 0, b: 0, a: 1}
-  mSymbols: 1
-  mEffectDistance: {x: 1, y: 1}
-  mOverflow: 2
-  mMaterial: {fileID: 0}
-  mApplyGradient: 0
-  mGradientTop: {r: 1, g: 1, b: 1, a: 1}
-  mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1}
-  mSpacingX: 0
-  mSpacingY: 0
-  mUseFloatSpacing: 0
-  mFloatSpacingX: 0
-  mFloatSpacingY: 0
-  mShrinkToFit: 0
-  mMaxLineWidth: 0
-  mMaxLineHeight: 0
-  mLineWidth: 0
-  mMultiline: 1
-  isAppendEndingString: 0
-  AppendString: '...'
-  fontName: EmptyFont
 --- !u!1 &1248641904593754930
 GameObject:
  m_ObjectHideFlags: 0
@@ -1532,12 +1432,12 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  leftAnchor:
-    target: {fileID: 9060292173203855846}
+    target: {fileID: 0}
    relative: 0
    absolute: 221
  rightAnchor:
-    target: {fileID: 9060292173203855846}
-    relative: 0
+    target: {fileID: 0}
+    relative: 1
    absolute: 421
  bottomAnchor:
    target: {fileID: 0}
@@ -1612,6 +1512,132 @@ MonoBehaviour:
  valueIsNumber: 0
  isPhoneNum: 0
  inValidColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
+--- !u!1 &1990698820342002041
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2888083522769207224}
+  - component: {fileID: 1223225304729576048}
+  - component: {fileID: 320162446630990277}
+  m_Layer: 5
+  m_Name: LabelEndDate
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2888083522769207224
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1990698820342002041}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 383, y: -89, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 4279089093416336491}
+  m_Father: {fileID: 1249610349479200778}
+  m_RootOrder: 8
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1223225304729576048
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1990698820342002041}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 9060292173203855846}
+    relative: 1
+    absolute: -247
+  rightAnchor:
+    target: {fileID: 9060292173203855846}
+    relative: 1
+    absolute: -11
+  bottomAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  topAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  updateAnchors: 0
+  mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1}
+  mPivot: 4
+  mWidth: 236
+  mHeight: 40
+  mDepth: 7
+  autoResizeBoxCollider: 0
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 5.9
+  keepCrispWhenShrunk: 1
+  mTrueTypeFont: {fileID: 0}
+  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
+  mText: 2020-12-12
+  mFontSize: 40
+  mFontStyle: 0
+  mAlignment: 0
+  mEncoding: 1
+  mMaxLineCount: 0
+  mEffectStyle: 0
+  mEffectColor: {r: 0, g: 0, b: 0, a: 1}
+  mSymbols: 1
+  mEffectDistance: {x: 1, y: 1}
+  mOverflow: 3
+  mMaterial: {fileID: 0}
+  mApplyGradient: 0
+  mGradientTop: {r: 1, g: 1, b: 1, a: 1}
+  mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1}
+  mSpacingX: 0
+  mSpacingY: 0
+  mUseFloatSpacing: 0
+  mFloatSpacingX: 0
+  mFloatSpacingY: 0
+  mShrinkToFit: 0
+  mMaxLineWidth: 0
+  mMaxLineHeight: 0
+  mLineWidth: 0
+  mMultiline: 1
+  isAppendEndingString: 0
+  AppendString: '...'
+  fontName: EmptyFont
+--- !u!114 &320162446630990277
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1990698820342002041}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  jsonKey: validEndTime
+  formatValue: 
+  labeName: {fileID: 0}
+  defaultName: 
+  canNull: 0
+  checkIDCard: 0
+  minLen: 0
+  maxLen: 0
+  spriteBg: {fileID: 0}
+  valueIsNumber: 0
+  isPhoneNum: 0
+  inValidColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
 --- !u!1 &2098083998297282035
 GameObject:
  m_ObjectHideFlags: 0
@@ -2042,12 +2068,12 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  leftAnchor:
-    target: {fileID: 9060292173203855846}
+    target: {fileID: 0}
    relative: 0
    absolute: 253
  rightAnchor:
-    target: {fileID: 9060292173203855846}
-    relative: 0
+    target: {fileID: 0}
+    relative: 1
    absolute: 379
  bottomAnchor:
    target: {fileID: 0}
@@ -2139,6 +2165,7 @@ Transform:
  - {fileID: 1930179077374056429}
  - {fileID: 6638322929124924262}
  - {fileID: 4537950500870522849}
+  - {fileID: 2888083522769207224}
  m_Father: {fileID: 6735670843721406284}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -3258,13 +3285,13 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  leftAnchor:
-    target: {fileID: 0}
+    target: {fileID: 9060292173203855846}
    relative: 0
-    absolute: 169
+    absolute: 93
  rightAnchor:
-    target: {fileID: 0}
-    relative: 1
-    absolute: 253
+    target: {fileID: 9060292173203855846}
+    relative: 0
+    absolute: 119
  bottomAnchor:
    target: {fileID: 0}
    relative: 0
@@ -4079,11 +4106,10 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 5041018495098694811}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 355, y: -89, z: 0}
+  m_LocalPosition: {x: 317, y: 89, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 1070758113057642923}
-  - {fileID: 5492273475069516787}
  m_Father: {fileID: 1249610349479200778}
  m_RootOrder: 5
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -4149,11 +4175,11 @@ MonoBehaviour:
  leftAnchor:
    target: {fileID: 9060292173203855846}
    relative: 1
-    absolute: -257
+    absolute: -270
  rightAnchor:
    target: {fileID: 9060292173203855846}
    relative: 1
-    absolute: -57
+    absolute: -120
  bottomAnchor:
    target: {fileID: 0}
    relative: 0
@@ -4165,13 +4191,13 @@ MonoBehaviour:
  updateAnchors: 0
  mColor: {r: 0.94509804, g: 0.3529412, b: 0.2901961, a: 1}
  mPivot: 4
-  mWidth: 200
+  mWidth: 150
  mHeight: 80
  mDepth: 8
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 2.5
+  aspectRatio: 0.225
  mType: 1
  mFillDirection: 4
  mFillAmount: 1
@@ -5179,6 +5205,106 @@ MonoBehaviour:
  isAppendEndingString: 0
  AppendString: '...'
  fontName: EmptyFont
+--- !u!1 &6583210618890519892
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4279089093416336491}
+  - component: {fileID: 7361214436018673203}
+  m_Layer: 5
+  m_Name: Label
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4279089093416336491
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6583210618890519892}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 89, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 2888083522769207224}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &7361214436018673203
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6583210618890519892}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 169
+  rightAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 253
+  bottomAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  topAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  updateAnchors: 0
+  mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
+  mPivot: 4
+  mWidth: 168
+  mHeight: 42
+  mDepth: 7
+  autoResizeBoxCollider: 0
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 4
+  keepCrispWhenShrunk: 1
+  mTrueTypeFont: {fileID: 0}
+  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
+  mText: "\u5230\u671F\u65E5\u671F"
+  mFontSize: 42
+  mFontStyle: 0
+  mAlignment: 0
+  mEncoding: 1
+  mMaxLineCount: 0
+  mEffectStyle: 0
+  mEffectColor: {r: 0, g: 0, b: 0, a: 1}
+  mSymbols: 1
+  mEffectDistance: {x: 1, y: 1}
+  mOverflow: 2
+  mMaterial: {fileID: 0}
+  mApplyGradient: 0
+  mGradientTop: {r: 1, g: 1, b: 1, a: 1}
+  mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1}
+  mSpacingX: 0
+  mSpacingY: 0
+  mUseFloatSpacing: 0
+  mFloatSpacingX: 0
+  mFloatSpacingY: 0
+  mShrinkToFit: 0
+  mMaxLineWidth: 0
+  mMaxLineHeight: 0
+  mLineWidth: 0
+  mMultiline: 1
+  isAppendEndingString: 0
+  AppendString: '...'
+  fontName: EmptyFont
 --- !u!1 &6725638605002920449
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOrderDetail.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOrderDetail.prefab