add

2020-07-24 22:12:55 +08:00
parent 3f114a6fca
commit 67a1f974bf
117 changed files with 14258 additions and 2325 deletions
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelBindPhone.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelBindPhone.prefab
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelBindPhone.prefab.meta
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelBindPhone.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 1b01fd3676a0242699db1883c3e59430
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCalender.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCalender.prefab
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustFilter.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustFilter.prefab
@@ -1199,7 +1199,7 @@ GameObject:
  - component: {fileID: 5320277713193979054}
  - component: {fileID: 4128751237254219587}
  m_Layer: 5
-  m_Name: PanelCustFilter
+  m_Name: PanelComFilter
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
@@ -1282,7 +1282,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  isPause: 0
-  luaPath: trCRM/upgradeRes/priority/lua/ui/panel/TRPCustFilter.lua
+  luaPath: trCRM/upgradeRes/priority/lua/ui/panel/TRPComFilter.lua
  isNeedBackplate: 1
  destroyWhenHide: 0
  isNeedResetAtlase: 1
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustFilter.prefab.meta
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustFilter.prefab.meta
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustDetail.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustDetail.prefab
@@ -32,7 +32,7 @@ Transform:
  - {fileID: 1558906886}
  - {fileID: 6259538829113905718}
  m_Father: {fileID: 8246500317629248720}
-  m_RootOrder: 2
+  m_RootOrder: 3
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1177340838
 MonoBehaviour:
@@ -627,7 +627,7 @@ MonoBehaviour:
  mLabelList: []
  mBgBorder: 0
  eventReceiver: {fileID: 0}
-  functionName: OnSelectionChange
+  functionName: 
  textScale: 0
  font: {fileID: 0}
  textLabel: {fileID: 0}
@@ -1934,6 +1934,88 @@ MonoBehaviour:
  widget: {fileID: 4693393415201863677}
  offset: 0
  sizeAdjust: 1
+--- !u!1 &1073031199327224890
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4886666851593583502}
+  - component: {fileID: 5747540970113465753}
+  - component: {fileID: 4279901766477904402}
+  - component: {fileID: 5016285631500529963}
+  m_Layer: 5
+  m_Name: SysRoot
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!4 &4886666851593583502
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1073031199327224890}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -8838.999, y: -1777.6542, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 2426801971675280382}
+  m_Father: {fileID: 8246500317629248720}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &5747540970113465753
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1073031199327224890}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 66ca9c6e5cbd4544ab22016a27d817a4, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  columns: 1
+  direction: 0
+  sorting: 0
+  pivot: 1
+  cellAlignment: 1
+  hideInactive: 1
+  keepWithinPanel: 0
+  padding: {x: 0, y: -1}
+--- !u!114 &4279901766477904402
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1073031199327224890}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 16bd2beefa5ca4a3ba0753143d28e2d9, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  jsonKey: 
+--- !u!114 &5016285631500529963
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1073031199327224890}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 575f113ee96624a30ab2ca1af1303112, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  isPause: 0
+  luaPath: trCRM/upgradeRes/priority/lua/ui/cell/TRCellExtendFieldRoot.lua
+  isNeedResetAtlase: 1
 --- !u!1 &1134059653406025018
 GameObject:
  m_ObjectHideFlags: 0
@@ -4980,7 +5062,7 @@ Transform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 8246500317629248720}
-  m_RootOrder: 4
+  m_RootOrder: 5
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &4905231102126225637
 MonoBehaviour:
@@ -6963,6 +7045,90 @@ MonoBehaviour:
  widget: {fileID: 2403509267388899063}
  offset: 0
  sizeAdjust: 1
+--- !u!1 &4280625964581610458
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1960737176562699803}
+  - component: {fileID: 6862079706378699948}
+  m_Layer: 5
+  m_Name: Sprite
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1960737176562699803
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4280625964581610458}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -508, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 2426801971675280382}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &6862079706378699948
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4280625964581610458}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 2426801971675280382}
+    relative: 0
+    absolute: 50
+  rightAnchor:
+    target: {fileID: 2426801971675280382}
+    relative: 0
+    absolute: 58
+  bottomAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  topAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  updateAnchors: 0
+  mColor: {r: 0.16078432, g: 0.5647059, b: 0.8627451, a: 1}
+  mPivot: 4
+  mWidth: 8
+  mHeight: 50
+  mDepth: 2
+  autoResizeBoxCollider: 0
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 0.16
+  mType: 1
+  mFillDirection: 4
+  mFillAmount: 1
+  mInvert: 0
+  mFlip: 0
+  centerType: 1
+  leftType: 1
+  rightType: 1
+  bottomType: 1
+  topType: 1
+  atlasName: atlasAllReal
+  mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
+  mSpriteName: work_work_color
+  mFillCenter: 1
+  isGrayMode: 0
 --- !u!1 &4339859189069139256
 GameObject:
  m_ObjectHideFlags: 0
@@ -7728,6 +7894,93 @@ MonoBehaviour:
  mSpriteName: cust_cus_tel
  mFillCenter: 1
  isGrayMode: 0
+--- !u!1 &4906630994237821854
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2426801971675280382}
+  - component: {fileID: 8058641080977890906}
+  - component: {fileID: 1203313915198748042}
+  m_Layer: 5
+  m_Name: Title
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2426801971675280382
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4906630994237821854}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -0.000061035156, y: -51.029392, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 1960737176562699803}
+  - {fileID: 6776850397468619022}
+  m_Father: {fileID: 4886666851593583502}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &8058641080977890906
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4906630994237821854}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 858a20c1b21a3f94bb5b2d3b901c9aaf, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: -1
+  rightAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: -1
+  bottomAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  topAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  updateAnchors: 0
+  mColor: {r: 1, g: 1, b: 1, a: 1}
+  mPivot: 4
+  mWidth: 1125
+  mHeight: 100
+  mDepth: 0
+  autoResizeBoxCollider: 0
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 11.25
+--- !u!114 &1203313915198748042
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4906630994237821854}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  widget: {fileID: 8058641080977890906}
+  offset: 0
+  sizeAdjust: 1
 --- !u!1 &5078642348540468931
 GameObject:
  m_ObjectHideFlags: 0
@@ -10327,7 +10580,7 @@ Transform:
  - {fileID: 9155012502424189886}
  - {fileID: 7066844989434100784}
  m_Father: {fileID: 8246500317629248720}
-  m_RootOrder: 3
+  m_RootOrder: 4
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &8997606126826942676
 MonoBehaviour:
@@ -11307,6 +11560,106 @@ MonoBehaviour:
  isAppendEndingString: 0
  AppendString: '...'
  fontName: EmptyFont
+--- !u!1 &7142510263042379155
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6776850397468619022}
+  - component: {fileID: 7262911135413684141}
+  m_Layer: 5
+  m_Name: Label
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6776850397468619022
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7142510263042379155}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -482, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 2426801971675280382}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &7262911135413684141
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7142510263042379155}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 1960737176562699803}
+    relative: 0
+    absolute: 30
+  rightAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  bottomAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  topAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  updateAnchors: 0
+  mColor: {r: 0.8, g: 0.8, b: 0.8, a: 1}
+  mPivot: 3
+  mWidth: 184
+  mHeight: 46
+  mDepth: 1
+  autoResizeBoxCollider: 0
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 4
+  keepCrispWhenShrunk: 1
+  mTrueTypeFont: {fileID: 0}
+  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
+  mText: "\u7CFB\u7EDF\u4FE1\u606F"
+  mFontSize: 46
+  mFontStyle: 0
+  mAlignment: 0
+  mEncoding: 0
+  mMaxLineCount: 1
+  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 &7246578445747532193
 GameObject:
  m_ObjectHideFlags: 0
@@ -11920,6 +12273,7 @@ Transform:
  m_Children:
  - {fileID: 8366587093192941028}
  - {fileID: 5046301095161937844}
+  - {fileID: 4886666851593583502}
  - {fileID: 1177340836}
  - {fileID: 5659840120862483878}
  - {fileID: 4720872816294074782}
@@ -14054,7 +14408,7 @@ MonoBehaviour:
  anchorOffset: 0
  softBorderPadding: 1
  renderQueue: 0
-  startingRenderQueue: 3010
+  startingRenderQueue: 3011
  mClipTexture: {fileID: 0}
  mAlpha: 1
  mClipping: 3
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelFollowFilter.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelFollowFilter.prefab
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelFollowFilter.prefab.meta
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelFollowFilter.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 91be5b30899084c2b9e9f7343d64cf6f
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOrderList.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOrderList.prefab
@@ -168,7 +168,6 @@ Transform:
  - {fileID: 1695612816179622048}
  - {fileID: 1695612815265812562}
  - {fileID: 3626394024244750507}
-  - {fileID: 3592938584915241295}
  m_Father: {fileID: 7084386452241072431}
  m_RootOrder: 2
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -886,7 +885,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  jsonKey: lastFollowUpTime
+  jsonKey: companyName
  formatValue: "\u5173\u8054\u5BA2\u6237\uFF1A{0}"
  labeName: {fileID: 0}
  defaultName: 
@@ -1325,139 +1324,6 @@ MonoBehaviour:
  frameName: Frame1
  frameObj: {fileID: 0}
  titleKeyName: "\u8BA2\u5355\u7BA1\u7406"
--- !u!1 &3548334101062895408
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 3592938584915241295}
-  - component: {fileID: 8796507067764736209}
-  - component: {fileID: 5032767334997936555}
-  - component: {fileID: 8751693546856402152}
-  m_Layer: 5
-  m_Name: ButtonAddCust
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!4 &3592938584915241295
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3548334101062895408}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 486, y: -66, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 1695612814791429998}
-  m_RootOrder: 3
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &8796507067764736209
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3548334101062895408}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 1
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Size: {x: 150, y: 100, z: 0}
-  m_Center: {x: 0, y: -0.22070312, z: 0}
--- !u!114 &5032767334997936555
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3548334101062895408}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  tweenTarget: {fileID: 3548334101062895408}
-  hover: {r: 0.88235295, g: 0.78431374, b: 0.5882353, a: 1}
-  pressed: {r: 0.7176471, g: 0.6392157, b: 0.48235294, a: 1}
-  disabledColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
-  duration: 0.2
-  skipColorEffect: 1
-  dragHighlight: 0
-  hoverSprite: 
-  pressedSprite: 
-  disabledSprite: 
-  hoverSprite2D: {fileID: 0}
-  pressedSprite2D: {fileID: 0}
-  disabledSprite2D: {fileID: 0}
-  pixelSnap: 0
-  onClick:
-  - mTarget: {fileID: 3186475724049071352}
-    mMethodName: uiEventDelegate
-    mParameters:
-    - obj: {fileID: 0}
-      field: 
-      name: go
-    oneShot: 0
--- !u!114 &8751693546856402152
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3548334101062895408}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  leftAnchor:
-    target: {fileID: 7084386452241072431}
-    relative: 1
-    absolute: -100
-  rightAnchor:
-    target: {fileID: 7084386452241072431}
-    relative: 1
-    absolute: -50
-  bottomAnchor:
-    target: {fileID: 0}
-    relative: 0
-    absolute: 0
-  topAnchor:
-    target: {fileID: 0}
-    relative: 1
-    absolute: 0
-  updateAnchors: 1
-  mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1}
-  mPivot: 4
-  mWidth: 50
-  mHeight: 50
-  mDepth: 10
-  autoResizeBoxCollider: 0
-  hideIfOffScreen: 0
-  keepAspectRatio: 0
-  aspectRatio: 1
-  mType: 1
-  mFillDirection: 4
-  mFillAmount: 1
-  mInvert: 0
-  mFlip: 0
-  centerType: 1
-  leftType: 1
-  rightType: 1
-  bottomType: 1
-  topType: 1
-  atlasName: atlasAllReal
-  mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
-  mSpriteName: cust_add
-  mFillCenter: 1
-  isGrayMode: 0
 --- !u!1 &3549210079222449859
 GameObject:
  m_ObjectHideFlags: 0
@@ -1945,7 +1811,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  jsonKey: custName
+  jsonKey: money
  formatValue: "\u8BA2\u5355\u91D1\u989D\uFF1A{0}"
  labeName: {fileID: 0}
  defaultName: 
