up

2020-07-10 13:22:24 +08:00
parent 8c154e38ba
commit 9549990b66
108 changed files with 5668 additions and 888 deletions
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputMultText.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputMultText.prefab
@@ -497,7 +497,7 @@ MonoBehaviour:
    target: {fileID: 6707647812568961046}
    relative: 0
    absolute: 1
-  updateAnchors: 0
+  updateAnchors: 1
  mColor: {r: 0.95686275, g: 0.95686275, b: 0.95686275, a: 1}
  mPivot: 4
  mWidth: 1025
@@ -506,7 +506,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 535
+  aspectRatio: 512.5
  mType: 1
  mFillDirection: 4
  mFillAmount: 1
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputText.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputText.prefab
@@ -413,6 +413,13 @@ MonoBehaviour:
      field: 
      name: go
    oneShot: 0
+  - mTarget: {fileID: 114614343490987310}
+    mMethodName: uiEventDelegate
+    mParameters:
+    - obj: {fileID: 0}
+      field: 
+      name: go
+    oneShot: 0
  mValue: 
 --- !u!114 &1657931634484404253
 MonoBehaviour:
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConnect.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConnect.prefab
@@ -1,106 +1,5 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
--- !u!1 &1031430753948494889
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 5232087136787169813}
-  - component: {fileID: 4308909144031007613}
-  m_Layer: 5
-  m_Name: Label
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!4 &5232087136787169813
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1031430753948494889}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 250.87497, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children:
-  - {fileID: 901305796782490446}
-  m_Father: {fileID: 3276146319859659945}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &4308909144031007613
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1031430753948494889}
-  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: 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: 0, g: 0, b: 0, a: 1}
-  mPivot: 4
-  mWidth: 374
-  mHeight: 90
-  mDepth: 1
-  autoResizeBoxCollider: 0
-  hideIfOffScreen: 0
-  keepAspectRatio: 0
-  aspectRatio: 13.2
-  keepCrispWhenShrunk: 1
-  mTrueTypeFont: {fileID: 0}
-  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
-  mText: "\u6DFB\u6DFB\u547C"
-  mFontSize: 90
-  mFontStyle: 1
-  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: 52
-  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 &2528687515838085996
 GameObject:
  m_ObjectHideFlags: 0
@@ -131,7 +30,6 @@ Transform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 63480084012170021}
-  - {fileID: 5232087136787169813}
  m_Father: {fileID: 0}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -208,106 +106,6 @@ MonoBehaviour:
  frameName: 
  frameObj: {fileID: 0}
  titleKeyName: 
--- !u!1 &6597490561069303931
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 901305796782490446}
-  - component: {fileID: 7489406785846308828}
-  m_Layer: 5
-  m_Name: Label2
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!4 &901305796782490446
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6597490561069303931}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: -81.5, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 5232087136787169813}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &7489406785846308828
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6597490561069303931}
-  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: 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: 0.4339623, g: 0.4339623, b: 0.4339623, a: 1}
-  mPivot: 4
-  mWidth: 370
-  mHeight: 40
-  mDepth: 1
-  autoResizeBoxCollider: 0
-  hideIfOffScreen: 0
-  keepAspectRatio: 0
-  aspectRatio: 9.45
-  keepCrispWhenShrunk: 1
-  mTrueTypeFont: {fileID: 0}
-  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
-  mText: TIANTIANFU
-  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: 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: 14
-  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 &7309178494531336136
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustDetail.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustDetail.prefab
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustFilter.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustFilter.prefab
@@ -247,8 +247,8 @@ GameObject:
  m_Component:
  - component: {fileID: 215294783250459625}
  - component: {fileID: 215294783250459621}
-  - component: {fileID: 215294783250459620}
  - component: {fileID: 555250036354483927}
+  - component: {fileID: 7224689720949346561}
  m_Layer: 5
  m_Name: ButtonFilter
  m_TagString: Untagged
