up

2020-07-18 21:12:14 +08:00
parent 1361db18a9
commit 33dc6cea60
214 changed files with 16596 additions and 3104 deletions
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/other/EmptySpace.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/other/EmptySpace.prefab
@@ -0,0 +1,103 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &4016113218096866173
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5617798433501596391}
+  - component: {fileID: 7475180248637872789}
+  - component: {fileID: 5112765744569259920}
+  - component: {fileID: 114984807402381024}
+  m_Layer: 5
+  m_Name: EmptySpace
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &5617798433501596391
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4016113218096866173}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &7475180248637872789
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4016113218096866173}
+  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: 0
+  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: 1
+  mColor: {r: 1, g: 1, b: 1, a: 1}
+  mPivot: 4
+  mWidth: 1125
+  mHeight: 40
+  mDepth: 0
+  autoResizeBoxCollider: 0
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 28.125
+--- !u!114 &5112765744569259920
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4016113218096866173}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  widget: {fileID: 7475180248637872789}
+  offset: 0
+  sizeAdjust: 1
+--- !u!114 &114984807402381024
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4016113218096866173}
+  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/TRCellEmptySpace.lua
+  isNeedResetAtlase: 1
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/other/EmptySpace.prefab.meta
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/other/EmptySpace.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: fc72c3452d46140da8533e6170eea08d
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputCheckboxs.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputCheckboxs.prefab
@@ -337,7 +337,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  widget: {fileID: 0}
+  widget: {fileID: 3135104635965478356}
  offset: 0
  sizeAdjust: 1
 --- !u!1 &5713654144068856770
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputDate.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputDate.prefab
@@ -261,7 +261,7 @@ MonoBehaviour:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 4366778029194131019}
-  m_Enabled: 1
+  m_Enabled: 0
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: ac5060295fbd39b4a88d20d0c83d925e, type: 3}
  m_Name: 
@@ -427,7 +427,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  widget: {fileID: 0}
+  widget: {fileID: 4462264015671642074}
  offset: 0
  sizeAdjust: 1
 --- !u!1 &4634753059616572994
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputMultText.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputMultText.prefab
@@ -304,12 +304,12 @@ MonoBehaviour:
  mColor: {r: 1, g: 1, b: 1, a: 1}
  mPivot: 1
  mWidth: 1125
-  mHeight: 160
+  mHeight: 166
  mDepth: 0
  autoResizeBoxCollider: 1
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 1.5800562
+  aspectRatio: 5.2083335
  mType: 1
  mFillDirection: 4
  mFillAmount: 1
@@ -337,7 +337,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  widget: {fileID: 0}
+  widget: {fileID: 2839739815580303652}
  offset: 0
  sizeAdjust: 1
 --- !u!1 &3697089830196127904
@@ -479,7 +479,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 4190302636056289163}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: -83, z: 0}
+  m_LocalPosition: {x: 0, y: -89, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 8914706348937367773}
@@ -553,6 +553,8 @@ GameObject:
  - component: {fileID: 2201719010312833371}
  - component: {fileID: 114036264039868146}
  - component: {fileID: 4159195424412484572}
+  - component: {fileID: 1282812251363180281}
+  - component: {fileID: 4763460103473277405}
  m_Layer: 5
  m_Name: InputMultText
  m_TagString: Untagged
@@ -593,7 +595,7 @@ BoxCollider:
  m_Enabled: 1
  serializedVersion: 2
  m_Size: {x: 1125, y: 160, z: 0}
-  m_Center: {x: 0, y: -80, z: 0}
+  m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &3278600689168548542
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -729,6 +731,59 @@ MonoBehaviour:
  onDrag: []
  onBecameVisible: []
  onBecameInvisible: []
+--- !u!114 &1282812251363180281
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4384702830002398302}
+  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: 512
+  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: 1
+  mColor: {r: 1, g: 1, b: 1, a: 1}
+  mPivot: 4
+  mWidth: 1125
+  mHeight: 160
+  mDepth: 3
+  autoResizeBoxCollider: 0
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 7.03125
+--- !u!114 &4763460103473277405
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4384702830002398302}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  widget: {fileID: 1282812251363180281}
+  offset: 0
+  sizeAdjust: 1
 --- !u!1 &4476086160367826707
 GameObject:
  m_ObjectHideFlags: 0