@@ -2070,7 +1936,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  jsonKey: _phoneNo
+  jsonKey: title
  formatValue: 
  labeName: {fileID: 0}
  defaultName: 
@@ -2197,7 +2063,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  jsonKey: dealFlag
+  jsonKey: status
  formatValue: 
  labeName: {fileID: 0}
  defaultName: 
@@ -2463,6 +2329,9 @@ GameObject:
  m_Component:
  - component: {fileID: 4586775333025383884}
  - component: {fileID: 4206424963445455942}
+  - component: {fileID: 5867811423619707448}
+  - component: {fileID: 6679270411634261236}
+  - component: {fileID: 3516603784228117905}
  m_Layer: 5
  m_Name: LabelServerNo
  m_TagString: Untagged
@@ -2553,6 +2422,96 @@ MonoBehaviour:
  isAppendEndingString: 0
  AppendString: '...'
  fontName: EmptyFont
+--- !u!114 &5867811423619707448
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7873896675524645784}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 57e428c9b6087304da439ec665b56a2d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  atlasName: 
+  atlas: {fileID: 8379920634462272047, guid: 9aea3d2b5a77f4e84bd921688ff9ca99, type: 3}
+  fontName: 
+  bitmapFont: {fileID: 0}
+  trueTypeFont: {fileID: 12800000, guid: e49e0253465a54d1a83f684649c927ae, type: 3}
+  fontSize: 46
+  fontStyle: 0
+  backgroundSprite: cust_kuang
+  highlightSprite: cust_kuang
+  position: 0
+  alignment: 1
+  items: []
+  valueItems: []
+  padding: {x: 4, y: 4}
+  textColor: {r: 1, g: 1, b: 1, a: 1}
+  backgroundColor: {r: 1, g: 1, b: 1, a: 1}
+  highlightColor: {r: 0.88235295, g: 0.78431374, b: 0.5882353, a: 1}
+  isAnimated: 1
+  isLocalized: 0
+  openOn: 0
+  onChange:
+  - mTarget: {fileID: 4206424963445455942}
+    mMethodName: SetCurrentSelection
+    mParameters:
+    - obj: {fileID: 0}
+      field: 
+      name: go
+    oneShot: 0
+  mSelectedItem: 
+  mPanel: {fileID: 0}
+  mChild: {fileID: 0}
+  mBackground: {fileID: 0}
+  mHighlight: {fileID: 0}
+  mHighlightedLabel: {fileID: 0}
+  mLabelList: []
+  mBgBorder: 0
+  eventReceiver: {fileID: 0}
+  functionName: OnSelectionChange
+  textScale: 0
+  font: {fileID: 0}
+  textLabel: {fileID: 0}
+--- !u!114 &6679270411634261236
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7873896675524645784}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  onSelect: []
+--- !u!114 &3516603784228117905
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7873896675524645784}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  jsonKey: upLoginNo
+  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 &8007719617964266529
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPopTime.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPopTime.prefab
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPopTime.prefab.meta
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPopTime.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 27591aeb2aa724e72a9b04b3298a4218
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelResetPasswordStep1.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelResetPasswordStep1.prefab
@@ -245,6 +245,7 @@ GameObject:
  - component: {fileID: 3340297541839146388}
  - component: {fileID: 9064726627313867737}
  - component: {fileID: 6434443883825252431}
+  - component: {fileID: 4760727973710844651}
  m_Layer: 5
  m_Name: ButtonDelPhoneNum
  m_TagString: Untagged
@@ -366,6 +367,19 @@ MonoBehaviour:
  mSpriteName: login_log_no
  mFillCenter: 1
  isGrayMode: 0
+--- !u!114 &4760727973710844651
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2691153983406664913}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ce7ce3a27703447e98bd5b91307e34c8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  input: {fileID: 4632458405731700042}
 --- !u!1 &3735941456448390010
 GameObject:
  m_ObjectHideFlags: 0
@@ -437,7 +451,7 @@ MonoBehaviour:
  anchorOffset: 0
  softBorderPadding: 1
  renderQueue: 0
-  startingRenderQueue: 3004
+  startingRenderQueue: 3000
  mClipTexture: {fileID: 0}
  mAlpha: 1
  mClipping: 0
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSetting.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSetting.prefab