This commit is contained in:
2020-07-18 21:12:14 +08:00
parent 1361db18a9
commit 33dc6cea60
214 changed files with 16596 additions and 3104 deletions

View File

@@ -151,7 +151,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 420220745163305833}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: -48.154236, z: 0}
m_LocalPosition: {x: 0, y: -48.654293, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 6406361052267521726}
@@ -1075,7 +1075,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1747138548909843324}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -177.40427, z: 0}
m_LocalPosition: {x: 0, y: -177.77928, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 5582618885866839856}
@@ -1296,6 +1296,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3}
m_Name:
m_EditorClassIdentifier:
onSelect: []
--- !u!114 &1374284702246386988
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -1900,7 +1901,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2425227412765712263}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -188.9042, z: 0}
m_LocalPosition: {x: 0, y: -777.27924, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 5247068646262692398}
@@ -3737,6 +3738,158 @@ MonoBehaviour:
isAppendEndingString: 0
AppendString: '...'
fontName: EmptyFont
--- !u!1 &5487216764156978569
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2509541483205259216}
- component: {fileID: 3489239926919154696}
- component: {fileID: 1838843289826127282}
- component: {fileID: 4460822429136587271}
- component: {fileID: 9035455709320344593}
- component: {fileID: 2085530375892443290}
m_Layer: 5
m_Name: 00000
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2509541483205259216
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5487216764156978569}
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:
- {fileID: 6755470009267612121}
m_Father: {fileID: 4600755202396098814}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &3489239926919154696
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5487216764156978569}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3}
m_Name:
m_EditorClassIdentifier:
widget: {fileID: 2085530375892443290}
offset: 50
sizeAdjust: 1
--- !u!114 &1838843289826127282
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5487216764156978569}
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/TRCellImage.lua
isNeedResetAtlase: 1
--- !u!114 &4460822429136587271
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5487216764156978569}
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!65 &9035455709320344593
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5487216764156978569}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1025, y: 500, z: 0}
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &2085530375892443290
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5487216764156978569}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d5c5ca47aa5c01740810b7c66662099f, 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: 1025
mHeight: 500
mDepth: 0
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 2.05
mType: 0
mFillDirection: 4
mFillAmount: 1
mInvert: 0
mFlip: 0
centerType: 1
leftType: 1
rightType: 1
bottomType: 1
topType: 1
mRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
mTexture: {fileID: 0}
mMat: {fileID: 0}
mShader: {fileID: 4800000, guid: e75727d9555d9d14ca51d91908c681bc, type: 3}
mBorder: {x: 0, y: 0, z: 0, w: 0}
mFixedAspect: 0
--- !u!1 &5817392990340767882
GameObject:
m_ObjectHideFlags: 0
@@ -4369,12 +4522,11 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6840166634573325542}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -350.25, z: 0}
m_LocalPosition: {x: 0, y: -938.87494, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 7870608547099953618}
- {fileID: 7657068295081712894}
- {fileID: 2296907656735151289}
m_Father: {fileID: 9092197074366352143}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -4443,6 +4595,7 @@ Transform:
- {fileID: 675396154728095867}
- {fileID: 695648132874815624}
- {fileID: 4781790433082627634}
- {fileID: 2296907656735151289}
m_Father: {fileID: 4808583122758801922}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -4650,6 +4803,139 @@ MonoBehaviour:
mSpriteName: work_work_color
mFillCenter: 1
isGrayMode: 0
--- !u!1 &7864880252234492747
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6755470009267612121}
- component: {fileID: 3531358558082589502}
- component: {fileID: 5949980243057264043}
- component: {fileID: 433959213111062007}
m_Layer: 5
m_Name: ButtonDel
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6755470009267612121
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7864880252234492747}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 470, y: 208, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2509541483205259216}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &3531358558082589502
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7864880252234492747}
m_Material: {fileID: 0}
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 100, y: 100, z: 0}
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &5949980243057264043
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7864880252234492747}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3}
m_Name:
m_EditorClassIdentifier:
tweenTarget: {fileID: 7864880252234492747}
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:
- mTarget: {fileID: 1838843289826127282}
mMethodName: uiEventDelegate
mParameters:
- obj: {fileID: 0}
field:
name: go
oneShot: 0
--- !u!114 &433959213111062007
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7864880252234492747}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3}
m_Name:
m_EditorClassIdentifier:
leftAnchor:
target: {fileID: 2509541483205259216}
relative: 1
absolute: -65
rightAnchor:
target: {fileID: 2509541483205259216}
relative: 1
absolute: -20
bottomAnchor:
target: {fileID: 2509541483205259216}
relative: 1
absolute: -65
topAnchor:
target: {fileID: 2509541483205259216}
relative: 1
absolute: -20
updateAnchors: 0
mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1}
mPivot: 4
mWidth: 45
mHeight: 45
mDepth: 5
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 1
mType: 1
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: login_log_no
mFillCenter: 1
isGrayMode: 0
--- !u!1 &7898200024377142075
GameObject:
m_ObjectHideFlags: 0
@@ -4663,14 +4949,16 @@ GameObject:
- component: {fileID: 7847741233886550698}
- component: {fileID: 3989876927114666004}
- component: {fileID: 6582611865144033048}
- component: {fileID: 5684835301358909987}
- component: {fileID: 4891233890758738143}
- component: {fileID: 8089659989952212147}
- component: {fileID: 3196188467329571094}
m_Layer: 5
m_Name: InputAttachment
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!4 &2296907656735151289
Transform:
m_ObjectHideFlags: 0
@@ -4678,8 +4966,8 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7898200024377142075}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -863.0292, z: 0}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: -1338.6248, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4096705695685564279}
@@ -4687,8 +4975,9 @@ Transform:
- {fileID: 22394276322990286}
- {fileID: 5447743745483950510}
- {fileID: 6561805268829721416}
m_Father: {fileID: 4781790433082627634}
m_RootOrder: 2
- {fileID: 4600755202396098814}
m_Father: {fileID: 9092197074366352143}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &6052790691369986581
BoxCollider:
@@ -4785,7 +5074,7 @@ MonoBehaviour:
widget: {fileID: 7847741233886550698}
offset: 0
sizeAdjust: 1
--- !u!114 &5684835301358909987
--- !u!114 &4891233890758738143
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -4794,31 +5083,91 @@ MonoBehaviour:
m_GameObject: {fileID: 7898200024377142075}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3}
m_Script: {fileID: 11500000, guid: 57e428c9b6087304da439ec665b56a2d, type: 3}
m_Name:
m_EditorClassIdentifier:
tweenTarget: {fileID: 8872996654376181753}
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:
atlasName:
atlas: {fileID: 8379920634462272047, guid: 9aea3d2b5a77f4e84bd921688ff9ca99, type: 3}
fontName:
bitmapFont: {fileID: 0}
trueTypeFont: {fileID: 12800000, guid: e49e0253465a54d1a83f684649c927ae, type: 3}
fontSize: 46
fontStyle: 0
backgroundSprite: help_chengfang
highlightSprite: help_chengfang
position: 0
alignment: 1
items:
- "\u62CD\u7167"
- "\u4ECE\u76F8\u518C\u9009\u62E9"
valueItems:
- 1
- 2
padding: {x: 4, y: 4}
textColor: {r: 1, g: 1, b: 1, a: 1}
backgroundColor: {r: 1, g: 1, b: 1, a: 1}
highlightColor: {r: 0.88235295, g: 0.78431374, b: 0.5882353, a: 1}
isAnimated: 1
isLocalized: 0
openOn: 0
onChange: []
mSelectedItem: "\u62CD\u7167"
mPanel: {fileID: 0}
mChild: {fileID: 0}
mBackground: {fileID: 0}
mHighlight: {fileID: 0}
mHighlightedLabel: {fileID: 0}
mLabelList: []
mBgBorder: 0
eventReceiver: {fileID: 0}
functionName: OnSelectionChange
textScale: 0
font: {fileID: 0}
textLabel: {fileID: 0}
--- !u!114 &8089659989952212147
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7898200024377142075}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3}
m_Name:
m_EditorClassIdentifier:
onSelect:
- mTarget: {fileID: 6896994100725352575}
mMethodName: uiEventDelegate
mParameters:
- obj: {fileID: 0}
field:
name: go
name:
oneShot: 0
--- !u!114 &3196188467329571094
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7898200024377142075}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3}
m_Name:
m_EditorClassIdentifier:
jsonKey:
formatValue:
labeName: {fileID: 0}
defaultName:
canNull: 1
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 &8174250477570590167
GameObject:
m_ObjectHideFlags: 0
@@ -4927,6 +5276,62 @@ MonoBehaviour:
scale: {x: 0, y: 0, z: 0}
relativePositionOnReset: {x: 0, y: 0}
centerOnChild: {fileID: 0}
--- !u!1 &8177775070125587863
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4600755202396098814}
- component: {fileID: 749625377866579281}
m_Layer: 5
m_Name: Grid
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4600755202396098814
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8177775070125587863}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -355, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 2509541483205259216}
m_Father: {fileID: 2296907656735151289}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &749625377866579281
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8177775070125587863}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 07c4de3b4b6fe9045b059ee627c100df, type: 3}
m_Name:
m_EditorClassIdentifier:
arrangement: 1
sorting: 1
pivot: 1
maxPerLine: 0
cellWidth: 200
cellHeight: 520
animateSmoothly: 0
hideInactive: 1
keepWithinPanel: 0
sorted: 0
oldParentPos: {x: 0, y: 0, z: 0}
oldParentClipOffset: {x: 0, y: 0}
--- !u!1 &8432021983544835164
GameObject:
m_ObjectHideFlags: 0
@@ -5040,7 +5445,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8872996654376181753}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: -685.9043, z: 0}
m_LocalPosition: {x: 0, y: -269.90417, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 3343166803441427381}