@@ -892,7 +947,7 @@ MonoBehaviour:
  mColor: {r: 0.8, g: 0.8, b: 0.8, a: 1}
  mPivot: 2
  mWidth: 720
-  mHeight: 46
+  mHeight: 52
  mDepth: 1
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputPoplist.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputPoplist.prefab
@@ -254,6 +254,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+  onSelect: []
 --- !u!114 &114097241059719580
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -281,7 +282,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  widget: {fileID: 0}
+  widget: {fileID: 850321821054899805}
  offset: 0
  sizeAdjust: 1
 --- !u!1 &3752426191522449626
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputText.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputText.prefab
@@ -184,6 +184,90 @@ MonoBehaviour:
  mSpriteName: public__empty
  mFillCenter: 1
  isGrayMode: 0
+--- !u!1 &3779000128578336148
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3168767990445357510}
+  - component: {fileID: 8643254210907420438}
+  m_Layer: 5
+  m_Name: SpriteRight
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3168767990445357510
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3779000128578336148}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 527, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 2423944239439220864}
+  m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &8643254210907420438
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3779000128578336148}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 2423944239439220864}
+    relative: 1
+    absolute: -49
+  rightAnchor:
+    target: {fileID: 2423944239439220864}
+    relative: 1
+    absolute: -21
+  bottomAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  topAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  updateAnchors: 1
+  mColor: {r: 0.89411765, g: 0.89411765, b: 0.89411765, a: 1}
+  mPivot: 4
+  mWidth: 28
+  mHeight: 40
+  mDepth: 2
+  autoResizeBoxCollider: 0
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 0.05
+  mType: 0
+  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_right
+  mFillCenter: 1
+  isGrayMode: 0
 --- !u!1 &4625788788876681624
 GameObject:
  m_ObjectHideFlags: 0
@@ -364,6 +448,7 @@ Transform:
  - {fileID: 28764931924455384}
  - {fileID: 608007034948422929}
  - {fileID: 3889093227389003832}
+  - {fileID: 3168767990445357510}
  m_Father: {fileID: 0}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -387,7 +472,7 @@ MonoBehaviour:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 6259930685614177535}
-  m_Enabled: 1
+  m_Enabled: 0
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: ac5060295fbd39b4a88d20d0c83d925e, type: 3}
  m_Name: 
@@ -580,7 +665,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  widget: {fileID: 0}
+  widget: {fileID: 1657931634484404253}
  offset: 0
  sizeAdjust: 1
 --- !u!1 &6856486077525911941
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelAbout.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelAbout.prefab
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelAbout.prefab.meta
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelAbout.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 724bb40539c204cc4b051f59fe05ee1f
+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/PanelConfirm.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConfirm.prefab
@@ -1505,7 +1505,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &2628189625839598053
 Transform:
  m_ObjectHideFlags: 0
@@ -1552,7 +1552,7 @@ MonoBehaviour:
  mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1}
  mPivot: 4
  mWidth: 224
-  mHeight: 56
+  mHeight: 55
  mDepth: 5
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
@@ -1561,7 +1561,7 @@ MonoBehaviour:
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
-  mText: "\u786E\u8BA4\u64CD\u4F5C"
+  mText: 
  mFontSize: 56
  mFontStyle: 0
  mAlignment: 0
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustDetail.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustDetail.prefab
@@ -905,6 +905,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+  onSelect: []
 --- !u!1 &330521499854047422
 GameObject:
  m_ObjectHideFlags: 0
@@ -4787,6 +4788,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+  onSelect: []
 --- !u!114 &7645822589242098017
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -5133,6 +5135,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+  onSelect: []
 --- !u!114 &1137789232
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -8160,6 +8163,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+  onSelect: []
 --- !u!114 &49758580
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -8973,6 +8977,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+  onSelect: []
 --- !u!114 &538149441
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -10208,6 +10213,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+  onSelect: []
 --- !u!114 &1411711555
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -10408,6 +10414,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+  onSelect: []
 --- !u!114 &945366800
 MonoBehaviour:
  m_ObjectHideFlags: 0
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustList.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustList.prefab
@@ -3514,6 +3514,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+  onSelect: []
 --- !u!1 &8799149260921359694
 GameObject:
  m_ObjectHideFlags: 0
@@ -3585,7 +3586,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: da6df6b770ac942ab8916dc960507b8f, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  cellCount: 10
+  cellCount: 12
  isPlayTween: 0
  twType: 0
  tweenSpeed: 0.01
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustListProc.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustListProc.prefab
@@ -78,6 +78,9 @@ MonoBehaviour:
  itemList: []
  grid: {fileID: 0}
  panel: {fileID: 0}
+  OnShowHeadListCallbacks: []
+  OnHideHeadListCallbacks: []
+  OnEndListCallbacks: []
 --- !u!1 &556357319856344632
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelFollowList.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelFollowList.prefab
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelFollowList.prefab.meta
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelFollowList.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 53030f81bc08641dfbe1db35fddfe6e2
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMine.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMine.prefab
@@ -11,8 +11,10 @@ GameObject:
  - component: {fileID: 745552340}
  - component: {fileID: 745552342}
  - component: {fileID: 745552341}
+  - component: {fileID: 6219061445155327309}
+  - component: {fileID: 212392421651251280}
  m_Layer: 5
-  m_Name: Spritebg
+  m_Name: SpriteTopBg
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
@@ -66,7 +68,7 @@ MonoBehaviour:
  mWidth: 1129
  mHeight: 370
  mDepth: 0
-  autoResizeBoxCollider: 0
+  autoResizeBoxCollider: 1
  hideIfOffScreen: 0
  keepAspectRatio: 0
  aspectRatio: 3.0513513
@@ -100,6 +102,53 @@ MonoBehaviour:
  widget: {fileID: 745552342}
  offset: -2
  sizeAdjust: 1
+--- !u!65 &6219061445155327309
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 745552339}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1129, y: 370, z: 0}
+  m_Center: {x: 0, y: -185, z: 0}
+--- !u!114 &212392421651251280
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 745552339}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e862f287df53bb64db191162f851a296, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  onHoverOver: []
+  onHoverOut: []
+  onPress: []
+  onRelease: []
+  onSelect: []
+  onDeselect: []
+  onClick:
+  - mTarget: {fileID: 7860134391406953152}
+    mMethodName: uiEventDelegate
+    mParameters:
+    - obj: {fileID: 0}
+      field: 
+      name: go
+    oneShot: 0
+  onDoubleClick: []
+  onDragStart: []
+  onDragEnd: []
+  onDragOver: []
+  onDragOut: []
+  onDrag: []
+  onBecameVisible: []
+  onBecameInvisible: []
 --- !u!1 &1394948278
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMyInfor.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMyInfor.prefab
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMyInfor.prefab.meta
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMyInfor.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 9df91fe6d3b344793a3225538d07b5ba
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewCust.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewCust.prefab
@@ -688,6 +688,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+  onSelect: []
 --- !u!114 &3423729636388972546
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -3828,6 +3829,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+  onSelect: []
 --- !u!114 &6561780794515061221
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -4246,6 +4248,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+  onSelect: []
 --- !u!114 &4653130227401068280
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -6818,6 +6821,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+  onSelect: []
 --- !u!114 &7163535886343167415
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -7944,6 +7948,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+  onSelect: []
 --- !u!114 &4220701522037042036
 MonoBehaviour:
  m_ObjectHideFlags: 0
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewFollowSimple.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewFollowSimple.prefab
@@ -551,7 +551,7 @@ GameObject:
  - component: {fileID: 1907683157874330074}
  - component: {fileID: 7724873194386183766}
  m_Layer: 5