@@ -284,40 +284,6 @@ BoxCollider:
  serializedVersion: 2
  m_Size: {x: 200, y: 100, z: 0}
  m_Center: {x: -61.2, y: 0, z: 0}
--- !u!114 &215294783250459620
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 215294783250459624}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  tweenTarget: {fileID: 215294783250459624}
-  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: 4128751237254219587}
-    mMethodName: uiEventDelegate
-    mParameters:
-    - obj: {fileID: 0}
-      field: 
-      name: go
-    oneShot: 0
 --- !u!114 &555250036354483927
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -371,6 +337,40 @@ MonoBehaviour:
  mSpriteName: cust_screen
  mFillCenter: 1
  isGrayMode: 0
+--- !u!114 &7224689720949346561
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 215294783250459624}
+  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: 4128751237254219587}
+    mMethodName: uiEventDelegate
+    mParameters:
+    - obj: {fileID: 0}
+      field: 
+      name: go
+    oneShot: 0
+  onDoubleClick: []
+  onDragStart: []
+  onDragEnd: []
+  onDragOver: []
+  onDragOut: []
+  onDrag: []
+  onBecameVisible: []
+  onBecameInvisible: []
 --- !u!1 &453219090744782258
 GameObject:
  m_ObjectHideFlags: 0
@@ -638,7 +638,7 @@ MonoBehaviour:
  rightAnchor:
    target: {fileID: 8411829511229606282}
    relative: 1
-    absolute: -70
+    absolute: -65
  bottomAnchor:
    target: {fileID: 0}
    relative: 0
@@ -650,13 +650,13 @@ MonoBehaviour:
  updateAnchors: 0
  mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
  mPivot: 3
-  mWidth: 35
-  mHeight: 36
+  mWidth: 40
+  mHeight: 40
  mDepth: 0
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 0.9722222
+  aspectRatio: 1
  mType: 1
  mFillDirection: 4
  mFillAmount: 1
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustList.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustList.prefab
@@ -577,7 +577,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1294460323545007280}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 75, y: 0, z: 0}
+  m_LocalPosition: {x: 80, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 4402139153552763532}
@@ -612,7 +612,7 @@ MonoBehaviour:
    relative: 1
    absolute: 0
  updateAnchors: 1
-  mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
+  mColor: {r: 0.16078432, g: 0.5647059, b: 0.8627451, a: 1}
  mPivot: 4
  mWidth: 96
  mHeight: 48
@@ -794,9 +794,9 @@ GameObject:
  serializedVersion: 6
  m_Component:
  - component: {fileID: 2651964549563356416}
-  - component: {fileID: 508086861624727727}
+  - component: {fileID: 3036458382337456059}
  m_Layer: 5
-  m_Name: Sprite
+  m_Name: SpriteHeadIcon
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
@@ -816,7 +816,7 @@ Transform:
  m_Father: {fileID: 7844925731963972638}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &508086861624727727
+--- !u!114 &3036458382337456059
 MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
@@ -825,7 +825,7 @@ MonoBehaviour:
  m_GameObject: {fileID: 1437258854777228652}
  m_Enabled: 1
  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3}
+  m_Script: {fileID: 11500000, guid: d5c5ca47aa5c01740810b7c66662099f, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
  leftAnchor:
@@ -847,13 +847,13 @@ MonoBehaviour:
  updateAnchors: 1
  mColor: {r: 1, g: 1, b: 1, a: 1}
  mPivot: 4
-  mWidth: 90
-  mHeight: 108
+  mWidth: 144
+  mHeight: 144
  mDepth: 6
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 0.8333333
+  aspectRatio: 1
  mType: 0
  mFillDirection: 4
  mFillAmount: 1
@@ -864,11 +864,17 @@ MonoBehaviour:
  rightType: 1
  bottomType: 1
  topType: 1
-  atlasName: atlasAllReal
-  mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
-  mSpriteName: cust_peo
-  mFillCenter: 1
-  isGrayMode: 0
+  mRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+  mTexture: {fileID: 0}
+  mMat: {fileID: 2100000, guid: 2ad608d4961f440808f08845745e5f23, type: 2}
+  mShader: {fileID: 4800000, guid: e75727d9555d9d14ca51d91908c681bc, type: 3}
+  mBorder: {x: 0, y: 0, z: 0, w: 0}
+  mFixedAspect: 0
 --- !u!1 &1505692092124808818
 GameObject:
  m_ObjectHideFlags: 0
@@ -1178,7 +1184,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 2173784275828466390}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 75, y: 0, z: 0}
+  m_LocalPosition: {x: 80, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 309589217806885855}
@@ -1213,7 +1219,7 @@ MonoBehaviour:
    relative: 1
    absolute: 0
  updateAnchors: 1
-  mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
+  mColor: {r: 0.16078432, g: 0.5647059, b: 0.8627451, a: 1}
  mPivot: 4
  mWidth: 96
  mHeight: 48
@@ -1281,7 +1287,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 2831399258564446556}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -25, y: -135.75, z: 0}
+  m_LocalPosition: {x: -25, y: -136, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 3423234776315785790}
@@ -1364,15 +1370,15 @@ MonoBehaviour:
    relative: 1
    absolute: 0
  updateAnchors: 0
-  mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
+  mColor: {r: 0.16078432, g: 0.5647059, b: 0.8627451, a: 1}
  mPivot: 4
  mWidth: 50
-  mHeight: 50
+  mHeight: 44
  mDepth: 8
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 1
+  aspectRatio: 1.1363636
  mType: 1
  mFillDirection: 4
  mFillAmount: 1
@@ -1733,8 +1739,8 @@ GameObject:
  m_Component:
  - component: {fileID: 3835798374104603645}
  - component: {fileID: 3835798374104603633}
-  - component: {fileID: 3835798374104603632}
  - component: {fileID: 3491199891844855491}
+  - component: {fileID: 1855959389528402021}
  m_Layer: 5
  m_Name: ButtonFilter
  m_TagString: Untagged
@@ -1770,40 +1776,6 @@ BoxCollider:
  serializedVersion: 2
  m_Size: {x: 200, y: 100, z: 0}
  m_Center: {x: -61.2, y: 0, z: 0}
--- !u!114 &3835798374104603632
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3835798374104603644}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  tweenTarget: {fileID: 3835798374104603644}
-  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: 1048171421149951831}
-    mMethodName: uiEventDelegate
-    mParameters:
-    - obj: {fileID: 0}
-      field: 
-      name: go
-    oneShot: 0
 --- !u!114 &3491199891844855491
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -1857,6 +1829,40 @@ MonoBehaviour:
  mSpriteName: cust_screen
  mFillCenter: 1
  isGrayMode: 0
+--- !u!114 &1855959389528402021
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3835798374104603644}
+  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: 1048171421149951831}
+    mMethodName: uiEventDelegate
+    mParameters:
+    - obj: {fileID: 0}
+      field: 
+      name: go
+    oneShot: 0
+  onDoubleClick: []
+  onDragStart: []
+  onDragEnd: []
+  onDragOver: []
+  onDragOut: []
+  onDrag: []
+  onBecameVisible: []
+  onBecameInvisible: []
 --- !u!1 &3835798374569477312
 GameObject:
  m_ObjectHideFlags: 0
@@ -1936,7 +1942,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 4104646864322425063}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 75, y: 0, z: 0}
+  m_LocalPosition: {x: 80, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 3406303600854706652}
@@ -1971,7 +1977,7 @@ MonoBehaviour:
    relative: 1
    absolute: 0
  updateAnchors: 1
-  mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
+  mColor: {r: 0.16078432, g: 0.5647059, b: 0.8627451, a: 1}
  mPivot: 4
  mWidth: 96
  mHeight: 48
@@ -2368,7 +2374,7 @@ GameObject:
  - component: {fileID: 7844925731963972638}
  - component: {fileID: 5194267468654516701}
  m_Layer: 5
-  m_Name: Sprite
+  m_Name: SpriteHeadBg
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
@@ -2553,7 +2559,7 @@ MonoBehaviour:
    relative: 1
    absolute: 0
  updateAnchors: 0
-  mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
+  mColor: {r: 0.16078432, g: 0.5647059, b: 0.8627451, a: 1}
  mPivot: 4
  mWidth: 50
  mHeight: 50
@@ -2601,7 +2607,6 @@ GameObject:
  m_Component:
  - component: {fileID: 2095307759858929251}
  - component: {fileID: 1788845653057746921}
-  - component: {fileID: 5585679814500181828}
  m_Layer: 5
  m_Name: LabelServerNo
  m_TagString: Untagged
@@ -2692,30 +2697,6 @@ MonoBehaviour:
  isAppendEndingString: 0
  AppendString: '...'
  fontName: EmptyFont
--- !u!114 &5585679814500181828
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5762016920945874999}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  jsonKey: serviceNo
-  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 &6051844018995411775
 GameObject:
  m_ObjectHideFlags: 0
@@ -3037,7 +3018,7 @@ MonoBehaviour:
    relative: 1
    absolute: 0
  updateAnchors: 0
-  mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
+  mColor: {r: 0.16078432, g: 0.5647059, b: 0.8627451, a: 1}
  mPivot: 4
  mWidth: 50
  mHeight: 50
@@ -3391,12 +3372,12 @@ MonoBehaviour:
  mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
  mPivot: 4
  mWidth: 144
-  mHeight: 36
+  mHeight: 72
  mDepth: 4
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 4
+  aspectRatio: 2
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -3440,7 +3421,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  jsonKey: dealflag
+  jsonKey: dealFlag
  formatValue: 
  labeName: {fileID: 0}
  defaultName: 
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelGuid.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelGuid.prefab
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelGuid.prefab.meta
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelGuid.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 82ef3ff6197c04a64914dc351894e034
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewCust.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewCust.prefab
@@ -168,7 +168,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 3
+  aspectRatio: 2
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -942,7 +942,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 0.5217391
+  aspectRatio: 0.47826087
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -1618,7 +1618,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 0.05
+  aspectRatio: 0.7
  mType: 0
  mFillDirection: 4
  mFillAmount: 1
@@ -1831,7 +1831,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 0.7208158
+  aspectRatio: 512.5
  mType: 1
  mFillDirection: 4
  mFillAmount: 1
@@ -1885,7 +1885,7 @@ Transform:
  - {fileID: 3207085431439772024}
  - {fileID: 2471581978110294420}
  m_Father: {fileID: 3390144541938402065}
-  m_RootOrder: 4
+  m_RootOrder: 5
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &2560390054752067826
 BoxCollider:
@@ -2304,7 +2304,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 0.5217391
+  aspectRatio: 0.47826087
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -2417,7 +2417,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 1.0800843
+  aspectRatio: 512.5
  mType: 1
  mFillDirection: 4
  mFillAmount: 1
@@ -2501,7 +2501,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 17.695652
+  aspectRatio: 16.717392
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -2757,7 +2757,7 @@ Transform:
  - {fileID: 789262735275859317}
  - {fileID: 4628537950900338942}
  m_Father: {fileID: 3390144541938402065}
-  m_RootOrder: 2
+  m_RootOrder: 3
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &6751297851416776549
 BoxCollider:
@@ -2876,7 +2876,7 @@ MonoBehaviour:
  formatValue: 
  labeName: {fileID: 5263322817775662806}
  defaultName: 
-  canNull: 0
+  canNull: 1
  checkIDCard: 0
  minLen: 0
  maxLen: 0
@@ -3566,7 +3566,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 0.5217391
+  aspectRatio: 0.47826087
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -3977,7 +3977,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 0.05
+  aspectRatio: 0.7
  mType: 0
  mFillDirection: 4
  mFillAmount: 1
@@ -4482,7 +4482,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 3.2232704
+  aspectRatio: 512.5
  mType: 1
  mFillDirection: 4
  mFillAmount: 1
@@ -4666,7 +4666,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 0.9267631
+  aspectRatio: 512.5
  mType: 1
  mFillDirection: 4
  mFillAmount: 1
@@ -4751,7 +4751,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 0.5217391
+  aspectRatio: 0.47826087
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -4976,7 +4976,7 @@ Transform:
  - {fileID: 3482620844373148757}
  - {fileID: 5672377779080983542}
  m_Father: {fileID: 3390144541938402065}
-  m_RootOrder: 3
+  m_RootOrder: 4
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &4254620512524785935
 BoxCollider:
@@ -5240,7 +5240,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 0.8115598
+  aspectRatio: 512.5
  mType: 1
  mFillDirection: 4
  mFillAmount: 1
@@ -5325,7 +5325,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 0.5217391
+  aspectRatio: 0.47826087
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -5439,7 +5439,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 0.5217391
+  aspectRatio: 0.47826087
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -5552,7 +5552,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 3
+  aspectRatio: 2
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -5652,7 +5652,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 1.2958281
+  aspectRatio: 512.5
  mType: 1
  mFillDirection: 4
  mFillAmount: 1
@@ -5708,7 +5708,7 @@ Transform:
  - {fileID: 4071704006312063869}
  - {fileID: 3876318381393807578}
  m_Father: {fileID: 3390144541938402065}
-  m_RootOrder: 5
+  m_RootOrder: 2
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &4438659352412322114
 BoxCollider:
@@ -6072,7 +6072,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 6.40625
+  aspectRatio: 512.5
  mType: 1
  mFillDirection: 4
  mFillAmount: 1
@@ -6257,7 +6257,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 0.5217391
+  aspectRatio: 0.47826087
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -6370,7 +6370,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 2
+  aspectRatio: 16.717392
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -6470,7 +6470,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 1.6192733
+  aspectRatio: 512.5
  mType: 1
  mFillDirection: 4
  mFillAmount: 1
@@ -6518,10 +6518,10 @@ Transform:
  m_Children:
  - {fileID: 1947286080708650753}
  - {fileID: 3531660715606027067}
+  - {fileID: 1949725440338219509}
  - {fileID: 2446954691429548344}
  - {fileID: 2264218936273892500}
  - {fileID: 2477535387824468061}
-  - {fileID: 1949725440338219509}
  - {fileID: 3677179600730480648}
  - {fileID: 8621140261478235053}
  - {fileID: 691154718777512327}
@@ -7575,7 +7575,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 0.05
+  aspectRatio: 0.7
  mType: 0
  mFillDirection: 4
  mFillAmount: 1
@@ -7659,7 +7659,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 2
+  aspectRatio: 16.717392
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -8156,7 +8156,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 3
+  aspectRatio: 2
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -8256,7 +8256,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 2.1578948
+  aspectRatio: 512.5
  mType: 1
  mFillDirection: 4
  mFillAmount: 1
@@ -8340,7 +8340,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 3
+  aspectRatio: 2
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -8440,7 +8440,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 0.05
+  aspectRatio: 0.7
  mType: 0
  mFillDirection: 4
  mFillAmount: 1
@@ -8606,7 +8606,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 2
+  aspectRatio: 16.717392
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -9031,7 +9031,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 0.5217391
+  aspectRatio: 0.47826087
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -9243,7 +9243,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 0.5217391
+  aspectRatio: 0.47826087
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -9356,7 +9356,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 0.05
+  aspectRatio: 0.7
  mType: 0
  mFillDirection: 4
  mFillAmount: 1
@@ -9441,7 +9441,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 0.5217391
+  aspectRatio: 0.47826087
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewOrder.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewOrder.prefab
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewOrder.prefab.meta
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewOrder.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: f5ea0f57bfe6b45bf90cd1f5b0b1234f
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: