up

2020-07-14 22:04:03 +08:00
parent e54411e2c2
commit a47cabede2
119 changed files with 5115 additions and 1061 deletions
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConfirm.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConfirm.prefab
@@ -873,7 +873,7 @@ MonoBehaviour:
    relative: 0
    absolute: -100
  updateAnchors: 1
-  mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
+  mColor: {r: 0.8, g: 0.8, b: 0.8, a: 1}
  mPivot: 4
  mWidth: 825
  mHeight: 2
@@ -1381,7 +1381,7 @@ MonoBehaviour:
    relative: 0
    absolute: -20
  updateAnchors: 1
-  mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
+  mColor: {r: 0.8, g: 0.8, b: 0.8, a: 1}
  mPivot: 1
  mWidth: 2
  mHeight: 110
@@ -1389,7 +1389,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 0.015625
+  aspectRatio: 0.018181818
  mType: 1
  mFillDirection: 4
  mFillAmount: 1
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConnect.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConnect.prefab
@@ -76,7 +76,7 @@ MonoBehaviour:
  mClipping: 0
  mClipRange: {x: 0, y: 0, z: 300, w: 200}
  mClipSoftness: {x: 4, y: 4}
-  mDepth: 10001
+  mDepth: 10
  mSortingOrder: 0
  mClipOffset: {x: 0, y: 0}
 --- !u!114 &5447032094512914035
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustDetail.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustDetail.prefab
@@ -8136,7 +8136,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/PanelCustList.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustList.prefab
@@ -3209,7 +3209,7 @@ GameObject:
  - component: {fileID: 7170620776478054822}
  - component: {fileID: 1182383136}
  m_Layer: 5
-  m_Name: LabelCompanyName
+  m_Name: LabelPhoneNo
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
@@ -3310,7 +3310,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  jsonKey: companyName
+  jsonKey: phoneNo
  formatValue: 
  labeName: {fileID: 0}
  defaultName: 
@@ -3585,7 +3585,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: da6df6b770ac942ab8916dc960507b8f, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  cellCount: 9
+  cellCount: 10
  isPlayTween: 0
  twType: 0
  tweenSpeed: 0.01
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelEditPrice.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelEditPrice.prefab
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelEditPrice.prefab.meta
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelEditPrice.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 6d833b598325d4890a2b96ba1fbc1182
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelLogin.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelLogin.prefab
@@ -175,7 +175,7 @@ MonoBehaviour:
  spriteBg: {fileID: 0}
  valueIsNumber: 0
  isPhoneNum: 0
-  inValidColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
+  inValidColor: {r: 1, g: 0.98458993, b: 0.8066038, a: 1}
 --- !u!1 &169019246291288862
 GameObject:
  m_ObjectHideFlags: 0
@@ -352,7 +352,7 @@ MonoBehaviour:
  anchorOffset: 0
  softBorderPadding: 1
  renderQueue: 0
-  startingRenderQueue: 3004
+  startingRenderQueue: 3000
  mClipTexture: {fileID: 0}
  mAlpha: 1
  mClipping: 0
@@ -1820,4 +1820,4 @@ MonoBehaviour:
  spriteBg: {fileID: 0}
  valueIsNumber: 0
  isPhoneNum: 0
-  inValidColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
+  inValidColor: {r: 1, g: 0.9882353, b: 0.80784315, a: 1}
--- 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/PanelSelectProduct.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSelectProduct.prefab
@@ -280,6 +280,7 @@ GameObject:
  - component: {fileID: 6443676307379350713}
  - component: {fileID: 5129961851071160420}
  - component: {fileID: 2953575355203642134}
+  - component: {fileID: 5748525195033831039}
  m_Layer: 5
  m_Name: 00000
  m_TagString: Untagged
@@ -321,7 +322,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  isPause: 0
-  luaPath: trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustFilterGroup.lua
+  luaPath: trCRM/upgradeRes/priority/lua/ui/cell/TRCellProductList.lua
  isNeedResetAtlase: 1
 --- !u!114 &5129961851071160420
 MonoBehaviour:
@@ -391,6 +392,19 @@ MonoBehaviour:
  widget: {fileID: 5129961851071160420}
  offset: 0
  sizeAdjust: 1
+--- !u!114 &5748525195033831039
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1339031885216242466}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 16bd2beefa5ca4a3ba0753143d28e2d9, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  jsonKey: 
 --- !u!1 &1476048743331547168
 GameObject:
  m_ObjectHideFlags: 0
@@ -421,6 +435,7 @@ Transform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 3250592075526405360}
+  - {fileID: 312477580778927759}
  m_Father: {fileID: 8302959411981827612}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -460,7 +475,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: da6df6b770ac942ab8916dc960507b8f, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  cellCount: 10
+  cellCount: 14
  isPlayTween: 0
  twType: 0
  tweenSpeed: 0.01
@@ -556,6 +571,106 @@ MonoBehaviour:
  mSpriteName: public__empty
  mFillCenter: 1
  isGrayMode: 0
+--- !u!1 &3516691852276209336
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3318967223522064214}
+  - component: {fileID: 3838711473590820217}
+  m_Layer: 5
+  m_Name: Label
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3318967223522064214
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3516691852276209336}
+  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: 312477580778927759}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &3838711473590820217
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3516691852276209336}
+  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.6, g: 0.6, b: 0.6, a: 1}
+  mPivot: 4
+  mWidth: 1125
+  mHeight: 50
+  mDepth: 11
+  autoResizeBoxCollider: 0
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 22.5
+  keepCrispWhenShrunk: 1
+  mTrueTypeFont: {fileID: 0}
+  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
+  mText: "\u65E0\u66F4\u591A\u4FE1\u606F"
+  mFontSize: 46
+  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: 0
+  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 &3625231913236928321
 GameObject:
  m_ObjectHideFlags: 0
@@ -966,7 +1081,7 @@ MonoBehaviour:
  updateAnchors: 1
  mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
  mPivot: 3
-  mWidth: 84
+  mWidth: 284
  mHeight: 42
  mDepth: 5
  autoResizeBoxCollider: 0
@@ -1083,7 +1198,7 @@ MonoBehaviour:
  checkSprite: {fileID: 0}
  checkAnimation: {fileID: 0}
  eventReceiver: {fileID: 0}
-  functionName: OnActivate
+  functionName: 
  startsChecked: 0
 --- !u!114 &2409523827425164381
 MonoBehaviour:
@@ -1254,7 +1369,14 @@ MonoBehaviour:
  caretColor: {r: 0.60296786, g: 1, b: 0, a: 0.8}
  selectionColor: {r: 1, g: 0.8745098, b: 0.5529412, a: 0.5}
  onSubmit: []
-  onChange: []
+  onChange:
+  - mTarget: {fileID: 6984233625075085881}
+    mMethodName: uiEventDelegate
+    mParameters:
+    - obj: {fileID: 0}
+      field: 
+      name: go
+    oneShot: 0
  mValue: 
 --- !u!114 &4318169829063325852
 MonoBehaviour:
@@ -1422,7 +1544,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  jsonKey: 
+  jsonKey: num
  formatValue: "\u5E93\u5B58\uFF1A{0}"
  labeName: {fileID: 0}
  defaultName: 
@@ -1528,6 +1650,7 @@ GameObject:
  m_Component:
  - component: {fileID: 7271328320495617231}
  - component: {fileID: 6073061147799334719}
+  - component: {fileID: 1872187556}
  m_Layer: 5
  m_Name: LabelTitle
  m_TagString: Untagged
@@ -1618,6 +1741,30 @@ MonoBehaviour:
  isAppendEndingString: 0
  AppendString: '...'
  fontName: EmptyFont
+--- !u!114 &1872187556
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6062575811671155989}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  jsonKey: name
+  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 &6109131649511301274
 GameObject:
  m_ObjectHideFlags: 0
@@ -1800,6 +1947,94 @@ MonoBehaviour:
  hideIfOffScreen: 0
  keepAspectRatio: 0
  aspectRatio: 0.5405276
+--- !u!1 &6575156775745750833
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 312477580778927759}
+  - component: {fileID: 7219926862309829378}
+  - component: {fileID: 5260718638861744539}
+  - component: {fileID: 3624412198162812352}
+  m_Layer: 5
+  m_Name: ButtonEndList
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &312477580778927759
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6575156775745750833}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: -592.75, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 3318967223522064214}
+  m_Father: {fileID: 6641565186329801146}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &7219926862309829378
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6575156775745750833}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1125, y: 87.74999, z: 0}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &5260718638861744539
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6575156775745750833}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  tweenTarget: {fileID: 3516691852276209336}
+  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: []
+--- !u!114 &3624412198162812352
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6575156775745750833}
+  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!1 &6583241675011228078
 GameObject:
  m_ObjectHideFlags: 0
@@ -1962,6 +2197,7 @@ GameObject:
  m_Component:
  - component: {fileID: 2927355420003232706}
  - component: {fileID: 8281559266079674693}
+  - component: {fileID: 2023641540}
  m_Layer: 5
  m_Name: LabelPrice
  m_TagString: Untagged
@@ -1977,7 +2213,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 6814252217244726824}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -137.00002, y: -42, z: 0}
+  m_LocalPosition: {x: -137, y: -42, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 3250592075526405360}
@@ -2014,7 +2250,7 @@ MonoBehaviour:
  updateAnchors: 0
  mColor: {r: 0.94509804, g: 0.76862746, b: 0.05882353, a: 1}
  mPivot: 3
-  mWidth: 200
+  mWidth: 284
  mHeight: 42
  mDepth: 5
  autoResizeBoxCollider: 0
@@ -2052,6 +2288,30 @@ MonoBehaviour:
  isAppendEndingString: 0
  AppendString: '...'
  fontName: EmptyFont
+--- !u!114 &2023641540
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6814252217244726824}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  jsonKey: price
+  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 &6984233625075085880
 GameObject:
  m_ObjectHideFlags: 0
@@ -2147,7 +2407,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  isPause: 0
-  luaPath: 
+  luaPath: trCRM/upgradeRes/priority/lua/ui/panel/TRPSelectProduct.lua
  isNeedBackplate: 1
  destroyWhenHide: 0
  isNeedResetAtlase: 1