-  m_Name: PanelNewFollow
+  m_Name: PanelNewFollowSimple
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
@@ -633,7 +633,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  isPause: 0
-  luaPath: trCRM/upgradeRes/priority/lua/ui/panel/TRPNewFollow.lua
+  luaPath: trCRM/upgradeRes/priority/lua/ui/panel/TRPNewFollowSimple.lua
  isNeedBackplate: 1
  destroyWhenHide: 0
  isNeedResetAtlase: 1
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewFollowSimple.prefab.meta
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewFollowSimple.prefab.meta
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewFollowTask.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewFollowTask.prefab
@@ -0,0 +1,649 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &328980738985470321
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8405719512336295725}
+  - component: {fileID: 4793665127037870931}
+  - component: {fileID: 4569404973647487988}
+  - component: {fileID: 2469722214568661231}
+  m_Layer: 5
+  m_Name: DetailRoot
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8405719512336295725
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 328980738985470321}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -1, y: -30, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 8271564019481054745}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &4793665127037870931
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 328980738985470321}
+  m_Enabled: 0
+  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 &4569404973647487988
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 328980738985470321}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 16bd2beefa5ca4a3ba0753143d28e2d9, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  jsonKey: 
+--- !u!114 &2469722214568661231
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 328980738985470321}
+  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 &2405347686691609928
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 85942781782062204}
+  - component: {fileID: 3495134491120660627}
+  - component: {fileID: 2022783212242154028}
+  - component: {fileID: 5774097580592811788}
+  m_Layer: 5
+  m_Name: DragScroll
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &85942781782062204
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2405347686691609928}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -1, y: -66, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 5592195152047375516}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &3495134491120660627
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2405347686691609928}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 858a20c1b21a3f94bb5b2d3b901c9aaf, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 5592195152047375516}
+    relative: 0
+    absolute: 0
+  rightAnchor:
+    target: {fileID: 5592195152047375516}
+    relative: 1
+    absolute: 0
+  bottomAnchor:
+    target: {fileID: 5592195152047375516}
+    relative: 0
+    absolute: 0
+  topAnchor:
+    target: {fileID: 5592195152047375516}
+    relative: 1
+    absolute: -132
+  updateAnchors: 1
+  mColor: {r: 1, g: 1, b: 1, a: 1}
+  mPivot: 4
+  mWidth: 1125
+  mHeight: 2172
+  mDepth: 7
+  autoResizeBoxCollider: 1
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 0.5179558
+--- !u!114 &2022783212242154028
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2405347686691609928}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f02842fa4878db54f9587ff4de7d9f2d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  scrollView: {fileID: 6376198817563156533}
+  draggablePanel: {fileID: 0}
+--- !u!65 &5774097580592811788
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2405347686691609928}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1125, y: 2172, z: 0}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!1 &4329241472409898578
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4329241472409898579}
+  - component: {fileID: 4329241472409898588}
+  m_Layer: 5
+  m_Name: Top
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4329241472409898579
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4329241472409898578}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 1152, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 4329241472744673724}
+  m_Father: {fileID: 5592195152047375516}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &4329241472409898588
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4329241472409898578}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c8077b76001d36d489868d20d28bddb9, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  uiCamera: {fileID: 0}
+  container: {fileID: 0}
+  side: 3
+  runOnlyOnce: 1
+  relativeOffset: {x: 0, y: 0}
+  pixelOffset: {x: 0, y: 0}
+  widgetContainer: {fileID: 0}
+--- !u!1 &4329241472744673715
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4329241472744673724}
+  - component: {fileID: 4329241472744673727}
+  - component: {fileID: 4329241472744673726}
+  - component: {fileID: 4329241472744673725}
+  m_Layer: 5
+  m_Name: ButtonSave
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4329241472744673724
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4329241472744673715}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 510, y: -66, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4329241472409898579}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &4329241472744673727
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4329241472744673715}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 200, y: 100, z: 0}
+  m_Center: {x: -50, y: -0.22070312, z: 0}
+--- !u!114 &4329241472744673726
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4329241472744673715}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  tweenTarget: {fileID: 4329241472744673715}
+  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: 6003453472346918249}
+    mMethodName: uiEventDelegate
+    mParameters:
+    - obj: {fileID: 0}
+      field: 
+      name: go
+    oneShot: 0
+--- !u!114 &4329241472744673725
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4329241472744673715}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 5592195152047375516}
+    relative: 1
+    absolute: -163
+  rightAnchor:
+    target: {fileID: 5592195152047375516}
+    relative: 1
+    absolute: -51
+  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: 5
+  mWidth: 112
+  mHeight: 56
+  mDepth: 1
+  autoResizeBoxCollider: 0
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 2
+  keepCrispWhenShrunk: 1
+  mTrueTypeFont: {fileID: 0}
+  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
+  mText: "\u4FDD\u5B58"
+  mFontSize: 56
+  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 &6655210489690858908
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5592195152047375516}
+  - component: {fileID: 2458329485491688165}
+  - component: {fileID: 6003453472346918249}
+  m_Layer: 5
+  m_Name: PanelNewFollowTask
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!4 &5592195152047375516
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6655210489690858908}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 5646390679247249172}
+  - {fileID: 85942781782062204}
+  - {fileID: 4329241472409898579}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &2458329485491688165
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6655210489690858908}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ae942c9068183dc40a9d01f648273726, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  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: 1
+  showInPanelTool: 1
+  generateNormals: 0
+  widgetsAreStatic: 0
+  cullWhileDragging: 1
+  alwaysOnScreen: 0
+  anchorOffset: 0
+  softBorderPadding: 1
+  renderQueue: 0
+  startingRenderQueue: 3000
+  mClipTexture: {fileID: 0}
+  mAlpha: 1
+  mClipping: 0
+  mClipRange: {x: 0, y: 0, z: 300, w: 200}
+  mClipSoftness: {x: 4, y: 4}
+  mDepth: 1
+  mSortingOrder: 0
+  mClipOffset: {x: 0, y: 0}
+--- !u!114 &6003453472346918249
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6655210489690858908}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1ff491def90b44724978eb9e0b2b558f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  isPause: 0
+  luaPath: trCRM/upgradeRes/priority/lua/ui/panel/TRPNewFollowTask.lua
+  isNeedBackplate: 1
+  destroyWhenHide: 0
+  isNeedResetAtlase: 1
+  isNeedMask4Init: 0
+  isNeedMask4InitOnlyOnce: 1
+  isHideWithEffect: 1
+  isRefeshContentWhenEffectFinish: 0
+  EffectRoot: {fileID: 0}
+  effectType: 1
+  EffectList: []
+  frameName: Frame1
+  frameObj: {fileID: 0}
+  titleKeyName: "\u65B0\u5EFA\u8DDF\u8FDB\u4EFB\u52A1"
+--- !u!1 &7833718132027562127
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8271564019481054745}
+  - component: {fileID: 6605656819427986464}
+  m_Layer: 5
+  m_Name: Table
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8271564019481054745
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7833718132027562127}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 937, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 8405719512336295725}
+  m_Father: {fileID: 5646390679247249172}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &6605656819427986464
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7833718132027562127}
+  m_Enabled: 0
+  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: 30}
+--- !u!1 &9049775882809917633
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5646390679247249172}
+  - component: {fileID: 4803176237007059409}
+  - component: {fileID: 6376198817563156533}
+  m_Layer: 5
+  m_Name: PanelContent
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &5646390679247249172
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9049775882809917633}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 8271564019481054745}
+  m_Father: {fileID: 5592195152047375516}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &4803176237007059409
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9049775882809917633}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ae942c9068183dc40a9d01f648273726, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  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: 1
+  showInPanelTool: 1
+  generateNormals: 0
+  widgetsAreStatic: 0
+  cullWhileDragging: 1
+  alwaysOnScreen: 0
+  anchorOffset: 0
+  softBorderPadding: 1
+  renderQueue: 0
+  startingRenderQueue: 3001
+  mClipTexture: {fileID: 0}
+  mAlpha: 1
+  mClipping: 3
+  mClipRange: {x: 0, y: 0, z: 1126, w: 2000}
+  mClipSoftness: {x: 4, y: 10}
+  mDepth: 2
+  mSortingOrder: 0
+  mClipOffset: {x: 0, y: 0}
+--- !u!114 &6376198817563156533
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9049775882809917633}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d81807633ea807d4c8e3fff7e10c6000, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  movement: 1
+  dragEffect: 2
+  restrictWithinPanel: 1
+  disableDragIfFits: 1
+  smoothDragStart: 1
+  iOSDragEmulation: 1
+  scrollWheelFactor: 0.25
+  momentumAmount: 35
+  dampenStrength: 9
+  horizontalScrollBar: {fileID: 0}
+  verticalScrollBar: {fileID: 0}
+  showScrollBars: 1
+  customMovement: {x: 1, y: 0}
+  contentPivot: 1
+  scale: {x: 0, y: 0, z: 0}
+  relativePositionOnReset: {x: 0, y: 0}
+  centerOnChild: {fileID: 0}
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewFollowTask.prefab.meta
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewFollowTask.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: d070c4cc8d20a46e3b3f7c2d0ac02502
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewOrder.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewOrder.prefab
@@ -151,7 +151,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 420220745163305833}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: -48.154236, z: 0}
+  m_LocalPosition: {x: 0, y: -48.654293, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 6406361052267521726}
@@ -1075,7 +1075,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1747138548909843324}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: -177.40427, z: 0}
+  m_LocalPosition: {x: 0, y: -177.77928, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 5582618885866839856}
@@ -1296,6 +1296,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+  onSelect: []
 --- !u!114 &1374284702246386988
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -1900,7 +1901,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 2425227412765712263}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: -188.9042, z: 0}
+  m_LocalPosition: {x: 0, y: -777.27924, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 5247068646262692398}
@@ -3737,6 +3738,158 @@ MonoBehaviour:
  isAppendEndingString: 0
  AppendString: '...'
  fontName: EmptyFont
