chenbin/tianrunCRM
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

upgrade

Browse Source
This commit is contained in:
陈彬
2020-08-26 19:56:45 +08:00
parent 7ff6b2ec35
commit 3ece010fc1
208 changed files with 14753 additions and 637 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelAbout.prefab
View File

@@ -223,7 +223,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2646645108189517374}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -540, z: 0}
m_LocalPosition: {x: 0, y: -515, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 3260711839874522371}
@@ -323,7 +323,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3377653670929726191}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: -332, z: 0}
m_LocalPosition: {x: 0, y: -316, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 3260711839874522371}
@@ -965,6 +965,7 @@ Transform:
- {fileID: 3377653671809927871}
- {fileID: 3377653670929726190}
- {fileID: 8615271394257052439}
- {fileID: 4988053528262719963}
m_Father: {fileID: 4885025209588052394}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1000,6 +1001,106 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
jsonKey:
--- !u!1 &8081779854385037024
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4988053528262719963}
- component: {fileID: 2440365706832355659}
m_Layer: 5
m_Name: LabelVer
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4988053528262719963
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8081779854385037024}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -588, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 3260711839874522371}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &2440365706832355659
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8081779854385037024}
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: -70
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: 68
mHeight: 36
mDepth: 7
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 1.8888888
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 0}
mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
mText: Ver.
mFontSize: 36
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 &9017457117160355037
GameObject:
m_ObjectHideFlags: 0

122
Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelBindPhone.prefab
View File

@@ -25,7 +25,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 855376729560168419}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: -80, z: 0}
m_LocalPosition: {x: 0, y: -79, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1015280428253676666}
@@ -68,7 +68,7 @@ MonoBehaviour:
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 5.283505
aspectRatio: 512.5
mType: 1
mFillDirection: 4
mFillAmount: 1
@@ -152,7 +152,7 @@ MonoBehaviour:
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 16.717392
aspectRatio: 17.717392
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 0}
mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -210,7 +210,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1856021946756555215}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -250.90424, z: 0}
m_LocalPosition: {x: 0, y: -331.77927, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 9186483317114007049}
@@ -248,12 +248,12 @@ MonoBehaviour:
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4
mWidth: 1125
mHeight: 120
mHeight: 80
mDepth: 0
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 9.375
aspectRatio: 14.0625
--- !u!114 &1757191906863240371
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -527,7 +527,7 @@ MonoBehaviour:
relative: 1
absolute: 0
updateAnchors: 0
mColor: {r: 0.16078432, g: 0.5647059, b: 0.8627451, a: 1}
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4
mWidth: 240
mHeight: 48
@@ -593,7 +593,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4725287647856906054}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -14.904231, z: 0}
m_LocalPosition: {x: 0, y: -35.654232, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 9186483317114007049}
@@ -720,7 +720,7 @@ MonoBehaviour:
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 4
aspectRatio: 3
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 0}
mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -780,12 +780,12 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5778063573903537467}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -600.15424, z: 0}
m_LocalPosition: {x: 0, y: -495.40424, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 6822603244845996868}
m_Father: {fileID: 9186483317114007049}
m_RootOrder: 5
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &8286619423820300863
BoxCollider:
@@ -884,7 +884,7 @@ MonoBehaviour:
topType: 1
atlasName: atlasAllReal
mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
mSpriteName: cust_input
mSpriteName: public_button
mFillCenter: 1
isGrayMode: 0
--- !u!114 &4418203674649347133
@@ -930,12 +930,12 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6628384052566020757}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -393.90424, z: 0}
m_LocalPosition: {x: 0, y: -702.1543, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 25182619514747478}
m_Father: {fileID: 9186483317114007049}
m_RootOrder: 3
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &4804660197840963059
BoxCollider:
@@ -1052,91 +1052,6 @@ MonoBehaviour:
widget: {fileID: 6066563728127547150}
offset: 50
sizeAdjust: 1
--- !u!1 &7629963402952867692
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1530193202203691607}
- component: {fileID: 6780650535576364556}
- component: {fileID: 6982913429036607420}
m_Layer: 5
m_Name: Empty
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1530193202203691607
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7629963402952867692}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -497.52924, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 9186483317114007049}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &6780650535576364556
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7629963402952867692}
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 &6982913429036607420
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7629963402952867692}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3}
m_Name:
m_EditorClassIdentifier:
widget: {fileID: 6780650535576364556}
offset: 0
sizeAdjust: 1
--- !u!1 &8112027019472108927
GameObject:
m_ObjectHideFlags: 0
@@ -1206,7 +1121,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}
@@ -1283,7 +1198,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8749132400234014725}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -109.904236, z: 0}
m_LocalPosition: {x: 0, y: -170.15424, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 3014698626100734380}
@@ -1541,9 +1456,8 @@ Transform:
- {fileID: 3400899160147456236}
- {fileID: 1015280428253676666}
- {fileID: 6211563138953950025}
- {fileID: 6940810193510325756}
- {fileID: 1530193202203691607}
- {fileID: 6789244682540926893}
- {fileID: 6940810193510325756}
m_Father: {fileID: 9186483318273454878}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1566,7 +1480,7 @@ MonoBehaviour:
cellAlignment: 1
hideInactive: 1
keepWithinPanel: 0
padding: {x: 0, y: 0}
padding: {x: 0, y: 20}
--- !u!114 &7283729918675215446
MonoBehaviour:
m_ObjectHideFlags: 0

