2020-07-08

2020-07-08 08:01:34 +08:00
parent e344c54d82
commit 650da9efae
97 changed files with 1469 additions and 475 deletions
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/other/AlertRoot.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/other/AlertRoot.prefab
@@ -48,7 +48,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  fontName: EmptyFont
  font: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
-  effect: 1
+  effect: 0
  inactiveWhenFinish: 0
  gradient: 0
  fontStyle: 0
@@ -180,7 +180,7 @@ MonoBehaviour:
  anchorOffset: 0
  softBorderPadding: 1
  renderQueue: 0
-  startingRenderQueue: 3002
+  startingRenderQueue: 3000
  mClipTexture: {fileID: 0}
  mAlpha: 1
  mClipping: 0
@@ -204,7 +204,7 @@ MonoBehaviour:
  hudBackgroundSpriteName: login_log_bg
  hudBackgroundSpriteType: 1
  bgAnchorLeft: -5
-  bgAnchorBottom: -5
-  bgAnchorTop: 5
+  bgAnchorBottom: -50
+  bgAnchorTop: 50
  bgAnchorRight: 5
  hudBackgroundColor: {r: 0.21323532, g: 0.21323532, b: 0.21323532, a: 0.897}
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/other/Frame1.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/other/Frame1.prefab
@@ -143,6 +143,7 @@ GameObject:
  - component: {fileID: 3778826698663624295}
  - component: {fileID: 5694506429957531626}
  - component: {fileID: 5008215346691190672}
+  - component: {fileID: 4340872375063363404}
  m_Layer: 5
  m_Name: top
  m_TagString: Untagged
@@ -251,6 +252,21 @@ BoxCollider:
  serializedVersion: 2
  m_Size: {x: 1125, y: 132, z: 0}
  m_Center: {x: 0, y: -66, z: 0}
+--- !u!114 &4340872375063363404
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5452887780383457684}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  widget: {fileID: 5694506429957531626}
+  offset: 0
+  sizeAdjust: 1
 --- !u!1 &6514760866821866175
 GameObject:
  m_ObjectHideFlags: 0
@@ -295,7 +311,7 @@ BoxCollider:
  m_IsTrigger: 1
  m_Enabled: 1
  serializedVersion: 2
-  m_Size: {x: 120, y: 100, z: 0}
+  m_Size: {x: 200, y: 120, z: 0}
  m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &4415921145653938434
 MonoBehaviour:
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputCheckboxs.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputCheckboxs.prefab
@@ -301,7 +301,7 @@ MonoBehaviour:
  spriteBg: {fileID: 3135104635965478356}
  valueIsNumber: 0
  isPhoneNum: 0
-  inValidColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
+  inValidColor: {r: 1, g: 1, b: 0.9019608, a: 1}
  isMultMode: 1
  onChange:
  - mTarget: {fileID: 3990162432079155172}
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputDate.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputDate.prefab
@@ -357,7 +357,7 @@ MonoBehaviour:
  spriteBg: {fileID: 4462264015671642074}
  valueIsNumber: 0
  isPhoneNum: 0
-  inValidColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
+  inValidColor: {r: 1, g: 1, b: 0.9019608, a: 1}
 --- !u!114 &1723439637486485793
 MonoBehaviour:
  m_ObjectHideFlags: 0
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputMultText.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputMultText.prefab
@@ -612,6 +612,13 @@ MonoBehaviour:
      field: 
      name: go
    oneShot: 0
+  - mTarget: {fileID: 7894897217785059318}
+    mMethodName: OnValueChg
+    mParameters:
+    - obj: {fileID: 0}
+      field: 
+      name: go
+    oneShot: 0
  mValue: 
 --- !u!114 &7894897217785059318
 MonoBehaviour:
@@ -636,7 +643,7 @@ MonoBehaviour:
  spriteBg: {fileID: 2839739815580303652}
  valueIsNumber: 0
  isPhoneNum: 0
-  inValidColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
+  inValidColor: {r: 1, g: 1, b: 0.9019608, a: 1}
 --- !u!114 &2201719010312833371
 MonoBehaviour:
  m_ObjectHideFlags: 0
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputPoplist.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputPoplist.prefab
@@ -160,7 +160,7 @@ MonoBehaviour:
  spriteBg: {fileID: 850321821054899805}
  valueIsNumber: 0
  isPhoneNum: 0
-  inValidColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
+  inValidColor: {r: 1, g: 1, b: 0.9019608, a: 1}
 --- !u!114 &5799184755667872995
 MonoBehaviour:
  m_ObjectHideFlags: 0
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputText.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputText.prefab
@@ -405,7 +405,14 @@ MonoBehaviour:
  caretColor: {r: 0, g: 0.23127818, b: 1, a: 0.8}
  selectionColor: {r: 1, g: 0.8745098, b: 0.5529412, a: 0.5}
  onSubmit: []
-  onChange: []
+  onChange:
+  - mTarget: {fileID: 4818314150986197562}
+    mMethodName: OnValueChg
+    mParameters:
+    - obj: {fileID: 0}
+      field: 
+      name: go
+    oneShot: 0
  mValue: 
 --- !u!114 &1657931634484404253
 MonoBehaviour:
@@ -483,7 +490,7 @@ MonoBehaviour:
  spriteBg: {fileID: 1657931634484404253}
  valueIsNumber: 0
  isPhoneNum: 0
-  inValidColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
+  inValidColor: {r: 1, g: 1, b: 0.9019608, a: 1}
 --- !u!114 &2270108241694216974
 MonoBehaviour:
  m_ObjectHideFlags: 0
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/other/reportform1.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/other/reportform1.prefab
@@ -329,7 +329,7 @@ MonoBehaviour:
  topType: 1
  atlasName: atlasAllReal
  mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
-  mSpriteName: work_work_head_bg
+  mSpriteName: work_380bg
  mFillCenter: 1
  isGrayMode: 0
 --- !u!1 &2565127756708431313
@@ -392,7 +392,7 @@ MonoBehaviour:
    relative: 1
    absolute: 0
  updateAnchors: 1
-  mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1}
+  mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
  mPivot: 3
  mWidth: 100
  mHeight: 2
@@ -476,7 +476,7 @@ MonoBehaviour:
    relative: 1
    absolute: 0
  updateAnchors: 1
-  mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1}
+  mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
  mPivot: 3
  mWidth: 100
  mHeight: 2
@@ -719,7 +719,7 @@ MonoBehaviour:
    relative: 1
    absolute: 0
  updateAnchors: 1
-  mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1}
+  mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
  mPivot: 3
  mWidth: 100
  mHeight: 2
@@ -924,7 +924,7 @@ MonoBehaviour:
  topType: 1
  atlasName: atlasAllReal
  mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
-  mSpriteName: work_work_head_bg
+  mSpriteName: work_380bg
  mFillCenter: 1
  isGrayMode: 0
 --- !u!1 &4319487448922149741
@@ -1092,7 +1092,7 @@ MonoBehaviour:
  topType: 1
  atlasName: atlasAllReal
  mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
-  mSpriteName: work_work_head_bg
+  mSpriteName: work_380bg
  mFillCenter: 1
  isGrayMode: 0
 --- !u!1 &5490987535526166138
@@ -1317,7 +1317,7 @@ MonoBehaviour:
    relative: 1
    absolute: 0
  updateAnchors: 1
-  mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1}
+  mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
  mPivot: 3
  mWidth: 100
  mHeight: 2
@@ -1478,7 +1478,7 @@ MonoBehaviour:
  topType: 1
  atlasName: atlasAllReal
  mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
-  mSpriteName: work_work_head_bg
+  mSpriteName: work_380bg
  mFillCenter: 1
  isGrayMode: 0
 --- !u!1 &7814530028386079718
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/other/reportform3.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/other/reportform3.prefab
@@ -206,7 +206,7 @@ MonoBehaviour:
  updateAnchors: 1
  mColor: {r: 0.93333334, g: 0, b: 0, a: 1}
  mPivot: 4
-  mWidth: 166
+  mWidth: 180
  mHeight: 30
  mDepth: 5
  autoResizeBoxCollider: 0
@@ -281,6 +281,7 @@ MonoBehaviour:
  maxLen: 0
  spriteBg: {fileID: 0}
  valueIsNumber: 0
+  isPhoneNum: 0
  inValidColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
 --- !u!1 &2775252229165984769
 GameObject:
@@ -345,7 +346,7 @@ MonoBehaviour:
  updateAnchors: 1
  mColor: {r: 0.16078432, g: 0.5647059, b: 0.8627451, a: 1}
  mPivot: 4
-  mWidth: 140
+  mWidth: 150
  mHeight: 56
  mDepth: 11
  autoResizeBoxCollider: 0
@@ -405,6 +406,7 @@ MonoBehaviour:
  maxLen: 0
  spriteBg: {fileID: 0}
  valueIsNumber: 0
+  isPhoneNum: 0
  inValidColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
 --- !u!1 &3432450386673070063
 GameObject:
@@ -470,7 +472,7 @@ MonoBehaviour:
  updateAnchors: 1
  mColor: {r: 0.16078432, g: 0.5647059, b: 0.8627451, a: 1}
  mPivot: 4
-  mWidth: 196
+  mWidth: 210
  mHeight: 30
  mDepth: 5
  autoResizeBoxCollider: 0
@@ -545,6 +547,7 @@ MonoBehaviour:
  maxLen: 0
  spriteBg: {fileID: 0}
  valueIsNumber: 0
+  isPhoneNum: 0
  inValidColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
 --- !u!1 &4127901327117356546
 GameObject:
@@ -627,7 +630,7 @@ MonoBehaviour:
  topType: 1
  atlasName: atlasAllReal
  mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
-  mSpriteName: work_work_head_bg
+  mSpriteName: work_380bg
  mFillCenter: 1
  isGrayMode: 0
 --- !u!1 &6003287841620865763
@@ -759,7 +762,7 @@ MonoBehaviour:
  updateAnchors: 1
  mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1}
  mPivot: 4
-  mWidth: 166
+  mWidth: 180
  mHeight: 30
  mDepth: 5
  autoResizeBoxCollider: 0
@@ -834,6 +837,7 @@ MonoBehaviour:
  maxLen: 0
  spriteBg: {fileID: 0}
  valueIsNumber: 0
+  isPhoneNum: 0
  inValidColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
 --- !u!1 &8684106509973965091
 GameObject:
@@ -916,6 +920,6 @@ MonoBehaviour:
  topType: 1
  atlasName: atlasAllReal
  mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
-  mSpriteName: work_work_head_bg
+  mSpriteName: work_380bg
  mFillCenter: 1
  isGrayMode: 0