+--- !u!1 &5487216764156978569
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2509541483205259216}
+  - component: {fileID: 3489239926919154696}
+  - component: {fileID: 1838843289826127282}
+  - component: {fileID: 4460822429136587271}
+  - component: {fileID: 9035455709320344593}
+  - component: {fileID: 2085530375892443290}
+  m_Layer: 5
+  m_Name: 00000
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2509541483205259216
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5487216764156978569}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: -0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 6755470009267612121}
+  m_Father: {fileID: 4600755202396098814}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &3489239926919154696
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5487216764156978569}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  widget: {fileID: 2085530375892443290}
+  offset: 50
+  sizeAdjust: 1
+--- !u!114 &1838843289826127282
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5487216764156978569}
+  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/TRCellImage.lua
+  isNeedResetAtlase: 1
+--- !u!114 &4460822429136587271
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5487216764156978569}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f02842fa4878db54f9587ff4de7d9f2d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  scrollView: {fileID: 0}
+  draggablePanel: {fileID: 0}
+--- !u!65 &9035455709320344593
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5487216764156978569}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1025, y: 500, z: 0}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &2085530375892443290
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5487216764156978569}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d5c5ca47aa5c01740810b7c66662099f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  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: 1
+  mColor: {r: 1, g: 1, b: 1, a: 1}
+  mPivot: 4
+  mWidth: 1025
+  mHeight: 500
+  mDepth: 0
+  autoResizeBoxCollider: 0
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 2.05
+  mType: 0
+  mFillDirection: 4
+  mFillAmount: 1
+  mInvert: 0
+  mFlip: 0
+  centerType: 1
+  leftType: 1
+  rightType: 1
+  bottomType: 1
+  topType: 1
+  mRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+  mTexture: {fileID: 0}
+  mMat: {fileID: 0}
+  mShader: {fileID: 4800000, guid: e75727d9555d9d14ca51d91908c681bc, type: 3}
+  mBorder: {x: 0, y: 0, z: 0, w: 0}
+  mFixedAspect: 0
 --- !u!1 &5817392990340767882
 GameObject:
  m_ObjectHideFlags: 0
@@ -4369,12 +4522,11 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 6840166634573325542}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: -350.25, z: 0}
+  m_LocalPosition: {x: 0, y: -938.87494, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 7870608547099953618}
  - {fileID: 7657068295081712894}
-  - {fileID: 2296907656735151289}
  m_Father: {fileID: 9092197074366352143}
  m_RootOrder: 3
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -4443,6 +4595,7 @@ Transform:
  - {fileID: 675396154728095867}
  - {fileID: 695648132874815624}
  - {fileID: 4781790433082627634}
+  - {fileID: 2296907656735151289}
  m_Father: {fileID: 4808583122758801922}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -4650,6 +4803,139 @@ MonoBehaviour:
  mSpriteName: work_work_color
  mFillCenter: 1
  isGrayMode: 0
+--- !u!1 &7864880252234492747
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6755470009267612121}
+  - component: {fileID: 3531358558082589502}
+  - component: {fileID: 5949980243057264043}
+  - component: {fileID: 433959213111062007}
+  m_Layer: 5
+  m_Name: ButtonDel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6755470009267612121
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7864880252234492747}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 470, y: 208, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 2509541483205259216}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &3531358558082589502
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7864880252234492747}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 100, y: 100, z: 0}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &5949980243057264043
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7864880252234492747}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  tweenTarget: {fileID: 7864880252234492747}
+  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: 1838843289826127282}
+    mMethodName: uiEventDelegate
+    mParameters:
+    - obj: {fileID: 0}
+      field: 
+      name: go
+    oneShot: 0
+--- !u!114 &433959213111062007
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7864880252234492747}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 2509541483205259216}
+    relative: 1
+    absolute: -65
+  rightAnchor:
+    target: {fileID: 2509541483205259216}
+    relative: 1
+    absolute: -20
+  bottomAnchor:
+    target: {fileID: 2509541483205259216}
+    relative: 1
+    absolute: -65
+  topAnchor:
+    target: {fileID: 2509541483205259216}
+    relative: 1
+    absolute: -20
+  updateAnchors: 0
+  mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1}
+  mPivot: 4
+  mWidth: 45
+  mHeight: 45
+  mDepth: 5
+  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: login_log_no
+  mFillCenter: 1
+  isGrayMode: 0
 --- !u!1 &7898200024377142075
 GameObject:
  m_ObjectHideFlags: 0
