Skip to content

T
tuseGameColor
Commit 914f895e authored by JiangWanZhi's avatar JiangWanZhi
Browse files
Options

调整一下图片的缩放

parent 5d593044
Hide whitespace changes
Inline Side-by-side
Showing with 414 additions and 64 deletions
Assets/Resources/perfabs/gameViewLogic.prefab
View file @ 914f895e
......@@ -11,7 +11,7 @@ GameObject:
- component: {fileID: 3212828396965320531}
- component: {fileID: 13232882389871041}
- component: {fileID: 1740647967860627203}
m_Layer: 0
m_Layer: 5
m_Name: Fill
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -87,7 +87,7 @@ GameObject:
- component: {fileID: 216671789900275948}
- component: {fileID: 1520829811932201433}
- component: {fileID: 948336499519928204}
m_Layer: 0
m_Layer: 5
m_Name: groupListBg
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -164,7 +164,7 @@ GameObject:
- component: {fileID: 6452400347204923587}
- component: {fileID: 2765908017269193084}
- component: {fileID: 8703148409508473063}
m_Layer: 0
m_Layer: 5
m_Name: Viewport
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -256,7 +256,7 @@ GameObject:
- component: {fileID: 1971672544357285535}
- component: {fileID: 7081348899626901932}
- component: {fileID: 7570576656313022887}
m_Layer: 0
m_Layer: 5
m_Name: gameViewLogic
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -374,6 +374,7 @@ MonoBehaviour:
showAreaId: 1
tempValue1: 130
tempValue2: 130
cam: {fileID: 0}
--- !u!1 &422105211135309262
GameObject:
m_ObjectHideFlags: 0
......@@ -385,7 +386,7 @@ GameObject:
- component: {fileID: 4139363703275230209}
- component: {fileID: 8367472059466275748}
- component: {fileID: 5175571361385935444}
m_Layer: 0
m_Layer: 5
m_Name: up
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -460,7 +461,7 @@ GameObject:
m_Component:
- component: {fileID: 2696017519285237368}
- component: {fileID: 6420934093707765999}
m_Layer: 0
m_Layer: 5
m_Name: gameEndOperBase
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -529,7 +530,7 @@ GameObject:
- component: {fileID: 2125809588161684614}
- component: {fileID: 4366203294722797289}
- component: {fileID: 1771611708934439778}
m_Layer: 0
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -606,7 +607,7 @@ GameObject:
- component: {fileID: 3003945673020399370}
- component: {fileID: 4825201947226939171}
- component: {fileID: 7356500860615203999}
m_Layer: 0
m_Layer: 5
m_Name: tipSelectGroup
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -695,7 +696,7 @@ GameObject:
- component: {fileID: 5970386083598165497}
- component: {fileID: 8197576796604627402}
- component: {fileID: 9142072880717560534}
m_Layer: 0
m_Layer: 5
m_Name: Handle
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -771,7 +772,7 @@ GameObject:
- component: {fileID: 5685663661502957755}
- component: {fileID: 3421000113890224223}
- component: {fileID: 445159793341180119}
m_Layer: 0
m_Layer: 5
m_Name: back
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -847,7 +848,7 @@ GameObject:
- component: {fileID: 6885165270998615511}
- component: {fileID: 3944498586293115405}
- component: {fileID: 2202601900132914920}
m_Layer: 0
m_Layer: 5
m_Name: Handle
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -923,7 +924,7 @@ GameObject:
- component: {fileID: 5503889877563921631}
- component: {fileID: 3252811371139745229}
- component: {fileID: 5252906950781081036}
m_Layer: 0
m_Layer: 5
m_Name: low
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -998,7 +999,7 @@ GameObject:
m_Component:
- component: {fileID: 4207755507653322023}
- component: {fileID: 1036549963076789408}
m_Layer: 0
m_Layer: 5
m_Name: gameProgress
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -1090,7 +1091,7 @@ GameObject:
m_Component:
- component: {fileID: 3684281432546734940}
- component: {fileID: 3648909924624081883}
m_Layer: 0
m_Layer: 5
m_Name: top
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -1145,7 +1146,7 @@ GameObject:
- component: {fileID: 1485139897268310784}
- component: {fileID: 6953393550571463216}
- component: {fileID: 221205185384094592}
m_Layer: 0
m_Layer: 5
m_Name: Text (TMP)
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -1278,7 +1279,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 4818915712491779010}
m_Layer: 0
m_Layer: 5
m_Name: Handle Slide Area
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -1317,7 +1318,7 @@ GameObject:
- component: {fileID: 2819828141272779120}
- component: {fileID: 8590776663356130485}
- component: {fileID: 3183311367350724332}
m_Layer: 0
m_Layer: 5
m_Name: Background
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -1394,7 +1395,7 @@ GameObject:
- component: {fileID: 2435598830669844101}
- component: {fileID: 1674358342569644079}
- component: {fileID: 6173381365454465283}
m_Layer: 0
m_Layer: 5
m_Name: autoFill
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -1527,7 +1528,7 @@ GameObject:
- component: {fileID: 548037199292223520}
- component: {fileID: 6247800984907532189}
- component: {fileID: 579534837900412603}
m_Layer: 0
m_Layer: 5
m_Name: bg
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -1604,7 +1605,7 @@ GameObject:
- component: {fileID: 1506329684643559557}
- component: {fileID: 7744437584989927091}
- component: {fileID: 531601903790600840}
m_Layer: 0
m_Layer: 5
m_Name: Button
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -1737,7 +1738,7 @@ GameObject:
- component: {fileID: 9189191146825682432}
- component: {fileID: 770547139677435937}
- component: {fileID: 5981965562525273395}
m_Layer: 0
m_Layer: 5
m_Name: loadingbar
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -1841,7 +1842,7 @@ GameObject:
- component: {fileID: 1976999355571500960}
- component: {fileID: 2831736868530311398}
- component: {fileID: 2637599635359530784}
m_Layer: 0
m_Layer: 5
m_Name: gameProgressText
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -1976,7 +1977,7 @@ GameObject:
- component: {fileID: 4152250197012170789}
- component: {fileID: 5289769559393319794}
- component: {fileID: 865826085666606201}
m_Layer: 0
m_Layer: 5
m_Name: Text (TMP)
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -2112,7 +2113,7 @@ GameObject:
- component: {fileID: 6331565826967141148}
- component: {fileID: 2499393060713787222}
- component: {fileID: 3999040700910192572}
m_Layer: 0
m_Layer: 5
m_Name: cancel
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -2243,7 +2244,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 161008593911248317}
m_Layer: 0
m_Layer: 5
m_Name: Handle Slide Area
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -2282,7 +2283,7 @@ GameObject:
- component: {fileID: 8277089287357068316}
- component: {fileID: 1248037836665635308}
- component: {fileID: 6046350578044851877}
m_Layer: 0
m_Layer: 5
m_Name: progress
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -2358,7 +2359,7 @@ GameObject:
- component: {fileID: 5210634824352640152}
- component: {fileID: 4425038438473611603}
- component: {fileID: 7310949926432826211}
m_Layer: 0
m_Layer: 5
m_Name: Background
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -2434,7 +2435,7 @@ GameObject:
- component: {fileID: 4350987738922043080}
- component: {fileID: 7075575002412105940}
- component: {fileID: 4231459619420674691}
m_Layer: 0
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -2510,7 +2511,7 @@ GameObject:
- component: {fileID: 503614355353602301}
- component: {fileID: 2672100261875538246}
- component: {fileID: 5306207792625668321}
m_Layer: 0
m_Layer: 5
m_Name: loadImg
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -2587,7 +2588,7 @@ GameObject:
- component: {fileID: 8199650924920679494}
- component: {fileID: 7060587662440544068}
- component: {fileID: 3187553950452450608}
m_Layer: 0
m_Layer: 5
m_Name: resetPostSize
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -2720,7 +2721,7 @@ GameObject:
- component: {fileID: 116011431095675892}
- component: {fileID: 6861346871259649856}
- component: {fileID: 7270151825793149432}
m_Layer: 0
m_Layer: 5
m_Name: fore
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -2797,7 +2798,7 @@ GameObject:
- component: {fileID: 427952364170711120}
- component: {fileID: 282682974999690270}
- component: {fileID: 2039942766882252799}
m_Layer: 0
m_Layer: 5
m_Name: gameShowBase
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -2887,7 +2888,7 @@ GameObject:
- component: {fileID: 6177109562948806136}
- component: {fileID: 2276064347271355634}
- component: {fileID: 8111164355371235926}
m_Layer: 0
m_Layer: 5
m_Name: Content
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -2990,7 +2991,7 @@ GameObject:
- component: {fileID: 8127201246377606253}
- component: {fileID: 249506130850906235}
- component: {fileID: 3881126791468221942}
m_Layer: 0
m_Layer: 5
m_Name: gameShowView
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -3066,6 +3067,7 @@ MonoBehaviour:
resetBtn: {fileID: 5746595262711090281}
oleMovePos: {x: 0, y: 0}
scaleConstPos: {x: 0, y: 0}
canvasCamera: {fileID: 0}
--- !u!222 &8127201246377606253
CanvasRenderer:
m_ObjectHideFlags: 0
......@@ -3111,7 +3113,7 @@ GameObject:
- component: {fileID: 4930126960711289547}
- component: {fileID: 9176654368274725460}
- component: {fileID: 8118021438581421258}
m_Layer: 0
m_Layer: 5
m_Name: ingameLoad
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -3189,7 +3191,7 @@ GameObject:
- component: {fileID: 126619370423618285}
- component: {fileID: 2391150849252331053}
- component: {fileID: 4249383279496708430}
m_Layer: 0
m_Layer: 5
m_Name: Text (TMP)
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -3325,7 +3327,7 @@ GameObject:
- component: {fileID: 8258134213658184483}
- component: {fileID: 1314517132876636840}
- component: {fileID: 50242431277280671}
m_Layer: 0
m_Layer: 5
m_Name: Continue
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -3456,7 +3458,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 3345813486746951798}
m_Layer: 0
m_Layer: 5
m_Name: Fill Area
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -3493,7 +3495,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 3575847236156162491}
m_Layer: 0
m_Layer: 5
m_Name: areaIdBase
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -3533,7 +3535,7 @@ GameObject:
- component: {fileID: 6288710243067134574}
- component: {fileID: 7428985397092881503}
- component: {fileID: 4886643278448710515}
m_Layer: 0
m_Layer: 5
m_Name: areaGroupList
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -3657,7 +3659,7 @@ GameObject:
- component: {fileID: 8235616612504007133}
- component: {fileID: 8896059049748758053}
- component: {fileID: 5374987878461056773}
m_Layer: 0
m_Layer: 5
m_Name: Fill
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -3733,7 +3735,7 @@ GameObject:
- component: {fileID: 907552110873048176}
- component: {fileID: 2959758486288229088}
- component: {fileID: 2472524875904962952}
m_Layer: 0
m_Layer: 5
m_Name: Text (TMP)
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -3866,7 +3868,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 6786388699577561408}
m_Layer: 0
m_Layer: 5
m_Name: Fill Area
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -3905,7 +3907,7 @@ GameObject:
- component: {fileID: 2769356840059167721}
- component: {fileID: 2845725859161550794}
- component: {fileID: 2346470756401963112}
m_Layer: 0
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -3981,7 +3983,7 @@ GameObject:
- component: {fileID: 9149404980277374671}
- component: {fileID: 7839730672544356413}
- component: {fileID: 4055822930037233063}
m_Layer: 0
m_Layer: 5
m_Name: Text (TMP)
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -4113,6 +4115,10 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 2696017519285237368}
m_Modifications:
- target: {fileID: 976754589162029939, guid: d22d30a8bc14c794682266b9e458c412, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 1643446527150243925, guid: d22d30a8bc14c794682266b9e458c412, type: 3}
propertyPath: m_text
value:
......@@ -4129,6 +4135,10 @@ PrefabInstance:
propertyPath: m_Name
value: palyer
objectReference: {fileID: 0}
- target: {fileID: 4790972399934209839, guid: d22d30a8bc14c794682266b9e458c412, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 4790972399934209839, guid: d22d30a8bc14c794682266b9e458c412, type: 3}
propertyPath: m_IsActive
value: 1
......@@ -4137,6 +4147,10 @@ PrefabInstance:
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 8276b9f3ad09a9544ae7d2abddaed3b5, type: 3}
- target: {fileID: 5521817667934367024, guid: d22d30a8bc14c794682266b9e458c412, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 5667027781148436514, guid: d22d30a8bc14c794682266b9e458c412, type: 3}
propertyPath: m_AnchoredPosition.y
value: -128
......@@ -4267,6 +4281,10 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 3684281432546734940}
m_Modifications:
- target: {fileID: 976754589162029939, guid: d22d30a8bc14c794682266b9e458c412, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 1583902233695634631, guid: d22d30a8bc14c794682266b9e458c412, type: 3}
propertyPath: m_Color.b
value: 1
......@@ -4295,10 +4313,18 @@ PrefabInstance:
propertyPath: m_Name
value: back
objectReference: {fileID: 0}
- target: {fileID: 4790972399934209839, guid: d22d30a8bc14c794682266b9e458c412, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 4796231568445269378, guid: d22d30a8bc14c794682266b9e458c412, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 5aa39f69ecf89b74ba46bfcd17e38676, type: 3}
- target: {fileID: 5521817667934367024, guid: d22d30a8bc14c794682266b9e458c412, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 5667027781148436514, guid: d22d30a8bc14c794682266b9e458c412, type: 3}
propertyPath: m_AnchoredPosition.y
value: -128
......@@ -4438,6 +4464,10 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 2696017519285237368}
m_Modifications:
- target: {fileID: 976754589162029939, guid: d22d30a8bc14c794682266b9e458c412, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 1643446527150243925, guid: d22d30a8bc14c794682266b9e458c412, type: 3}
propertyPath: m_text
value:
......@@ -4454,6 +4484,10 @@ PrefabInstance:
propertyPath: m_Name
value: saveBtn
objectReference: {fileID: 0}
- target: {fileID: 4790972399934209839, guid: d22d30a8bc14c794682266b9e458c412, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 4790972399934209839, guid: d22d30a8bc14c794682266b9e458c412, type: 3}
propertyPath: m_IsActive
value: 1
......@@ -4462,6 +4496,10 @@ PrefabInstance:
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: acdea55c6604832429f7a55096394fbf, type: 3}
- target: {fileID: 5521817667934367024, guid: d22d30a8bc14c794682266b9e458c412, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 5667027781148436514, guid: d22d30a8bc14c794682266b9e458c412, type: 3}
propertyPath: m_AnchoredPosition.y
value: -128
......@@ -4592,6 +4630,10 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 2696017519285237368}
m_Modifications:
- target: {fileID: 976754589162029939, guid: d22d30a8bc14c794682266b9e458c412, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 1643446527150243925, guid: d22d30a8bc14c794682266b9e458c412, type: 3}
propertyPath: m_text
value: Video generation, please wait
......@@ -4628,6 +4670,10 @@ PrefabInstance:
propertyPath: m_Name
value: inSaveProgress
objectReference: {fileID: 0}
- target: {fileID: 4790972399934209839, guid: d22d30a8bc14c794682266b9e458c412, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 4790972399934209839, guid: d22d30a8bc14c794682266b9e458c412, type: 3}
propertyPath: m_IsActive
value: 1
......@@ -4644,6 +4690,10 @@ PrefabInstance:
propertyPath: m_FillAmount
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5521817667934367024, guid: d22d30a8bc14c794682266b9e458c412, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 5667027781148436514, guid: d22d30a8bc14c794682266b9e458c412, type: 3}
propertyPath: m_SizeDelta.x
value: 500
......@@ -4788,6 +4838,10 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 2696017519285237368}
m_Modifications:
- target: {fileID: 976754589162029939, guid: d22d30a8bc14c794682266b9e458c412, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 1643446527150243925, guid: d22d30a8bc14c794682266b9e458c412, type: 3}
propertyPath: m_text
value:
......@@ -4804,6 +4858,10 @@ PrefabInstance:
propertyPath: m_Name
value: shareBtn
objectReference: {fileID: 0}
- target: {fileID: 4790972399934209839, guid: d22d30a8bc14c794682266b9e458c412, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 4790972399934209839, guid: d22d30a8bc14c794682266b9e458c412, type: 3}
propertyPath: m_IsActive
value: 1
......@@ -4812,6 +4870,10 @@ PrefabInstance:
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 0fad809fad8b432498cd5d238eae8e28, type: 3}
- target: {fileID: 5521817667934367024, guid: d22d30a8bc14c794682266b9e458c412, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 5667027781148436514, guid: d22d30a8bc14c794682266b9e458c412, type: 3}
propertyPath: m_AnchoredPosition.y
value: -128
......
Assets/Scenes/gameScene.unity
View file @ 914f895e
......@@ -134,7 +134,7 @@ GameObject:
- component: {fileID: 92769423}
- component: {fileID: 92769425}
- component: {fileID: 92769424}
m_Layer: 0
m_Layer: 5
m_Name: numvalue
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -315,7 +315,7 @@ MonoBehaviour:
m_RequiresOpaqueTextureOption: 2
m_CameraType: 0
m_Cameras: []
m_RendererIndex: -1
m_RendererIndex: 0
m_VolumeLayerMask:
serializedVersion: 2
m_Bits: 1
......@@ -357,10 +357,12 @@ MonoBehaviour:
target: {fileID: 1821187684178258749}
scaleSpeed: 1
isLimitScale: 1
min: 1
max: 10
canvasCamera: {fileID: 297775247}
ScrollRect: {fileID: 1657874420}
MinScale: 0.7
MaxScale: 8
Min_Move: 0.5
Max_Move: 10
--- !u!224 &464840817 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 4930126960711289547, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
......@@ -445,7 +447,7 @@ GameObject:
- component: {fileID: 1329740668}
- component: {fileID: 1329740670}
- component: {fileID: 1329740669}
m_Layer: 0
m_Layer: 5
m_Name: numbg
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -526,7 +528,7 @@ GameObject:
- component: {fileID: 1643100474}
- component: {fileID: 1643100476}
- component: {fileID: 1643100475}
m_Layer: 0
m_Layer: 5
m_Name: loadingbg
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -607,7 +609,7 @@ GameObject:
- component: {fileID: 1864366139}
- component: {fileID: 1864366141}
- component: {fileID: 1864366140}
m_Layer: 0
m_Layer: 5
m_Name: fore
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -680,6 +682,10 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 297775248}
m_Modifications:
- target: {fileID: 46365302489525420, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 50242431277280671, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Transition
value: 0
......@@ -696,6 +702,14 @@ PrefabInstance:
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: onContinueHandler
objectReference: {fileID: 0}
- target: {fileID: 73072243405369480, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 165307577509819478, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 165307577509819478, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_IsActive
value: 1
......@@ -744,14 +758,26 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 129.73
objectReference: {fileID: 0}
- target: {fileID: 367631070194179690, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 401614864274373127, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Name
value: Canvas
objectReference: {fileID: 0}
- target: {fileID: 401614864274373127, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 413511353391081588, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: cc17797b19aa99741839e64bc6dd1f4a, type: 3}
- target: {fileID: 422105211135309262, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 422105211135309262, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_IsActive
value: 1
......@@ -796,6 +822,10 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: -411
objectReference: {fileID: 0}
- target: {fileID: 522600718500103196, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 522600718500103196, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_IsActive
value: 1
......@@ -868,6 +898,10 @@ PrefabInstance:
propertyPath: m_Color.r
value: 0.9490196
objectReference: {fileID: 0}
- target: {fileID: 601494152891192310, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 601494152891192310, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_IsActive
value: 1
......@@ -900,10 +934,18 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: -120
objectReference: {fileID: 0}
- target: {fileID: 873009014252909700, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 873009014252909700, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 894303543650332500, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 948336499519928204, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Color.a
value: 1
......@@ -920,6 +962,10 @@ PrefabInstance:
propertyPath: m_Color.r
value: 1
objectReference: {fileID: 0}
- target: {fileID: 966406415947144623, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 966406415947144623, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_IsActive
value: 1
......@@ -932,6 +978,14 @@ PrefabInstance:
propertyPath: m_Interactable
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1042903363453845171, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 1134740293160627579, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 1194477751654865661, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
value: 0
......@@ -960,6 +1014,10 @@ PrefabInstance:
propertyPath: m_Value
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1510817547163903128, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 1633357141748549960, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Pivot.x
value: 0
......@@ -1072,6 +1130,10 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 166
objectReference: {fileID: 0}
- target: {fileID: 1768046760152476349, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 1768046760152476349, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_IsActive
value: 1
......@@ -1120,6 +1182,14 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2018438975178189989, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 2087345114315532017, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 2087345114315532017, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_IsActive
value: 1
......@@ -1156,10 +1226,18 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2141905781938332451, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 2141905781938332451, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2145984797572034496, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 2145984797572034496, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_IsActive
value: 0
......@@ -1180,10 +1258,18 @@ PrefabInstance:
propertyPath: m_Color.r
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2381975925626465051, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 2397888016392641895, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2407024486131086290, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 2472524875904962952, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_text
value:
......@@ -1260,6 +1346,18 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: -100
objectReference: {fileID: 0}
- target: {fileID: 2929582902800575783, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 2979185255687982988, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 3080420821459013476, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 3205611354668530150, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
value: 1
......@@ -1296,10 +1394,22 @@ PrefabInstance:
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3215813452662575037, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 3215813452662575037, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3221591055920631497, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 3439311877815001549, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 3522714155609020318, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_SizeDelta.y
value: -720
......@@ -1412,10 +1522,18 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: -120
objectReference: {fileID: 0}
- target: {fileID: 3919367363602599034, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 3919367363602599034, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4047933918126060582, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 4047933918126060582, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_IsActive
value: 1
......@@ -1484,6 +1602,10 @@ PrefabInstance:
propertyPath: m_Color.a
value: 0.38431373
objectReference: {fileID: 0}
- target: {fileID: 4314793524135391404, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 4350987738922043080, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchorMax.x
value: 1
......@@ -1508,6 +1630,22 @@ PrefabInstance:
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4633567763922833703, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 4723139154165285615, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 4726392448965792132, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 4834708443820249589, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 4886643278448710515, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: itemWidth
value: 400
......@@ -1568,6 +1706,14 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5179610333064401809, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 5193016835390613258, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 5306207792625668321, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Color.a
value: 1
......@@ -1664,6 +1810,10 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5543049454982025834, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 5543049454982025834, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_IsActive
value: 0
......@@ -1676,6 +1826,10 @@ PrefabInstance:
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: onSaveHandler
objectReference: {fileID: 0}
- target: {fileID: 5661067332213080888, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 5685663661502957755, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
......@@ -1700,22 +1854,50 @@ PrefabInstance:
propertyPath: m_SizeDelta.y
value: 2224
objectReference: {fileID: 0}
- target: {fileID: 5697974217771189481, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 5697974217771189481, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5746595262711090281, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 5853481637200319250, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 5925264663931540380, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 5940396924526109151, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 5970386083598165497, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5970386083598165497, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5970386083598165497, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5978997263012059768, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 6048398698050195705, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 6215818307727761636, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_IsActive
value: 0
......@@ -1752,6 +1934,18 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 2
objectReference: {fileID: 0}
- target: {fileID: 6694424081818911107, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 6714200171955405542, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 6769909122946713645, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 6769909122946713645, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_IsActive
value: 1
......@@ -1772,6 +1966,10 @@ PrefabInstance:
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_BoolArgument
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6841462502927162422, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 6841462502927162422, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_IsActive
value: 1
......@@ -1788,6 +1986,10 @@ PrefabInstance:
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6937855639134330257, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 7060587662440544068, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Type
value: 0
......@@ -1840,6 +2042,10 @@ PrefabInstance:
propertyPath: showFontSizeMax
value: 25
objectReference: {fileID: 0}
- target: {fileID: 7615360375328756948, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 7686134585819739601, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_IsActive
value: 1
......@@ -1884,6 +2090,10 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 100
objectReference: {fileID: 0}
- target: {fileID: 7892800702951592232, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 8118021438581421258, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Color.a
value: 1
......@@ -1908,18 +2118,42 @@ PrefabInstance:
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8242295764275695975, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 8242295764275695975, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8290012639037185672, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 8290012639037185672, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8563517853556340769, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 8617691137107350990, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 8896268844625087083, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 8910723590317234935, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: maxScale
value: 60
objectReference: {fileID: 0}
- target: {fileID: 8969470922680416840, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 9026256924356714604, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_SizeDelta.y
value: 0
......@@ -1928,6 +2162,10 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9106622279833474672, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 9189191146825682432, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
......
Assets/scripts/ScaleToImage.cs
View file @ 914f895e
using DG.Tweening;
using System.Collections;
using System.Collections.Generic;
using System.Diagnostics;
......@@ -13,11 +14,17 @@ public class ScaleToImage : MonoBehaviour
public float scaleSpeed = 1;
public bool isLimitScale;
public float min, max;
public Camera canvasCamera;
public Transform ScrollRect; //组的列表
public Transform ScrollRect; //组的父节点
public float MinScale;
public float MaxScale;
public float Min_Move;
public float Max_Move;
private bool isInit_one;
private Vector3 offset;
......@@ -26,12 +33,35 @@ public class ScaleToImage : MonoBehaviour
private float ToFigerdistance; //距离
private float MoveValue; //移动，缩放大了就小一些
private bool PlayAniFlag;
private Vector3 OldPos;
private void Update()
{
//不是双指就关闭
if (Input.touchCount != 2)
{
isInit = false;
if (PlayAniFlag)
{
if (target.GetChild(0).localScale.x <= Min_Move) //缩放小的回大
{
for (int i = 0; i < target.childCount; i++)
{
target.GetChild(i).DOScale(Vector3.one * MinScale, 0.3f);
}
}
else if (target.GetChild(0).localScale.x >= Max_Move) //大的回来小
{
for (int i = 0; i < target.childCount; i++)
{
target.GetChild(i).DOScale(Vector3.one * MaxScale, 0.3f);
target.GetChild(i).DOMove(oriPos, 0.3f);
}
}
PlayAniFlag = false;
}
}
//初始化
if (Input.touchCount == 2 && !isInit)
......@@ -65,6 +95,7 @@ public class ScaleToImage : MonoBehaviour
}
if (Input.touchCount == 2)
{
isInit_one = false;
if (!IsImageArea(Input.GetTouch(0).position) || !IsImageArea(Input.GetTouch(1).position))
{
isInit = false;
......@@ -72,28 +103,44 @@ public class ScaleToImage : MonoBehaviour
}
//两指缩放比例
scale = Vector3.Distance(canvasCamera.ScreenToWorldPoint(Input.GetTouch(0).position), canvasCamera.ScreenToWorldPoint(Input.GetTouch(1).position)) / Vector3.Distance(touch1, touch2); //大于1是放大，小于是缩小
float nowdis = Vector3.Distance(canvasCamera.ScreenToWorldPoint(Input.GetTouch(0).position), canvasCamera.ScreenToWorldPoint(Input.GetTouch(1).position));
scale = nowdis / Vector3.Distance(touch1, touch2); //大于1是放大，小于是缩小
//利用scaleSpeed控制缩放速度
scale = scale - 1; //正的话就是放大图片
scale = (scale - 1) * 0.8f; //正的话就是放大图片
if (scale < 0)
{
scale = scale * oriScale;
scale = scale * oriScale * 0.8f;
}
if (target.GetChild(0).localScale.x < Min_Move)
{
PlayAniFlag = true;
return;
}
float scale_target;
for (int i = 0; i < target.childCount; i++)
{
var item = target.GetChild(i);
//缩放目标大小
item.localScale = Vector3.one * (oriScale + scale);
scale_target = (Vector3.one * (oriScale + scale)).x;
if (scale_target < Min_Move)
{
item.localScale = Vector3.one * Min_Move * 0.99f;
}
else if (scale_target > Max_Move)
{
item.localScale = Vector3.one * (oriScale + scale);
PlayAniFlag = true;
}
else
item.localScale = Vector3.one * (oriScale + scale);
//改变目标位置，让位置保持不变
//改变目标位置，让位置保持不变
item.position = oriPos - ToFigerCenter * (item.localScale.x - oriScale) * ToFigerdistance * MoveValue;
}
isInit_one = false;
}
if (Input.touchCount == 1) //单指拖动
......
ProjectSettings/TagManager.asset
View file @ 914f895e
......@@ -41,3 +41,6 @@ TagManager:
- name: Default
uniqueID: 0
locked: 0
- name: UI
uniqueID: 4064369897
locked: 0
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment