修改优化了若干功能

master
lz 6 years ago
parent 7cdf90659b
commit 3434855650

@ -3,9 +3,10 @@
--- !u!1 &110870
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 5
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 22479254}
m_Layer: 5
@ -15,12 +16,32 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &22479254
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 110870}
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: 22430156}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &122358
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 5
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 22402020}
m_Layer: 5
@ -30,12 +51,32 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &22402020
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 122358}
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: 22430156}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &152868
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 5
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 22430156}
- component: {fileID: 22378338}
@ -48,12 +89,96 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &22430156
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 152868}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children:
- {fileID: 22402020}
- {fileID: 22486196}
- {fileID: 22479254}
- {fileID: 431540}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!223 &22378338
Canvas:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 152868}
m_Enabled: 1
serializedVersion: 3
m_RenderMode: 1
m_Camera: {fileID: 2010612}
m_PlaneDistance: 100
m_PixelPerfect: 1
m_ReceivesEvents: 1
m_OverrideSorting: 0
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_AdditionalShaderChannelsFlag: 25
m_SortingLayerID: 0
m_SortingOrder: 0
m_TargetDisplay: 0
--- !u!114 &11450268
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 152868}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name:
m_EditorClassIdentifier:
m_UiScaleMode: 1
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 1920, y: 1080}
m_ScreenMatchMode: 0
m_MatchWidthOrHeight: 1
m_PhysicalUnit: 3
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
--- !u!114 &11498912
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 152868}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1301386320, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreReversedGraphics: 1
m_BlockingObjects: 0
m_BlockingMask:
serializedVersion: 2
m_Bits: 4294967295
--- !u!1 &156222
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 5
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 431540}
- component: {fileID: 2010612}
@ -64,26 +189,12 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &185744
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 5
m_Component:
- component: {fileID: 22486196}
m_Layer: 5
m_Name: NormalRoot
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &431540
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 156222}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -6400.001}
@ -94,14 +205,20 @@ Transform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!20 &2010612
Camera:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 156222}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 3
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0.019607844}
m_projectionMatrixMode: 1
m_SensorSize: {x: 36, y: 24}
m_LensShift: {x: 0, y: 0}
m_GateFitMode: 2
m_FocalLength: 50
m_NormalizedViewPortRect:
serializedVersion: 2
x: 0
@ -123,131 +240,33 @@ Camera:
m_TargetEye: 3
m_HDR: 0
m_AllowMSAA: 1
m_AllowDynamicResolution: 0
m_ForceIntoRT: 0
m_OcclusionCulling: 1
m_StereoConvergence: 10
m_StereoSeparation: 0.022
m_StereoMirrorMode: 0
--- !u!114 &11450268
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 152868}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name:
m_EditorClassIdentifier:
m_UiScaleMode: 1
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 1136, y: 640}
m_ScreenMatchMode: 1
m_MatchWidthOrHeight: 1
m_PhysicalUnit: 3
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
--- !u!114 &11498912
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 152868}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1301386320, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreReversedGraphics: 1
m_BlockingObjects: 0
m_BlockingMask:
serializedVersion: 2
m_Bits: 4294967295
--- !u!223 &22378338
Canvas:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 152868}
m_Enabled: 1
serializedVersion: 3
m_RenderMode: 1
m_Camera: {fileID: 2010612}
m_PlaneDistance: 100
m_PixelPerfect: 1
m_ReceivesEvents: 1
m_OverrideSorting: 0
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_AdditionalShaderChannelsFlag: 25
m_SortingLayerID: 0
m_SortingOrder: 0
m_TargetDisplay: 0
--- !u!224 &22402020
RectTransform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 122358}
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: 22430156}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &22430156
RectTransform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 152868}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children:
- {fileID: 22402020}
- {fileID: 22486196}
- {fileID: 22479254}
- {fileID: 431540}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!224 &22479254
RectTransform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 110870}
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: 22430156}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &185744
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 22486196}
m_Layer: 5
m_Name: NormalRoot
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &22486196
RectTransform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 185744}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
@ -261,14 +280,3 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1001 &100100000
Prefab:
m_ObjectHideFlags: 1
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications: []
m_RemovedComponents: []
m_ParentPrefab: {fileID: 0}
m_RootGameObject: {fileID: 152868}
m_IsPrefabParent: 1

@ -46,7 +46,7 @@ TextureImporter:
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteBorder: {x: 29, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1

@ -605,6 +605,7 @@ MonoBehaviour:
spareModels:
- name: 01
modelGo: {fileID: 6642087463836497710}
curSpareControl: {fileID: 0}
--- !u!1 &756595857
GameObject:
m_ObjectHideFlags: 0
@ -4223,6 +4224,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 38b5d20a5c3500247a5a448357e16e18, type: 3}
m_Name:
m_EditorClassIdentifier:
mainGo: {fileID: 9163144242709902009}
_type: 3
OnLoadFinishHandle:
m_PersistentCalls:
@ -4232,7 +4234,6 @@ MonoBehaviour:
m_Calls: []
cameraViewVal: 24
showPlatformAngle: {x: 2.898, y: -4.42, z: 5.234}
mainGo: {fileID: 9163144242709902009}
unloadTipGo: {fileID: 145032004}
loadTipGo: {fileID: 1359599460}
mainShowPos: {x: 0.785, y: 0, z: 0}
@ -4257,6 +4258,13 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
type: 3
spareInfo:
name:
simpleInfoStr:
detailInfoStr:
texture: {fileID: 0}
type: 0
fitId: 0
triggerGo: {fileID: 5539784717164460414}
mainSpareGos:
- {fileID: 9163144242709902009}
@ -4347,6 +4355,13 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
type: 1
spareInfo:
name:
simpleInfoStr:
detailInfoStr:
texture: {fileID: 0}
type: 0
fitId: 0
triggerGo: {fileID: 1868775985}
mainSpareGos:
- {fileID: 9163144242168808913}
@ -4368,6 +4383,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 16dec4aeecc01af44aec51429d3720ea, type: 3}
m_Name:
m_EditorClassIdentifier:
mainGo: {fileID: 9163144242168808913}
_type: 1
OnLoadFinishHandle:
m_PersistentCalls:
@ -4379,7 +4395,6 @@ MonoBehaviour:
showPlatformAngle: {x: 2.538, y: 9.376, z: 3.1}
unLoadTipGo: {fileID: 1389054387}
loadTipGo: {fileID: 196003342}
mainGo: {fileID: 9163144242168808913}
mainShowPos: {x: 0.75, y: 0, z: 0}
mainInitPos: {x: 0, y: 0, z: 0}
buckle01Go: {fileID: 9163144241489577375}
@ -4524,7 +4539,6 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 4576898897665800761}
- component: {fileID: 1785942545}
- component: {fileID: 8333038510341081627}
m_Layer: 10
m_Name: YingPan
@ -4550,28 +4564,6 @@ Transform:
m_Father: {fileID: 8300562099907915444}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1785942545
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2367747429921389282}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fef940882c389124cb585d3636976b73, type: 3}
m_Name:
m_EditorClassIdentifier:
type: 2
triggerGo: {fileID: 8742445646176451757}
mainSpareGos:
- {fileID: 9163144242598378786}
- {fileID: 9163144243017738108}
- {fileID: 9163144242911092660}
outLineColor: {r: 0.9716981, g: 0.49611017, b: 0.050418302, a: 1}
loadOutLineColor: {r: 0.039215688, g: 1, b: 0, a: 1}
spareAnimation: {fileID: 8333038510341081627}
arrowTagTargte: {fileID: 2365748199042526786}
--- !u!114 &8333038510341081627
MonoBehaviour:
m_ObjectHideFlags: 0
@ -4584,6 +4576,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c94c73855766d174fb294e9cf3301d39, type: 3}
m_Name:
m_EditorClassIdentifier:
mainGo: {fileID: 0}
_type: 2
OnLoadFinishHandle:
m_PersistentCalls:
@ -4600,7 +4593,6 @@ MonoBehaviour:
point: {x: 0, y: -0.111, z: -0.388}
- info: end
point: {x: 0.733, y: -0.111, z: -0.388}
yingPanGo: {fileID: 9163144242911092660}
luosiTran: {fileID: 863066692}
showDis: {x: 0.387, y: 0, z: 0}
--- !u!1 &2474404535910525974
@ -5018,6 +5010,13 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
type: 0
spareInfo:
name:
simpleInfoStr:
detailInfoStr:
texture: {fileID: 0}
type: 0
fitId: 0
triggerGo: {fileID: 1957272509}
mainSpareGos:
- {fileID: 9163144242714409203}
@ -5037,6 +5036,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 13c736b39a014b54d8dfd681d722a689, type: 3}
m_Name:
m_EditorClassIdentifier:
mainGo: {fileID: 9163144242714409191}
_type: 0
OnLoadFinishHandle:
m_PersistentCalls:
@ -5046,7 +5046,6 @@ MonoBehaviour:
m_Calls: []
cameraViewVal: 56
showPlatformAngle: {x: -0.299, y: 26.595, z: -0.556}
mainGo: {fileID: 9163144242714409191}
mainShowPos: {x: 1, y: -0.01989967, z: 0.021}
mainInitPos: {x: 0.209, y: -0.01989967, z: 0.021}
buckleGo: {fileID: 9163144242714409203}
@ -5193,6 +5192,13 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
type: 7
spareInfo:
name:
simpleInfoStr:
detailInfoStr:
texture: {fileID: 0}
type: 0
fitId: 0
triggerGo: {fileID: 8739381507706859567}
mainSpareGos:
- {fileID: 9163144241489577367}
@ -5216,6 +5222,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 8c338b06ac256a34aaa88abfa590f20e, type: 3}
m_Name:
m_EditorClassIdentifier:
mainGo: {fileID: 0}
_type: 7
OnLoadFinishHandle:
m_PersistentCalls:
@ -5239,8 +5246,6 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 9202789973977951070}
- component: {fileID: 1805522222}
- component: {fileID: 1805522221}
m_Layer: 10
m_Name: GuangQu
m_TagString: Untagged
@ -5265,59 +5270,6 @@ Transform:
m_Father: {fileID: 1530337720467772310}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1805522222
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7740976917833700955}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fef940882c389124cb585d3636976b73, type: 3}
m_Name:
m_EditorClassIdentifier:
type: 6
triggerGo: {fileID: 1633133847082350818}
mainSpareGos:
- {fileID: 9163144242244900042}
- {fileID: 9163144242574092212}
- {fileID: 9163144242819087765}
outLineColor: {r: 0.9716981, g: 0.49611017, b: 0.050418302, a: 1}
loadOutLineColor: {r: 0.039215688, g: 1, b: 0, a: 1}
spareAnimation: {fileID: 1805522221}
arrowTagTargte: {fileID: 6238125782213291709}
--- !u!114 &1805522221
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7740976917833700955}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c94c73855766d174fb294e9cf3301d39, type: 3}
m_Name:
m_EditorClassIdentifier:
_type: 6
OnLoadFinishHandle:
m_PersistentCalls:
m_Calls: []
OnUnLoadFinishHandle:
m_PersistentCalls:
m_Calls: []
cameraViewVal: 45
showPlatformAngle: {x: 8.529, y: 26.685, z: 18.326}
pointConfigs:
- info: start
point: {x: 0, y: 0, z: 0}
- info: center
point: {x: 0, y: 0, z: -0.376}
- info: end
point: {x: 0.733, y: 0, z: -0.376}
yingPanGo: {fileID: 9163144242244900042}
luosiTran: {fileID: 1570263196}
showDis: {x: 0.387, y: 0, z: 0}
--- !u!1 &8290893078547655195
GameObject:
m_ObjectHideFlags: 0
@ -5367,6 +5319,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 7c276db163530a74ba47c734fd9b315c, type: 3}
m_Name:
m_EditorClassIdentifier:
mainGo: {fileID: 9163144241057716762}
_type: 4
OnLoadFinishHandle:
m_PersistentCalls:
@ -5376,7 +5329,6 @@ MonoBehaviour:
m_Calls: []
cameraViewVal: 22
showPlatformAngle: {x: -36.288, y: 18.061, z: 3.517}
mainGo: {fileID: 9163144241057716762}
unLoadTipGo: {fileID: 6319823}
loadTipGo: {fileID: 123885052}
mainShowPos: {x: 0.65, y: 0, z: 0}
@ -5401,6 +5353,13 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
type: 4
spareInfo:
name:
simpleInfoStr:
detailInfoStr:
texture: {fileID: 0}
type: 0
fitId: 0
triggerGo: {fileID: 2977374446687143236}
mainSpareGos:
- {fileID: 9163144241489577363}
@ -5456,6 +5415,13 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
type: 5
spareInfo:
name:
simpleInfoStr:
detailInfoStr:
texture: {fileID: 0}
type: 0
fitId: 0
triggerGo: {fileID: 7257305765621826254}
mainSpareGos:
- {fileID: 9163144242210977203}
@ -5475,6 +5441,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: bc87c1a648a21b5409048ba7cc35eb98, type: 3}
m_Name:
m_EditorClassIdentifier:
mainGo: {fileID: 0}
_type: 5
OnLoadFinishHandle:
m_PersistentCalls:
@ -5486,7 +5453,6 @@ MonoBehaviour:
showPlatformAngle: {x: 8.529, y: 26.685, z: 18.326}
showPos: {x: 0.5, y: 0, z: 0}
initPos: {x: 0, y: 0, z: 0}
dianYuanGo: {fileID: 9163144242210977203}
--- !u!1 &8739381507706859567
GameObject:
m_ObjectHideFlags: 0
@ -5757,7 +5723,7 @@ MonoBehaviour:
- type: 1
control: {fileID: 761662959}
- type: 2
control: {fileID: 1785942545}
control: {fileID: 0}
- type: 3
control: {fileID: 1437774535}
- type: 4
@ -5765,7 +5731,7 @@ MonoBehaviour:
- type: 5
control: {fileID: 1726903471}
- type: 6
control: {fileID: 1805522222}
control: {fileID: 0}
- type: 7
control: {fileID: 1277270403}
spareContainerInfos: []
@ -6139,21 +6105,15 @@ GameObject:
type: 3}
m_PrefabInstance: {fileID: 9163144241489543991}
m_PrefabAsset: {fileID: 0}
--- !u!4 &9163144241489156535 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 400000, guid: 42d21baf237bc374ab9d78985d449702,
type: 3}
m_PrefabInstance: {fileID: 9163144241489543991}
m_PrefabAsset: {fileID: 0}
--- !u!1 &9163144241489577363 stripped
--- !u!1 &9163144241489577369 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 100004, guid: 42d21baf237bc374ab9d78985d449702,
m_CorrespondingSourceObject: {fileID: 100014, guid: 42d21baf237bc374ab9d78985d449702,
type: 3}
m_PrefabInstance: {fileID: 9163144241489543991}
m_PrefabAsset: {fileID: 0}
--- !u!1 &9163144241489577369 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 100014, guid: 42d21baf237bc374ab9d78985d449702,
--- !u!4 &9163144241489156543 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 400008, guid: 42d21baf237bc374ab9d78985d449702,
type: 3}
m_PrefabInstance: {fileID: 9163144241489543991}
m_PrefabAsset: {fileID: 0}
@ -6163,15 +6123,21 @@ GameObject:
type: 3}
m_PrefabInstance: {fileID: 9163144241489543991}
m_PrefabAsset: {fileID: 0}
--- !u!1 &9163144241489577367 stripped
--- !u!1 &9163144241489577363 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 100000, guid: 42d21baf237bc374ab9d78985d449702,
m_CorrespondingSourceObject: {fileID: 100004, guid: 42d21baf237bc374ab9d78985d449702,
type: 3}
m_PrefabInstance: {fileID: 9163144241489543991}
m_PrefabAsset: {fileID: 0}
--- !u!4 &9163144241489156543 stripped
--- !u!4 &9163144241489156535 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 400008, guid: 42d21baf237bc374ab9d78985d449702,
m_CorrespondingSourceObject: {fileID: 400000, guid: 42d21baf237bc374ab9d78985d449702,
type: 3}
m_PrefabInstance: {fileID: 9163144241489543991}
m_PrefabAsset: {fileID: 0}
--- !u!1 &9163144241489577367 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 100000, guid: 42d21baf237bc374ab9d78985d449702,
type: 3}
m_PrefabInstance: {fileID: 9163144241489543991}
m_PrefabAsset: {fileID: 0}
@ -6645,12 +6611,6 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 9163144242244997738}
m_PrefabAsset: {fileID: 0}
--- !u!1 &9163144242244900042 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 100000, guid: 65d2b573559d82c40be86c718d00d1ec,
type: 3}
m_PrefabInstance: {fileID: 9163144242244997738}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &9163144242574057748
PrefabInstance:
m_ObjectHideFlags: 0
@ -6714,12 +6674,6 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 9163144242574057748}
m_PrefabAsset: {fileID: 0}
--- !u!1 &9163144242574092212 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 100000, guid: b4dd039a8e054504daceeeed463e88fe,
type: 3}
m_PrefabInstance: {fileID: 9163144242574057748}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &9163144242598280066
PrefabInstance:
m_ObjectHideFlags: 0
@ -6777,12 +6731,6 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b4dd039a8e054504daceeeed463e88fe, type: 3}
--- !u!1 &9163144242598378786 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 100000, guid: b4dd039a8e054504daceeeed463e88fe,
type: 3}
m_PrefabInstance: {fileID: 9163144242598280066}
m_PrefabAsset: {fileID: 0}
--- !u!4 &9163144242598142210 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 400000, guid: b4dd039a8e054504daceeeed463e88fe,
@ -6939,18 +6887,18 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c0e454a8ec264c74ab545cc02e6bbbff, type: 3}
--- !u!1 &9163144242709902009 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 100000, guid: c0e454a8ec264c74ab545cc02e6bbbff,
type: 3}
m_PrefabInstance: {fileID: 9163144242709804057}
m_PrefabAsset: {fileID: 0}
--- !u!4 &9163144242709933721 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 400000, guid: c0e454a8ec264c74ab545cc02e6bbbff,
type: 3}
m_PrefabInstance: {fileID: 9163144242709804057}
m_PrefabAsset: {fileID: 0}
--- !u!1 &9163144242709902009 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 100000, guid: c0e454a8ec264c74ab545cc02e6bbbff,
type: 3}
m_PrefabInstance: {fileID: 9163144242709804057}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &9163144242714508867
PrefabInstance:
m_ObjectHideFlags: 0
@ -7056,9 +7004,9 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 532ca58e9a3ed2742a13dee907ed9b4e, type: 3}
--- !u!4 &9163144242714895555 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 400000, guid: 532ca58e9a3ed2742a13dee907ed9b4e,
--- !u!1 &9163144242714409203 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 100016, guid: 532ca58e9a3ed2742a13dee907ed9b4e,
type: 3}
m_PrefabInstance: {fileID: 9163144242714508867}
m_PrefabAsset: {fileID: 0}
@ -7068,9 +7016,9 @@ GameObject:
type: 3}
m_PrefabInstance: {fileID: 9163144242714508867}
m_PrefabAsset: {fileID: 0}
--- !u!1 &9163144242714409203 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 100016, guid: 532ca58e9a3ed2742a13dee907ed9b4e,
--- !u!4 &9163144242714895555 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 400000, guid: 532ca58e9a3ed2742a13dee907ed9b4e,
type: 3}
m_PrefabInstance: {fileID: 9163144242714508867}
m_PrefabAsset: {fileID: 0}
@ -7131,18 +7079,18 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b4dd039a8e054504daceeeed463e88fe, type: 3}
--- !u!4 &9163144242786935301 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 400000, guid: b4dd039a8e054504daceeeed463e88fe,
type: 3}
m_PrefabInstance: {fileID: 9163144242787072133}
m_PrefabAsset: {fileID: 0}
--- !u!1 &9163144242787040805 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 100000, guid: b4dd039a8e054504daceeeed463e88fe,
type: 3}
m_PrefabInstance: {fileID: 9163144242787072133}
m_PrefabAsset: {fileID: 0}
--- !u!4 &9163144242786935301 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 400000, guid: b4dd039a8e054504daceeeed463e88fe,
type: 3}
m_PrefabInstance: {fileID: 9163144242787072133}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &9163144242818988853
PrefabInstance:
m_ObjectHideFlags: 0
@ -7200,12 +7148,6 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b4dd039a8e054504daceeeed463e88fe, type: 3}
--- !u!1 &9163144242819087765 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 100000, guid: b4dd039a8e054504daceeeed463e88fe,
type: 3}
m_PrefabInstance: {fileID: 9163144242818988853}
m_PrefabAsset: {fileID: 0}
--- !u!4 &9163144242818851253 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 400000, guid: b4dd039a8e054504daceeeed463e88fe,
@ -7273,12 +7215,6 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 06b7880ff6894e646aa656e267f8980a, type: 3}
--- !u!1 &9163144242911092660 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 100000, guid: 06b7880ff6894e646aa656e267f8980a,
type: 3}
m_PrefabInstance: {fileID: 9163144242910992660}
m_PrefabAsset: {fileID: 0}
--- !u!4 &9163144242911380372 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 400000, guid: 06b7880ff6894e646aa656e267f8980a,
@ -7348,9 +7284,3 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 9163144243017769436}
m_PrefabAsset: {fileID: 0}
--- !u!1 &9163144243017738108 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 100000, guid: b4dd039a8e054504daceeeed463e88fe,
type: 3}
m_PrefabInstance: {fileID: 9163144243017769436}
m_PrefabAsset: {fileID: 0}

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 08f8975a79023a14b9d4e035cc1fb551
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 34 KiB

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: 48eb37c5f2584564c8985b3d992d8546
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: -1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: a9a94b35a6ba6b14180a9f845bc9846d
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 314dda7375b9fe3458cfca622893cfd2
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

@ -31,6 +31,9 @@ namespace DisComputer
public GameObject lock01Go;
private CpuDetailAni curCpuAni;
// Start is called before the first frame update
@ -71,8 +74,10 @@ namespace DisComputer
loadTipGo.SetActive(false);
buckleGo.SetActive(true);
mainGo.SetActive(true);
curCpuAni = mainGo.GetComponent<CpuDetailAni>();
curCpuAni.SetUnLoadState();
buckleGo.transform.localEulerAngles = closeEuler;
mainGo.transform.localPosition = mainInitPos;
//mainGo.transform.localPosition = mainInitPos;
}
@ -81,9 +86,13 @@ namespace DisComputer
unLoadTipGo.SetActive(false);
loadTipGo.SetActive(false);
buckleGo.SetActive(false);
curCpuAni = mainGo.GetComponent<CpuDetailAni>();
curCpuAni.SetLoadState();
mainGo.SetActive(false);
buckleGo.transform.localEulerAngles = openEuler;
mainGo.transform.localPosition = mainShowPos;
//mainGo.transform.localPosition = mainShowPos;
}
public override bool IsCompareTag(object data)
@ -165,7 +174,14 @@ namespace DisComputer
yield return new WaitForSeconds(0.50f);
unLoadTipGo.SetActive(false);
mainGo.transform.DOLocalMove(mainShowPos, 0.5f).SetDelay(0.5f).SetEase(Ease.Linear).OnComplete(() => {
yield return StartCoroutine(curCpuAni.UnloadProgress());
OnUnLoadFinishHandle?.Invoke();
mainGo.SetActive(false);
RewindCameraView();
/*mainGo.transform.DOLocalMove(mainShowPos, 0.5f).SetDelay(0.5f).SetEase(Ease.Linear).OnComplete(() => {
CommonTool.WaitTimeAfterDo(this, .350f, () =>
{
@ -173,7 +189,7 @@ namespace DisComputer
mainGo.SetActive(false);
RewindCameraView();
});
});
});*/
}
@ -187,8 +203,11 @@ namespace DisComputer
buckleGo.SetActive(true);
mainGo.SetActive(true);
mainGo.transform.DOLocalMove(mainInitPos, 0.5f).SetEase(Ease.Linear).OnComplete(() => {
});
yield return StartCoroutine(curCpuAni.LoadProgress());
/*mainGo.transform.DOLocalMove(mainInitPos, 0.5f).SetEase(Ease.Linear).OnComplete(() => {
});*/
while (true)
{

@ -0,0 +1,95 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using DG.Tweening;
namespace DisComputer
{
/// <summary>
/// Cpu细致动画拆分
/// </summary>
public class CpuDetailAni : MonoBehaviour
{
//散热
public Transform fan_Tran;
//散热开始位置
public Vector3 fanStart_pos;
//散热结束位置
public Vector3 fanEnd_pos;
//Cpu
public Transform cpu_Tran;
//cpu开始位置
public Vector3 cpuStart_pos;
//cpu结束位置
public Vector3 cpuEnd_pos;
/// <summary>
/// 设置拆状态
/// </summary>
public void SetUnLoadState()
{
fan_Tran.localPosition = fanStart_pos;
cpu_Tran.localPosition = cpuStart_pos;
Debug.LogFormat("*************** > Set Unload Cpu");
}
/// <summary>
/// 设置安装状态
/// </summary>
public void SetLoadState()
{
Debug.LogFormat("*************** > Set Load Cpu");
fan_Tran.localPosition = fanEnd_pos;
cpu_Tran.localPosition = cpuEnd_pos;
}
/// <summary>
/// 安装加载
/// </summary>
/// <returns></returns>
public IEnumerator LoadProgress()
{
Sequence sequence = DOTween.Sequence();
sequence.Append(cpu_Tran.DOLocalMove(cpuStart_pos, 0.5f)).SetDelay(0.5f)
.Append(fan_Tran.DOLocalMove(fanStart_pos, 0.5f));
yield return new WaitForSeconds(2.5f);
}
/// <summary>
/// 拆解加载
/// </summary>
/// <returns></returns>
public IEnumerator UnloadProgress()
{
Sequence sequence = DOTween.Sequence();
sequence.Append(fan_Tran.DOLocalMove(fanEnd_pos, 0.5f)).SetDelay(0.5f)
.Append(cpu_Tran.DOLocalMove(cpuEnd_pos, 0.5f));
yield return new WaitForSeconds(2.5f);
}
}
}

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 931b95d92f1eb804281154d825c6b6cb
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

@ -0,0 +1,192 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using DG.Tweening;
namespace DisComputer
{
/// <summary>
/// 光驱动画
/// </summary>
public class GuangQuAnimation : SpareAnimationBase
{
[Header("动画路径")]
public List<AnimationPointConfig> pointConfigs;
//螺丝
public Transform luosiTran;
//显示距离
public Vector3 showDis;
// Start is called before the first frame update
void Start()
{
}
public override void SetLoadState()
{
mainGo.SetActive(true);
if (luosiTran != null)
{
luosiTran.gameObject.SetActive(true);
luosiTran.localPosition = Vector3.zero;
}
mainGo.transform.localPosition = pointConfigs[0].point;
}
public override void SetUnloadState()
{
mainGo.SetActive(false);
mainGo.transform.localPosition = pointConfigs[2].point;
if (luosiTran != null)
{
luosiTran.gameObject.SetActive(false);
luosiTran.localPosition = showDis;
}
}
public override bool IsCompareTag(object data)
{
if (GameConfig.state == GameState.Unload)
{
ToolType toolType = ToolType.Hand;
ToolItem item = (ToolItem)data;
if (item.toolType == toolType)
{
return true;
}
CoolPointTip("请使用合适的工具");
return false;
}
else
{
Grid grid = (Grid)data;
if (grid.type == _type)
{
return true;
}
CoolPointTip("请选择正确的零件");
return false;
}
}
public override void OnUnLoadAct()
{
base.OnUnLoadAct();
StartCoroutine(UnloadFocuse());
}
public override void OnLoadAct()
{
base.OnLoadAct();
StartCoroutine(LoadFocuse());
}
protected override IEnumerator UnloadFocuse()
{
if (luosiTran != null)
{
BoltDriver driver = luosiTran.GetComponent<BoltDriver>();
luosiTran.gameObject.SetActive(true);
yield return StartCoroutine(driver.RotationLouSi());
luosiTran.DOLocalMove(showDis, 0.35f).SetEase(Ease.Linear).OnComplete(() => {
Sequence sequence = DOTween.Sequence();
sequence.Append(mainGo.transform.DOLocalMove(pointConfigs[0].point, 0.4f).SetEase(Ease.Linear)).SetDelay(0.3f)
.Append(mainGo.transform.DOLocalMove(pointConfigs[1].point, 0.4f).SetEase(Ease.Linear)).SetDelay(0.2f)
.Append(mainGo.transform.DOLocalMove(pointConfigs[2].point, 0.4f).SetEase(Ease.Linear)).OnComplete(() =>
{
CommonTool.WaitTimeAfterDo(this, .35f, () => {
OnUnLoadFinishHandle?.Invoke();
mainGo.SetActive(false);
luosiTran.gameObject.SetActive(false);
RewindCameraView();
});
});
});
}
else
{
Sequence sequence = DOTween.Sequence();
sequence.Append(mainGo.transform.DOLocalMove(pointConfigs[0].point, 0.4f).SetEase(Ease.Linear)).SetDelay(0.3f)
.Append(mainGo.transform.DOLocalMove(pointConfigs[1].point, 0.4f).SetEase(Ease.Linear)).SetDelay(0.2f)
.Append(mainGo.transform.DOLocalMove(pointConfigs[2].point, 0.4f).SetEase(Ease.Linear)).OnComplete(() =>
{
CommonTool.WaitTimeAfterDo(this, .35f, () => {
OnUnLoadFinishHandle?.Invoke();
mainGo.SetActive(false);
RewindCameraView();
});
});
}
}
protected override IEnumerator LoadFocuse()
{
mainGo.SetActive(true);
Sequence sequence = DOTween.Sequence();
sequence.Append(mainGo.transform.DOLocalMove(pointConfigs[2].point, 0.4f).SetEase(Ease.Linear))
.Append(mainGo.transform.DOLocalMove(pointConfigs[1].point, 0.4f).SetEase(Ease.Linear))
.Append(mainGo.transform.DOLocalMove(pointConfigs[0].point, 0.4f).SetEase(Ease.Linear)).OnComplete(() =>
{
if (luosiTran != null)
{
luosiTran.gameObject.SetActive(true);
luosiTran.DOLocalMove(Vector3.zero, 0.35f).SetEase(Ease.Linear).SetDelay(0.3f).OnComplete(() =>
{
});
}
});
yield return new WaitForSeconds(1.8f);
if (luosiTran != null)
{
BoltDriver driver = luosiTran.GetComponent<BoltDriver>();
luosiTran.gameObject.SetActive(true);
yield return StartCoroutine(driver.RotationLouSi());
}
OnLoadFinishHandle?.Invoke();
LzFramework.UI.TTUIPage.ShowPage<SparePartsView>();
RewindCameraView();
}
}
}

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: d12799b4507c9024a9452e63bab15894
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

@ -15,6 +15,7 @@ namespace DisComputer
//模型配置
public SpareModelConfig config;
//85295053
[HideInInspector]
//当前模型控制
public SpareItemControl curSpareControl;

@ -30,10 +30,7 @@ namespace DisComputer
MouseControl.Instance.SpareLoading(() =>
{
StartCoroutine(ProgressLoad());
StartCoroutine(ProgressLoad());
});
}
else
@ -61,11 +58,12 @@ namespace DisComputer
{
MouseControl.Instance.ToolLoading(() =>
{
spareAnimation.OnUnLoadAct();
/*spareAnimation.OnUnLoadAct();
triggerGo.SetActive(false);
HideArrowTip();
type = SpareType.Null;
type = SpareType.Null;*/
StartCoroutine(ProgressUnload());
});
}
@ -81,7 +79,9 @@ namespace DisComputer
int[] randomEugles = { 30,60,90,-30,-60,90};
int eulerX;
int eulerZ;
int eulerY;
GameObject uiGo;
/// <summary>
/// 安装流程
@ -92,8 +92,9 @@ namespace DisComputer
yield return StartCoroutine(spareAnimation.ProgressFocuse());
spareAnimation.mainGo.SetActive(true);
spareAnimation.mainGo.transform.localEulerAngles = new Vector3(0,0,randomEugles[Random.Range(0, randomEugles.Length)]);
eulerX = (int)spareAnimation.mainGo.transform.localEulerAngles.x;
eulerY = (int)spareAnimation.mainGo.transform.localEulerAngles.y;
spareAnimation.mainGo.transform.localEulerAngles = new Vector3(eulerX, eulerY, randomEugles[Random.Range(0, randomEugles.Length)]);
uiGo = Instantiate(controlUIGo);
uiGo.SetActive(true);
@ -104,6 +105,23 @@ namespace DisComputer
}
/// <summary>
/// 拆解流程
/// </summary>
/// <returns></returns>
IEnumerator ProgressUnload()
{
yield return StartCoroutine(spareAnimation.ProgressFocuse());
spareAnimation.OnUnLoadAct();
triggerGo.SetActive(false);
HideArrowTip();
type = SpareType.Null;
}
bool isCanRot;
void OnRotLeft()
@ -113,12 +131,14 @@ namespace DisComputer
return;
isCanRot = true;
int eulerZ = (int)spareAnimation.mainGo.transform.localEulerAngles.z + 30;
spareAnimation.mainGo.transform.DOLocalRotate(new Vector3(0, 0, eulerZ), 0.2f).OnComplete(()=>
eulerZ = (int)spareAnimation.mainGo.transform.localEulerAngles.z + 30;
spareAnimation.mainGo.transform.DOLocalRotate(new Vector3(eulerX, eulerY, eulerZ), 0.2f, RotateMode.FastBeyond360).OnComplete(()=>
{
isCanRot = false;
if (eulerZ == 0)
//Debug.LogFormat("Left >>> {0}", eulerZ);
if (eulerZ == 0.0f || eulerZ == 360.0f)
{
spareAnimation.mainGo.GetComponent<Outline>().OutlineColor = loadOutLineColor;
}
@ -131,19 +151,18 @@ namespace DisComputer
void OnRotRight()
{
//Debug.LogFormat("rotation right 30");
if (isCanRot)
return;
isCanRot = true;
int eulerZ = (int)spareAnimation.mainGo.transform.localEulerAngles.z - 30;
spareAnimation.mainGo.transform.DOLocalRotate(new Vector3(0, 0, eulerZ), 0.2f).OnComplete(()=>
isCanRot = true;
eulerZ = (int)spareAnimation.mainGo.transform.localEulerAngles.z - 30;
spareAnimation.mainGo.transform.DOLocalRotate(new Vector3(eulerX, eulerY, eulerZ), 0.2f,RotateMode.FastBeyond360).OnComplete(()=>
{
isCanRot = false;
if(eulerZ == 0)
//Debug.LogFormat("Right >>> {0}",eulerZ);
if(eulerZ == 0.0f || eulerZ == 360.0f)
{
spareAnimation.mainGo.GetComponent<Outline>().OutlineColor = loadOutLineColor;
}else
@ -156,8 +175,8 @@ namespace DisComputer
void OnRotOk()
{
Debug.LogFormat("rotation ok {0}", spareAnimation.mainGo.transform.localEulerAngles);
if(spareAnimation.mainGo.transform.localEulerAngles == Vector3.zero)
Debug.LogFormat("rotation ok {0}", spareAnimation.mainGo.transform.localEulerAngles.z);
if(eulerZ == 0.0f || eulerZ == 360.0f)
{
Debug.LogFormat("Rotation is Complete!!!");
@ -176,6 +195,7 @@ namespace DisComputer
}
}
}

@ -35,17 +35,31 @@ namespace DisComputer
public override void SetLoadState()
{
mainGo.SetActive(true);
luosiTran.gameObject.SetActive(true);
if (luosiTran != null)
{
luosiTran.gameObject.SetActive(true);
luosiTran.localPosition = Vector3.zero;
}
mainGo.transform.localPosition = pointConfigs[0].point;
luosiTran.localPosition = Vector3.zero;
}
public override void SetUnloadState()
{
mainGo.SetActive(false);
luosiTran.gameObject.SetActive(false);
mainGo.transform.localPosition = pointConfigs[2].point;
luosiTran.localPosition = showDis;
if (luosiTran != null)
{
luosiTran.gameObject.SetActive(false);
luosiTran.localPosition = showDis;
}
}
public override bool IsCompareTag(object data)
@ -95,13 +109,32 @@ namespace DisComputer
protected override IEnumerator UnloadFocuse()
{
BoltDriver driver = luosiTran.GetComponent<BoltDriver>();
luosiTran.gameObject.SetActive(true);
yield return StartCoroutine(driver.RotationLouSi());
if (luosiTran != null)
{
BoltDriver driver = luosiTran.GetComponent<BoltDriver>();
luosiTran.gameObject.SetActive(true);
yield return StartCoroutine(driver.RotationLouSi());
luosiTran.DOLocalMove(showDis, 0.35f).SetEase(Ease.Linear).OnComplete(() => {
Sequence sequence = DOTween.Sequence();
sequence.Append(mainGo.transform.DOLocalMove(pointConfigs[0].point, 0.4f).SetEase(Ease.Linear)).SetDelay(0.3f)
.Append(mainGo.transform.DOLocalMove(pointConfigs[1].point, 0.4f).SetEase(Ease.Linear)).SetDelay(0.2f)
.Append(mainGo.transform.DOLocalMove(pointConfigs[2].point, 0.4f).SetEase(Ease.Linear)).OnComplete(() =>
{
CommonTool.WaitTimeAfterDo(this, .35f, () => {
OnUnLoadFinishHandle?.Invoke();
mainGo.SetActive(false);
luosiTran.gameObject.SetActive(false);
RewindCameraView();
});
luosiTran.DOLocalMove(showDis, 0.35f).SetEase(Ease.Linear).OnComplete(() => {
});
});
}else
{
Sequence sequence = DOTween.Sequence();
sequence.Append(mainGo.transform.DOLocalMove(pointConfigs[0].point, 0.4f).SetEase(Ease.Linear)).SetDelay(0.3f)
.Append(mainGo.transform.DOLocalMove(pointConfigs[1].point, 0.4f).SetEase(Ease.Linear)).SetDelay(0.2f)
@ -110,13 +143,13 @@ namespace DisComputer
CommonTool.WaitTimeAfterDo(this, .35f, () => {
OnUnLoadFinishHandle?.Invoke();
mainGo.SetActive(false);
luosiTran.gameObject.SetActive(false);
RewindCameraView();
});
});
});
}
}
protected override IEnumerator LoadFocuse()
@ -128,17 +161,25 @@ namespace DisComputer
.Append(mainGo.transform.DOLocalMove(pointConfigs[1].point, 0.4f).SetEase(Ease.Linear))
.Append(mainGo.transform.DOLocalMove(pointConfigs[0].point, 0.4f).SetEase(Ease.Linear)).OnComplete(() =>
{
luosiTran.gameObject.SetActive(true);
luosiTran.DOLocalMove(Vector3.zero, 0.35f).SetEase(Ease.Linear).SetDelay(0.3f).OnComplete(() =>
if (luosiTran != null)
{
});
luosiTran.gameObject.SetActive(true);
luosiTran.DOLocalMove(Vector3.zero, 0.35f).SetEase(Ease.Linear).SetDelay(0.3f).OnComplete(() =>
{
});
}
});
yield return new WaitForSeconds(1.8f);
BoltDriver driver = luosiTran.GetComponent<BoltDriver>();
luosiTran.gameObject.SetActive(true);
yield return StartCoroutine(driver.RotationLouSi());
if (luosiTran != null)
{
BoltDriver driver = luosiTran.GetComponent<BoltDriver>();
luosiTran.gameObject.SetActive(true);
yield return StartCoroutine(driver.RotationLouSi());
}
OnLoadFinishHandle?.Invoke();
LzFramework.UI.TTUIPage.ShowPage<SparePartsView>();
RewindCameraView();

@ -48,7 +48,7 @@ namespace DisComputer
//抓取
if (Input.GetMouseButton(0))
{
Cursor.visible = false;
//Cursor.visible = false;
tempGridGo.transform.localPosition = CoordinateTrasition.ScreenPosToUguiPos(Input.mousePosition,canvas,true);
//发射射线检测
@ -57,7 +57,7 @@ namespace DisComputer
if (Input.GetMouseButtonUp(0))
{
Cursor.visible = true;
//Cursor.visible = true;
isDelTemp = true;
Sequence sequence = DOTween.Sequence();
sequence.Append(tempGridGo.transform.DOLocalMove(selectGrid.initPos, 0.15f));
@ -77,7 +77,7 @@ namespace DisComputer
}
else
{
Cursor.visible = true;
//Cursor.visible = true;
}
@ -86,7 +86,7 @@ namespace DisComputer
//抓取
if (Input.GetMouseButton(0))
{
Cursor.visible = false;
//Cursor.visible = false;
tempToolGo.transform.localPosition = CoordinateTrasition.ScreenPosToUguiPos(Input.mousePosition, canvas, true);
@ -96,7 +96,7 @@ namespace DisComputer
if (Input.GetMouseButtonUp(0))
{
Cursor.visible = true;
//Cursor.visible = true;
isDelTemp = true;
Tween move = tempToolGo.transform.DOScale(0.0f, 0.15f);
move.SetEase(Ease.InSine);
@ -115,7 +115,7 @@ namespace DisComputer
}
else
{
Cursor.visible = true;
//Cursor.visible = true;
}
@ -206,7 +206,7 @@ namespace DisComputer
finish?.Invoke();
tempGridGo = null;
selectGrid.CleraGird();
Cursor.visible = true;
//Cursor.visible = true;
loading.CancelLoading();
loading = null;
@ -263,7 +263,7 @@ namespace DisComputer
finish?.Invoke();
tempToolGo = null;
selectTool.ResetTool();
Cursor.visible = true;
//Cursor.visible = true;
loading.CancelLoading();
loading = null;
@ -327,7 +327,8 @@ namespace DisComputer
selectTool.chectSpareTag = hit.collider.gameObject.tag;
hit.collider.gameObject.SendMessageUpwards("OnRecUnloadColliderMsg", selectGrid, SendMessageOptions.DontRequireReceiver);
hit.collider.gameObject.SendMessageUpwards("OnRecUnloadColliderMsg", selectTool, SendMessageOptions.DontRequireReceiver);
hit.collider.gameObject.SendMessageUpwards("OnRecChildColliderMessage",selectTool, SendMessageOptions.DontRequireReceiver);

@ -324,7 +324,7 @@ namespace DisComputer
string json = JsonConvert.SerializeObject(webData);
WebConnecter.Singleton.SendDataToWeb(json);
string tipStr = string.Format("恭喜你顺利通过<color=red>拆卸课程</color>,接下来进入组装课程!加油!!");
string tipStr = string.Format("恭喜你顺利通过<color=red>拆卸课程</color> 加油!!");
MessageContainer.SendMessage("",this,MsgName.MainViewQuitFocuseMode);
yield return new WaitForSeconds(0.5f);
LzFramework.UI.TTUIPage.ShowPage<EndView>(tipStr);
@ -339,7 +339,7 @@ namespace DisComputer
IEnumerator FinishLoadMode()
{
yield return new WaitForSeconds(2.50f);
string tipStr = string.Format("恭喜你顺利通过<color=red>安装课程</color>,并掌握了计算机拆装");
string tipStr = string.Format("恭喜你顺利通过<color=red>安装课程</color> 加油");
MessageContainer.SendMessage("", this, MsgName.MainViewQuitFocuseMode);
WebData webData = new WebData();
@ -362,7 +362,8 @@ namespace DisComputer
/// </summary>
void UnloadFinish()
{
MessageContainer.SendMessage("quit", this, MsgName.TipViewShowOperation);
//MessageContainer.SendMessage("quit", this, MsgName.TipViewShowOperation);
MessageContainer.SendMessage("", this, MsgName.TipViewHideOperation);
HideTipSpare();
//显示零件展示 类型
//RendereSpareControl.Instance.ShowSpareRenderer(curSpType);

@ -11,6 +11,8 @@ namespace DisComputer
private PcTypeSelectPage selectPage;
private Text title_txt;
public IdleView() : base(UIType.Fixed, UIMode.DoNothing, UICollider.None)
{
uiPath = "UIPrefabs/IdleView";
@ -25,13 +27,27 @@ namespace DisComputer
GameObject selectGo = transform.Find("PcSelectType").gameObject;
selectPage = selectGo.GetComponent<PcTypeSelectPage>();
title_txt = this.transform.Find("Item/Text_title").gameObject.GetComponent<Text>();
this.transform.Find("video_btn").gameObject.GetComponent<Button>().onClick.AddListener(OnClickVideo);
}
public override void Active()
{
this.gameObject.SetActive(true);
if(MainControl.Instance.state == GameState.Load)
{
title_txt.text = "计算机组装课程";
}
else
{
title_txt.text = "计算机拆解课程";
}
}
public override void Hide()

@ -1147,7 +1147,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u8BA1\u7B97\u673A\u7EC4\u88C5\u865A\u62DF\u8BFE\u7A0B"
m_Text:
--- !u!114 &3582970968267698747
MonoBehaviour:
m_ObjectHideFlags: 0

@ -1 +1 @@
Build from DESKTOP-Q4UN19A at 2020/9/9 13:57:38
Build from DESKTOP-Q4UN19A at 2020/10/9 16:37:54

@ -1,20 +0,0 @@
1
00:00:00,000 --> 00:00:02,000
This is a demo of the SRT subtitles...
2
00:00:02,000 --> 00:00:04,000
Mutliple lines
are supported!
3
00:00:04,000 --> 00:00:5,000
Rich text <font color="cyan">colours</font> <b>bold</b> and <i>italics</i> too!
4
00:00:05,000 --> 00:00:06,000
Rich text <font color="yellow">colours</font> <b>bold</b> and <i>italics</i> too!
5
00:00:06,000 --> 00:00:15,000
Rich text <font color="#00ff00">colours</font> <b>bold</b> and <i>italics</i> too!

@ -1 +1 @@
Build from DESKTOP-Q4UN19A at 2020/9/8 9:15:13
Build from DESKTOP-Q4UN19A at 2020/9/27 12:18:03

@ -1,20 +0,0 @@
1
00:00:00,000 --> 00:00:02,000
This is a demo of the SRT subtitles...
2
00:00:02,000 --> 00:00:04,000
Mutliple lines
are supported!
3
00:00:04,000 --> 00:00:5,000
Rich text <font color="cyan">colours</font> <b>bold</b> and <i>italics</i> too!
4
00:00:05,000 --> 00:00:06,000
Rich text <font color="yellow">colours</font> <b>bold</b> and <i>italics</i> too!
5
00:00:06,000 --> 00:00:15,000
Rich text <font color="#00ff00">colours</font> <b>bold</b> and <i>italics</i> too!

@ -1 +1 @@
Build from DESKTOP-Q4UN19A at 2020/9/8 9:15:13
Build from DESKTOP-Q4UN19A at 2020/9/30 11:43:16
Loading…
Cancel
Save