@@ -4663,14 +4949,16 @@ GameObject:
  - component: {fileID: 7847741233886550698}
  - component: {fileID: 3989876927114666004}
  - component: {fileID: 6582611865144033048}
-  - component: {fileID: 5684835301358909987}
+  - component: {fileID: 4891233890758738143}
+  - component: {fileID: 8089659989952212147}
+  - component: {fileID: 3196188467329571094}
  m_Layer: 5
  m_Name: InputAttachment
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &2296907656735151289
 Transform:
  m_ObjectHideFlags: 0
@@ -4678,8 +4966,8 @@ Transform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 7898200024377142075}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: -863.0292, z: 0}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: -1338.6248, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 4096705695685564279}
@@ -4687,8 +4975,9 @@ Transform:
  - {fileID: 22394276322990286}
  - {fileID: 5447743745483950510}
  - {fileID: 6561805268829721416}
-  m_Father: {fileID: 4781790433082627634}
-  m_RootOrder: 2
+  - {fileID: 4600755202396098814}
+  m_Father: {fileID: 9092197074366352143}
+  m_RootOrder: 4
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &6052790691369986581
 BoxCollider:
@@ -4785,7 +5074,7 @@ MonoBehaviour:
  widget: {fileID: 7847741233886550698}
  offset: 0
  sizeAdjust: 1
--- !u!114 &5684835301358909987
+--- !u!114 &4891233890758738143
 MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
@@ -4794,31 +5083,91 @@ MonoBehaviour:
  m_GameObject: {fileID: 7898200024377142075}
  m_Enabled: 1
  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3}
+  m_Script: {fileID: 11500000, guid: 57e428c9b6087304da439ec665b56a2d, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  tweenTarget: {fileID: 8872996654376181753}
-  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:
+  atlasName: 
+  atlas: {fileID: 8379920634462272047, guid: 9aea3d2b5a77f4e84bd921688ff9ca99, type: 3}
+  fontName: 
+  bitmapFont: {fileID: 0}
+  trueTypeFont: {fileID: 12800000, guid: e49e0253465a54d1a83f684649c927ae, type: 3}
+  fontSize: 46
+  fontStyle: 0
+  backgroundSprite: help_chengfang
+  highlightSprite: help_chengfang
+  position: 0
+  alignment: 1
+  items:
+  - "\u62CD\u7167"
+  - "\u4ECE\u76F8\u518C\u9009\u62E9"
+  valueItems:
+  - 1
+  - 2
+  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: []
+  mSelectedItem: "\u62CD\u7167"
+  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 &8089659989952212147
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7898200024377142075}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  onSelect:
  - mTarget: {fileID: 6896994100725352575}
    mMethodName: uiEventDelegate
    mParameters:
    - obj: {fileID: 0}
      field: 
-      name: go
+      name: 
    oneShot: 0
+--- !u!114 &3196188467329571094
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7898200024377142075}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  jsonKey: 
+  formatValue: 
+  labeName: {fileID: 0}
+  defaultName: 
+  canNull: 1
+  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 &8174250477570590167
 GameObject:
  m_ObjectHideFlags: 0
@@ -4927,6 +5276,62 @@ MonoBehaviour:
  scale: {x: 0, y: 0, z: 0}
  relativePositionOnReset: {x: 0, y: 0}
  centerOnChild: {fileID: 0}
+--- !u!1 &8177775070125587863
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4600755202396098814}
+  - component: {fileID: 749625377866579281}
+  m_Layer: 5
+  m_Name: Grid
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4600755202396098814
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8177775070125587863}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: -355, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 2509541483205259216}
+  m_Father: {fileID: 2296907656735151289}
+  m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &749625377866579281
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8177775070125587863}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 07c4de3b4b6fe9045b059ee627c100df, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  arrangement: 1
+  sorting: 1
+  pivot: 1
+  maxPerLine: 0
+  cellWidth: 200
+  cellHeight: 520
+  animateSmoothly: 0
+  hideInactive: 1
+  keepWithinPanel: 0
+  sorted: 0
+  oldParentPos: {x: 0, y: 0, z: 0}
+  oldParentClipOffset: {x: 0, y: 0}
 --- !u!1 &8432021983544835164
 GameObject:
  m_ObjectHideFlags: 0
@@ -5040,7 +5445,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 8872996654376181753}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: -685.9043, z: 0}
+  m_LocalPosition: {x: 0, y: -269.90417, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 3343166803441427381}
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOrderList.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOrderList.prefab
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOrderList.prefab.meta
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOrderList.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 49fe736b733d94137a06e1dd4a8d5d5e
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPopCheckBoxs.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPopCheckBoxs.prefab
@@ -1102,6 +1102,9 @@ MonoBehaviour:
  itemList: []
  grid: {fileID: 0}
  panel: {fileID: 0}
+  OnShowHeadListCallbacks: []
+  OnHideHeadListCallbacks: []
+  OnEndListCallbacks: []
 --- !u!1 &4260279069647208014
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelTasks.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelTasks.prefab
@@ -555,7 +555,7 @@ MonoBehaviour:
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
  mText: "\u9500\u552E\u76EE\u6807"
  mFontSize: 42
-  mFontStyle: 0
+  mFontStyle: 1
  mAlignment: 0
  mEncoding: 1
  mMaxLineCount: 0
@@ -3402,7 +3402,7 @@ MonoBehaviour:
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
  mText: "\u5BA2\u6237\u7C7B\u578B"
  mFontSize: 42
-  mFontStyle: 0
+  mFontStyle: 1
  mAlignment: 0
  mEncoding: 1
  mMaxLineCount: 0
@@ -4601,13 +4601,13 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 2
+  aspectRatio: 4
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
  mText: "\u8BA2\u5355\u6210\u4EA4"
  mFontSize: 42
-  mFontStyle: 0
+  mFontStyle: 1
  mAlignment: 0
  mEncoding: 1
  mMaxLineCount: 0
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/ToastRoot.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/ToastRoot.prefab
@@ -151,7 +151,7 @@ MonoBehaviour:
  mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1}
  mPivot: 4
  mWidth: 800
-  mHeight: 146
+  mHeight: 152
  mDepth: 0
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
@@ -373,7 +373,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 8524572109241191192}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 54, y: 0, z: 0}
+  m_LocalPosition: {x: 39, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 576939815961468376}
@@ -394,7 +394,7 @@ MonoBehaviour:
  leftAnchor:
    target: {fileID: 6505418891330252177}
    relative: 1
-    absolute: 50
+    absolute: 20
  rightAnchor:
    target: {fileID: 576939815961468376}
    relative: 1
@@ -410,13 +410,13 @@ MonoBehaviour:
  updateAnchors: 1
  mColor: {r: 1, g: 1, b: 1, a: 1}
  mPivot: 4
-  mWidth: 592
-  mHeight: 46
+  mWidth: 622
+  mHeight: 52
  mDepth: 1
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 12.869565
+  aspectRatio: 12.307693
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}