2079
Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCallLogDetail.prefab Normal file
View File

File diff suppressed because it is too large Load Diff

7
Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCallLogDetail.prefab.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 9ef0bb791b85844e6be91d9d6391231f
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

2788
Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMakeCall.prefab
View File

File diff suppressed because it is too large Load Diff

2
Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMyInfor.prefab
View File

@@ -583,7 +583,7 @@ MonoBehaviour:
relative: 0
absolute: 50
rightAnchor:
target: {fileID: 0}
target: {fileID: 3303405075514652940}
relative: 1
absolute: -70
bottomAnchor:

1809
Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPopList2.prefab Normal file
View File

File diff suppressed because it is too large Load Diff

7
Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPopList2.prefab.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 649662986e9744952bed74fa881be0f7
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

18
Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSendSms.prefab
View File

@@ -181,7 +181,7 @@ MonoBehaviour:
relative: 1
absolute: 0
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mColor: {r: 0.16078432, g: 0.5647059, b: 0.8627451, a: 1}
mPivot: 4
mWidth: 200
mHeight: 50
@@ -1329,7 +1329,7 @@ MonoBehaviour:
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 0}
mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
mText: "\u586B\u5199"
mText: "\u8F93\u5165\u77ED\u4FE1\u5185\u5BB9"
mFontSize: 46
mFontStyle: 0
mAlignment: 0
@@ -1467,7 +1467,7 @@ MonoBehaviour:
relative: 1
absolute: 0
updateAnchors: 0
mColor: {r: 0.16078432, g: 0.5647059, b: 0.8627451, a: 1}
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4
mWidth: 1025
mHeight: 170
@@ -1488,7 +1488,7 @@ MonoBehaviour:
topType: 1
atlasName: EmptyAtlas
mAtlas: {fileID: 8379920634462272047, guid: 9aea3d2b5a77f4e84bd921688ff9ca99, type: 3}
mSpriteName: news_news_bg
mSpriteName: cust_input
mFillCenter: 1
isGrayMode: 0
--- !u!1 &6290011794568244053
@@ -1601,7 +1601,7 @@ MonoBehaviour:
relative: 1
absolute: 0
updateAnchors: 0
mColor: {r: 0.16078432, g: 0.5647059, b: 0.8627451, a: 1}
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4
mWidth: 1025
mHeight: 170
@@ -1622,7 +1622,7 @@ MonoBehaviour:
topType: 1
atlasName: EmptyAtlas
mAtlas: {fileID: 8379920634462272047, guid: 9aea3d2b5a77f4e84bd921688ff9ca99, type: 3}
mSpriteName: news_news_bg
mSpriteName: cust_input
mFillCenter: 1
isGrayMode: 0
--- !u!1 &7548190000912478483
@@ -1819,7 +1819,7 @@ MonoBehaviour:
relative: 1
absolute: 0
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mColor: {r: 0.16078432, g: 0.5647059, b: 0.8627451, a: 1}
mPivot: 4
mWidth: 200
mHeight: 50
@@ -2185,8 +2185,8 @@ MonoBehaviour:
onSelect: []
onDeselect: []
onClick:
- mTarget: {fileID: 0}
mMethodName: OnClickClose
- mTarget: {fileID: 5889273149151931255}
mMethodName: uiEventDelegate
mParameters:
- obj: {fileID: 0}
field:

8
Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSysMsgList.prefab
View File

@@ -703,11 +703,11 @@ MonoBehaviour:
mPivot: 4
mWidth: 1126
mHeight: 2173
mDepth: -4
autoResizeBoxCollider: 0
mDepth: 0
autoResizeBoxCollider: 1
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 1
aspectRatio: 0.5181776
mType: 1
mFillDirection: 4
mFillAmount: 1
@@ -734,7 +734,7 @@ BoxCollider:
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Size: {x: 1126, y: 2173, z: 0}
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &7194414352345552083
MonoBehaviour: