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

upgrade

Browse Source
This commit is contained in:
陈彬
2020-08-01 17:55:18 +08:00
parent 29a8a1dae3
commit 4435098171
160 changed files with 21247 additions and 2405 deletions
Download Patch File Download Diff File Expand all files Collapse all files

218
Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOrderDetail.prefab
View File

@@ -1038,7 +1038,7 @@ MonoBehaviour:
anchorOffset: 0
softBorderPadding: 1
renderQueue: 0
startingRenderQueue: 3003
startingRenderQueue: 3002
mClipTexture: {fileID: 0}
mAlpha: 1
mClipping: 3
@@ -1735,7 +1735,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!4 &4713050183387073493
Transform:
m_ObjectHideFlags: 0
@@ -1744,7 +1744,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 890832598992335969}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -1104.9999, y: 0, z: 0}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1467516596806451442}
@@ -1784,7 +1784,7 @@ MonoBehaviour:
pivot: 1
maxPerLine: 4
cellWidth: 283.74
cellHeight: 330
cellHeight: 420
animateSmoothly: 0
hideInactive: 1
keepWithinPanel: 0
@@ -1991,6 +1991,106 @@ MonoBehaviour:
isAppendEndingString: 0
AppendString: '...'
fontName: EmptyFont
--- !u!1 &1217192100569320354
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4601844564519845584}
- component: {fileID: 4736765470085241111}
m_Layer: 5
m_Name: Label
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4601844564519845584
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1217192100569320354}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -171.62, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1467516596806451442}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &4736765470085241111
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1217192100569320354}
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: 245
mHeight: 84
mDepth: 6
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 2.9166667
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 0}
mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
mText: "\u8FD9\u662F\u4E00\u4E2A\u9644\u4EF6\u7684\u540D\u5B57.png"
mFontSize: 42
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: 1
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 &1219081092625388845
GameObject:
m_ObjectHideFlags: 0
@@ -4705,7 +4805,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!4 &3926309906149336925
Transform:
m_ObjectHideFlags: 0
@@ -4747,7 +4847,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 446d504799d99174383957fca80713c8, type: 3}
m_Name:
m_EditorClassIdentifier:
group: 40
group: 41
activeSprite: {fileID: 1242004418260625241}
activeAnimation: {fileID: 0}
animator: {fileID: 0}
@@ -4826,7 +4926,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &4844495956727081413
Transform:
m_ObjectHideFlags: 0
@@ -5166,7 +5266,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 446d504799d99174383957fca80713c8, type: 3}
m_Name:
m_EditorClassIdentifier:
group: 40
group: 41
activeSprite: {fileID: 7874426947130662633}
activeAnimation: {fileID: 0}
animator: {fileID: 0}
@@ -7324,13 +7424,13 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 446d504799d99174383957fca80713c8, type: 3}
m_Name:
m_EditorClassIdentifier:
group: 40
group: 41
activeSprite: {fileID: 830387933739021215}
activeAnimation: {fileID: 0}
animator: {fileID: 0}
startsActive: 0
instantTween: 0
optionCanBeNone: 1
optionCanBeNone: 0
onChange: []
checkSprite: {fileID: 0}
checkAnimation: {fileID: 0}
@@ -8233,7 +8333,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 446d504799d99174383957fca80713c8, type: 3}
m_Name:
m_EditorClassIdentifier:
group: 40
group: 41
activeSprite: {fileID: 4412006351698666144}
activeAnimation: {fileID: 0}
animator: {fileID: 0}
@@ -8686,6 +8786,90 @@ MonoBehaviour:
widget: {fileID: 3672607356051103172}
offset: 50
sizeAdjust: 1
--- !u!1 &5734003362335122161
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 593301531348764212}
- component: {fileID: 4131656986972095250}
m_Layer: 5
m_Name: SpriteIcon
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &593301531348764212
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5734003362335122161}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.5, y: 1.5, z: 1}
m_Children: []
m_Father: {fileID: 1467516596806451442}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &4131656986972095250
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5734003362335122161}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, 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: 0.73178554, b: 0.0047169924, a: 1}
mPivot: 4
mWidth: 88
mHeight: 94
mDepth: 7
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 0.9361702
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: mine_me_opinion
mFillCenter: 1
isGrayMode: 0
--- !u!1 &5937965850347534896
GameObject:
m_ObjectHideFlags: 0
@@ -10697,7 +10881,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 446d504799d99174383957fca80713c8, type: 3}
m_Name:
m_EditorClassIdentifier:
group: 40
group: 41
activeSprite: {fileID: 4955119228073544552}
activeAnimation: {fileID: 0}
animator: {fileID: 0}
@@ -11614,10 +11798,12 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7988814047750342368}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -141.87, y: -0, z: 0}
m_LocalPosition: {x: -425.61, y: -0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 8958346099814627774}
- {fileID: 4601844564519845584}
- {fileID: 593301531348764212}
m_Father: {fileID: 4713050183387073493}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -11634,7 +11820,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
isPause: 0
luaPath: trCRM/upgradeRes/priority/lua/ui/cell/TRCellImage.lua
luaPath: trCRM/upgradeRes/priority/lua/ui/cell/TRCellAttachment.lua
isNeedResetAtlase: 1
--- !u!114 &615197027365497756
MonoBehaviour:
@@ -12586,7 +12772,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8804607366196574388}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 141.87, y: -0, z: 0}
m_LocalPosition: {x: -141.87, y: -420, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 5020464132629803277}
@@ -13554,7 +13740,7 @@ MonoBehaviour:
anchorOffset: 0
softBorderPadding: 1
renderQueue: 0
startingRenderQueue: 3004
startingRenderQueue: 3003
mClipTexture: {fileID: 0}
mAlpha: 1
mClipping: 3