Skip to content

Commit dd1839d

Browse files
jcs090218jcs090218
committed
Update unity version
1 parent a8a2db1 commit dd1839d

File tree

4 files changed

+56
-2692
lines changed

4 files changed

+56
-2692
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
*.exe
5757
*.*_data
5858
.vsconfig
59+
*.dwlt
5960

6061
# Unity3D generated meta files
6162
*.pidb.meta

‎Assets/_Project/Scenes/FT_Resizable.unity‎

Lines changed: 40 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,6 @@ MonoBehaviour:
264264
m_Script: {fileID: 11500000, guid: 44537bddf53394d4ba5246f002f0fbb0, type: 3}
265265
m_Name:
266266
m_EditorClassIdentifier:
267-
mType: 0
268267
--- !u!4 &57533395
269268
Transform:
270269
m_ObjectHideFlags: 0
@@ -275,6 +274,7 @@ Transform:
275274
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
276275
m_LocalPosition: {x: 0, y: 0, z: 0}
277276
m_LocalScale: {x: 1, y: 1, z: 1}
277+
m_ConstrainProportionsScale: 0
278278
m_Children: []
279279
m_Father: {fileID: 0}
280280
m_RootOrder: 2
@@ -305,6 +305,7 @@ Transform:
305305
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
306306
m_LocalPosition: {x: 0, y: 0, z: 0}
307307
m_LocalScale: {x: 1, y: 1, z: 1}
308+
m_ConstrainProportionsScale: 0
308309
m_Children: []
309310
m_Father: {fileID: 1223927543}
310311
m_RootOrder: 1
@@ -320,6 +321,7 @@ RectTransform:
320321
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
321322
m_LocalPosition: {x: 0, y: 0, z: 0}
322323
m_LocalScale: {x: 0, y: 0, z: 0}
324+
m_ConstrainProportionsScale: 0
323325
m_Children:
324326
- {fileID: 1078392642}
325327
- {fileID: 503959940}
@@ -449,6 +451,7 @@ Transform:
449451
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
450452
m_LocalPosition: {x: 0, y: 0, z: -10}
451453
m_LocalScale: {x: 1, y: 1, z: 1}
454+
m_ConstrainProportionsScale: 0
452455
m_Children: []
453456
m_Father: {fileID: 0}
454457
m_RootOrder: 5
@@ -481,6 +484,7 @@ RectTransform:
481484
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
482485
m_LocalPosition: {x: 0, y: 0, z: 0}
483486
m_LocalScale: {x: 1, y: 1, z: 1}
487+
m_ConstrainProportionsScale: 0
484488
m_Children: []
485489
m_Father: {fileID: 1078392642}
486490
m_RootOrder: 0
@@ -543,7 +547,6 @@ GameObject:
543547
- component: {fileID: 503959940}
544548
- component: {fileID: 503959944}
545549
- component: {fileID: 503959943}
546-
- component: {fileID: 503959942}
547550
- component: {fileID: 503959941}
548551
m_Layer: 5
549552
m_Name: _Portrait
@@ -562,6 +565,7 @@ RectTransform:
562565
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
563566
m_LocalPosition: {x: 0, y: 0, z: 0}
564567
m_LocalScale: {x: 1, y: 1, z: 1}
568+
m_ConstrainProportionsScale: 0
565569
m_Children:
566570
- {fileID: 716442434}
567571
- {fileID: 528889105}
@@ -591,19 +595,6 @@ MonoBehaviour:
591595
mAsOriginalRotation: 1
592596
mPanelDeltaWidthRatio: 0
593597
mPanelDeltaHeightRatio: 0
594-
mFitScreenSize: 1
595-
--- !u!114 &503959942
596-
MonoBehaviour:
597-
m_ObjectHideFlags: 0
598-
m_CorrespondingSourceObject: {fileID: 0}
599-
m_PrefabInstance: {fileID: 0}
600-
m_PrefabAsset: {fileID: 0}
601-
m_GameObject: {fileID: 503959939}
602-
m_Enabled: 1
603-
m_EditorHideFlags: 0
604-
m_Script: {fileID: 11500000, guid: 4ec10a9bac2135146ace97b721303a80, type: 3}
605-
m_Name:
606-
m_EditorClassIdentifier:
607598
--- !u!114 &503959943
608599
MonoBehaviour:
609600
m_ObjectHideFlags: 0
@@ -670,6 +661,7 @@ RectTransform:
670661
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
671662
m_LocalPosition: {x: 0, y: 0, z: 0}
672663
m_LocalScale: {x: 1, y: 1, z: 1}
664+
m_ConstrainProportionsScale: 0
673665
m_Children: []
674666
m_Father: {fileID: 503959940}
675667
m_RootOrder: 1
@@ -747,6 +739,7 @@ Transform:
747739
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
748740
m_LocalPosition: {x: 0, y: 0, z: 0}
749741
m_LocalScale: {x: 1, y: 1, z: 1}
742+
m_ConstrainProportionsScale: 0
750743
m_Children: []
751744
m_Father: {fileID: 1223927543}
752745
m_RootOrder: 2
@@ -813,6 +806,7 @@ Transform:
813806
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
814807
m_LocalPosition: {x: 0, y: 0, z: 0}
815808
m_LocalScale: {x: 1, y: 1, z: 1}
809+
m_ConstrainProportionsScale: 0
816810
m_Children: []
817811
m_Father: {fileID: 0}
818812
m_RootOrder: 6
@@ -845,6 +839,7 @@ RectTransform:
845839
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
846840
m_LocalPosition: {x: 0, y: 0, z: 0}
847841
m_LocalScale: {x: 1, y: 1, z: 1}
842+
m_ConstrainProportionsScale: 0
848843
m_Children: []
849844
m_Father: {fileID: 503959940}
850845
m_RootOrder: 0
@@ -1013,6 +1008,7 @@ MonoBehaviour:
10131008
m_Name:
10141009
m_EditorClassIdentifier:
10151010
mTestWithKey: 0
1011+
mCanvases: []
10161012
mGlobalUndoRedoSystem: {fileID: 0}
10171013
mGameUI: {fileID: 0}
10181014
mForceDialogue: {fileID: 0}
@@ -1171,12 +1167,12 @@ MonoBehaviour:
11711167
m_Name:
11721168
m_EditorClassIdentifier:
11731169
mSwitchSceneType: 1
1174-
mPauseGameWhileLoadingScene: 1
1175-
mJCSBlackScreen: {fileID: 0}
1176-
mJCSBlackSlideScreen: {fileID: 0}
1170+
mBlackScreen: {fileID: 0}
1171+
mBlackSlideScreen: {fileID: 0}
11771172
mAlign: 0
11781173
mPopWhiteScreen: 1
1179-
mJCSWhiteScreen: {fileID: 0}
1174+
mWhiteScreen: {fileID: 0}
1175+
mPauseGameWhileLoadingScene: 1
11801176
mOverrideSetting: 0
11811177
mSceneFadeInTime: 1
11821178
mSceneFadeOutTime: 1
@@ -1248,15 +1244,13 @@ MonoBehaviour:
12481244
m_Script: {fileID: 11500000, guid: 5a84b523d293cda40b73eb03a25ef83c, type: 3}
12491245
m_Name:
12501246
m_EditorClassIdentifier:
1251-
mResizableScreenPanelPath: JCSUnity_Resources/GUI/JCS_ResizableScreenPanel
12521247
mTopASP: {fileID: 0}
12531248
mBottomASP: {fileID: 0}
12541249
mLeftASP: {fileID: 0}
12551250
mRightASP: {fileID: 0}
12561251
RESIZE_SCREEN_THIS_SCENE: 0
12571252
ASPECT_RATION_SCREEN_WIDTH_THIS_SCENE: 16
12581253
ASPECT_RATION_SCREEN_HEIGHT_THIS_SCENE: 9
1259-
SCREEN_TYPE_THIS_SCENE: 3
12601254
--- !u!114 &777759531
12611255
MonoBehaviour:
12621256
m_ObjectHideFlags: 0
@@ -1269,8 +1263,15 @@ MonoBehaviour:
12691263
m_Script: {fileID: 11500000, guid: 459ea8803bb23694290d894d24e5c1a0, type: 3}
12701264
m_Name:
12711265
m_EditorClassIdentifier:
1272-
SIMULATE_PLATFORM_TYPE: 0
1273-
PLATFORM_TYPE: 1
1266+
mSystemLanguage: 42
1267+
mLangTexts: []
1268+
mRequestCamera: 0
1269+
mRequestMicrophone: 0
1270+
mRequestLocation: 0
1271+
mSimulatePlatformType: 1
1272+
mPlatformType: 1
1273+
mSimulateSystemLanguage: 0
1274+
mSimulateLanguage: 42
12741275
--- !u!4 &777759532
12751276
Transform:
12761277
m_ObjectHideFlags: 0
@@ -1281,6 +1282,7 @@ Transform:
12811282
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
12821283
m_LocalPosition: {x: 0, y: 0, z: 0}
12831284
m_LocalScale: {x: 1, y: 1, z: 1}
1285+
m_ConstrainProportionsScale: 0
12841286
m_Children:
12851287
- {fileID: 951165062}
12861288
- {fileID: 1924940136}
@@ -1364,6 +1366,7 @@ Light:
13641366
m_UseColorTemperature: 0
13651367
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
13661368
m_UseBoundingSphereOverride: 0
1369+
m_UseViewFrustumForShadowCasterCull: 1
13671370
m_ShadowRadius: 0
13681371
m_ShadowAngle: 0
13691372
--- !u!4 &785808176
@@ -1376,6 +1379,7 @@ Transform:
13761379
m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
13771380
m_LocalPosition: {x: 3.6567898, y: -2.7159493, z: 64.191696}
13781381
m_LocalScale: {x: 1, y: 1, z: 1}
1382+
m_ConstrainProportionsScale: 0
13791383
m_Children: []
13801384
m_Father: {fileID: 0}
13811385
m_RootOrder: 8
@@ -1408,6 +1412,7 @@ RectTransform:
14081412
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
14091413
m_LocalPosition: {x: 0, y: 0, z: 0}
14101414
m_LocalScale: {x: 1, y: 1, z: 1}
1415+
m_ConstrainProportionsScale: 0
14111416
m_Children: []
14121417
m_Father: {fileID: 1078392642}
14131418
m_RootOrder: 1
@@ -1483,6 +1488,7 @@ RectTransform:
14831488
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
14841489
m_LocalPosition: {x: 0, y: 0, z: 0}
14851490
m_LocalScale: {x: 1, y: 1, z: 1}
1491+
m_ConstrainProportionsScale: 0
14861492
m_Children: []
14871493
m_Father: {fileID: 503959940}
14881494
m_RootOrder: 2
@@ -1558,6 +1564,7 @@ Transform:
15581564
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
15591565
m_LocalPosition: {x: 0, y: 0, z: 0}
15601566
m_LocalScale: {x: 1, y: 1, z: 1}
1567+
m_ConstrainProportionsScale: 0
15611568
m_Children: []
15621569
m_Father: {fileID: 777759532}
15631570
m_RootOrder: 0
@@ -1619,6 +1626,7 @@ Transform:
16191626
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
16201627
m_LocalPosition: {x: 0, y: 0, z: 0}
16211628
m_LocalScale: {x: 1, y: 1, z: 1}
1629+
m_ConstrainProportionsScale: 0
16221630
m_Children: []
16231631
m_Father: {fileID: 1223927543}
16241632
m_RootOrder: 0
@@ -1661,7 +1669,6 @@ GameObject:
16611669
- component: {fileID: 1078392642}
16621670
- component: {fileID: 1078392644}
16631671
- component: {fileID: 1078392643}
1664-
- component: {fileID: 1078392645}
16651672
- component: {fileID: 1078392646}
16661673
m_Layer: 5
16671674
m_Name: _Landscape
@@ -1680,6 +1687,7 @@ RectTransform:
16801687
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
16811688
m_LocalPosition: {x: 0, y: 0, z: 0}
16821689
m_LocalScale: {x: 1, y: 1, z: 1}
1690+
m_ConstrainProportionsScale: 0
16831691
m_Children:
16841692
- {fileID: 493770894}
16851693
- {fileID: 827443102}
@@ -1729,18 +1737,6 @@ CanvasRenderer:
17291737
m_PrefabAsset: {fileID: 0}
17301738
m_GameObject: {fileID: 1078392641}
17311739
m_CullTransparentMesh: 0
1732-
--- !u!114 &1078392645
1733-
MonoBehaviour:
1734-
m_ObjectHideFlags: 0
1735-
m_CorrespondingSourceObject: {fileID: 0}
1736-
m_PrefabInstance: {fileID: 0}
1737-
m_PrefabAsset: {fileID: 0}
1738-
m_GameObject: {fileID: 1078392641}
1739-
m_Enabled: 1
1740-
m_EditorHideFlags: 0
1741-
m_Script: {fileID: 11500000, guid: 4ec10a9bac2135146ace97b721303a80, type: 3}
1742-
m_Name:
1743-
m_EditorClassIdentifier:
17441740
--- !u!114 &1078392646
17451741
MonoBehaviour:
17461742
m_ObjectHideFlags: 0
@@ -1758,7 +1754,6 @@ MonoBehaviour:
17581754
mAsOriginalRotation: 1
17591755
mPanelDeltaWidthRatio: 0
17601756
mPanelDeltaHeightRatio: 0
1761-
mFitScreenSize: 1
17621757
--- !u!1 &1223927529
17631758
GameObject:
17641759
m_ObjectHideFlags: 0
@@ -2010,7 +2005,7 @@ MonoBehaviour:
20102005
STANDARD_SCREEN_SIZE:
20112006
width: 1080
20122007
height: 1920
2013-
ENSURE_INSIDE_SAFE_AREA: 0
2008+
SCREEN_TYPE: 3
20142009
--- !u!114 &1223927541
20152010
MonoBehaviour:
20162011
m_ObjectHideFlags: 0
@@ -2036,7 +2031,6 @@ MonoBehaviour:
20362031
m_Script: {fileID: 11500000, guid: 44537bddf53394d4ba5246f002f0fbb0, type: 3}
20372032
m_Name:
20382033
m_EditorClassIdentifier:
2039-
mType: 0
20402034
--- !u!4 &1223927543
20412035
Transform:
20422036
m_ObjectHideFlags: 0
@@ -2047,6 +2041,7 @@ Transform:
20472041
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
20482042
m_LocalPosition: {x: 0, y: 0, z: 0}
20492043
m_LocalScale: {x: 1, y: 1, z: 1}
2044+
m_ConstrainProportionsScale: 0
20502045
m_Children:
20512046
- {fileID: 1005805277}
20522047
- {fileID: 263943610}
@@ -2097,6 +2092,7 @@ MeshRenderer:
20972092
m_CastShadows: 1
20982093
m_ReceiveShadows: 1
20992094
m_DynamicOccludee: 1
2095+
m_StaticShadowCaster: 0
21002096
m_MotionVectors: 1
21012097
m_LightProbeUsage: 1
21022098
m_ReflectionProbeUsage: 1
@@ -2145,6 +2141,7 @@ Transform:
21452141
m_LocalRotation: {x: -0.15541157, y: 0.16544248, z: -0.026410513, w: 0.9735392}
21462142
m_LocalPosition: {x: 3.6567898, y: 1.15, z: 110}
21472143
m_LocalScale: {x: 5.4537, y: 5.4537, z: 5.4537}
2144+
m_ConstrainProportionsScale: 0
21482145
m_Children: []
21492146
m_Father: {fileID: 0}
21502147
m_RootOrder: 7
@@ -2176,6 +2173,7 @@ Transform:
21762173
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
21772174
m_LocalPosition: {x: 0, y: 0, z: 0}
21782175
m_LocalScale: {x: 1, y: 1, z: 1}
2176+
m_ConstrainProportionsScale: 0
21792177
m_Children: []
21802178
m_Father: {fileID: 777759532}
21812179
m_RootOrder: 2
@@ -2222,6 +2220,7 @@ Transform:
22222220
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
22232221
m_LocalPosition: {x: 0, y: 0, z: 0}
22242222
m_LocalScale: {x: 1, y: 1, z: 1}
2223+
m_ConstrainProportionsScale: 0
22252224
m_Children: []
22262225
m_Father: {fileID: 777759532}
22272226
m_RootOrder: 1
@@ -2292,6 +2291,7 @@ Transform:
22922291
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
22932292
m_LocalPosition: {x: -82.587326, y: 7.6250725, z: 90}
22942293
m_LocalScale: {x: 1, y: 1, z: 1}
2294+
m_ConstrainProportionsScale: 0
22952295
m_Children: []
22962296
m_Father: {fileID: 0}
22972297
m_RootOrder: 1
@@ -2385,6 +2385,7 @@ MonoBehaviour:
23852385
m_FallbackScreenDPI: 96
23862386
m_DefaultSpriteDPI: 96
23872387
m_DynamicPixelsPerUnit: 1
2388+
m_PresetInfoIsWorld: 0
23882389
--- !u!223 &2051649834
23892390
Canvas:
23902391
m_ObjectHideFlags: 0

‎UserSettings/EditorUserSettings.asset‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,21 @@ EditorUserSettings:
1111
RecentlyUsedSceneGuid-1:
1212
value: 0652575f01510d595b5e5e23127b5d4415161b73757f2760797d1962b5b06c6d
1313
flags: 0
14+
RecentlyUsedSceneGuid-2:
15+
value: 5a07575206040b035b0a5d7412765b4417164c7c75787f607b2f4567b5b26460
16+
flags: 0
17+
RecentlyUsedSceneGuid-3:
18+
value: 075501575702505d5c595b7514220b444e164078297b74667f2d4d31e4b6606d
19+
flags: 0
20+
RecentlyUsedSceneGuid-4:
21+
value: 07505053575308030f5a5c77417b0e44174e1e7d7f2922322b7f1960bbb56c6f
22+
flags: 0
23+
RecentlyUsedSceneGuid-5:
24+
value: 5a57055456510f0a540c5f7b13720b4440164a29747a2566792b4d36b4b9673b
25+
flags: 0
26+
RecentlyUsedSceneGuid-6:
27+
value: 0154000557500a095e0c5e7212210b444f15492b7c2b7e652f2a4b6bb6e26068
28+
flags: 0
1429
RecentlyUsedScenePath-0:
1530
value: 22424703114646712e3d392c1937465f25141d24293b691a0e1a2212f2f03831e1e622e0e8341c303611ea0f0d331433f31e0c45e305031f08
1631
flags: 0

0 commit comments

Comments
 (0)