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