Skip to content

Commit 78d1c3f

Browse files
gam0022gam0022
committed
nazo diff
1 parent a7ce8af commit 78d1c3f

File tree

2 files changed

+54
-55
lines changed

2 files changed

+54
-55
lines changed

‎Assets/Demoscene/Projects/2018-10-28-TDF2018/ImageEffectMaterials/Glitch.mat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,4 +88,4 @@ Material:
8888
- _BlendColor: {r: 1, g: 1, b: 1, a: 0}
8989
- _Color: {r: 1, g: 1, b: 1, a: 1}
9090
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
91-
- _FlashColor: {r: 0.7864985, g: 0, b: 0, a: 0}
91+
- _FlashColor: {r: 0.8273046, g: 0, b: 0, a: 0}

‎Assets/Demoscene/Projects/2018-10-28-TDF2018/TDF2018.unity‎

Lines changed: 53 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -187,8 +187,8 @@ Transform:
187187
m_CorrespondingSourceObject: {fileID: 0}
188188
m_PrefabInternal: {fileID: 0}
189189
m_GameObject: {fileID: 3206801}
190-
m_LocalRotation: {x: -0.015885193, y: -0.23842111, z: -0.0039003848, w: 0.9710241}
191-
m_LocalPosition: {x: 0.41, y: 0, z: 44.88205}
190+
m_LocalRotation: {x: -0.01588519, y: -0.2384211, z: -0.0039003824, w: 0.97102416}
191+
m_LocalPosition: {x: 0.41, y: 0, z: 44.643333}
192192
m_LocalScale: {x: 1, y: 1, z: 1}
193193
m_Children:
194194
- {fileID: 113538895}
@@ -5550,8 +5550,8 @@ Transform:
55505550
m_CorrespondingSourceObject: {fileID: 0}
55515551
m_PrefabInternal: {fileID: 0}
55525552
m_GameObject: {fileID: 118348730}
5553-
m_LocalRotation: {x: -0.031466182, y: -0.02643569, z: -0.00083253556, w: 0.99915487}
5554-
m_LocalPosition: {x: 0.26, y: -0.31, z: 44.782047}
5553+
m_LocalRotation: {x: -0.03146616, y: -0.026435718, z: -0.00083253434, w: 0.99915487}
5554+
m_LocalPosition: {x: 0.26, y: -0.31, z: 44.54333}
55555555
m_LocalScale: {x: 1, y: 1, z: 1}
55565556
m_Children:
55575557
- {fileID: 1210551685}
@@ -5923,7 +5923,7 @@ MonoBehaviour:
59235923
m_Calls: []
59245924
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
59255925
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
5926-
m_text: CNCD & Fairlight
5926+
m_text: Pheema
59275927
m_isRightToLeft: 0
59285928
m_fontAsset: {fileID: 11400000, guid: 903f514b06ed3b04baaa66d0f38b8c22, type: 2}
59295929
m_sharedMaterial: {fileID: 21182025572987376, guid: 903f514b06ed3b04baaa66d0f38b8c22,
@@ -5992,10 +5992,10 @@ MonoBehaviour:
59925992
m_margin: {x: 0, y: 0, z: 0, w: 0}
59935993
m_textInfo:
59945994
textComponent: {fileID: 204759241}
5995-
characterCount: 16
5995+
characterCount: 6
59965996
spriteCount: 0
5997-
spaceCount: 2
5998-
wordCount: 2
5997+
spaceCount: 0
5998+
wordCount: 1
59995999
linkCount: 0
60006000
lineCount: 1
60016001
pageCount: 1
@@ -6140,8 +6140,8 @@ Transform:
61406140
m_CorrespondingSourceObject: {fileID: 0}
61416141
m_PrefabInternal: {fileID: 0}
61426142
m_GameObject: {fileID: 238894847}
6143-
m_LocalRotation: {x: 7.1054274e-15, y: 7.1054274e-15, z: 5.1415644e-19, w: 1}
6144-
m_LocalPosition: {x: 0, y: 0, z: 44.302048}
6143+
m_LocalRotation: {x: 2.019484e-28, y: -1.03602475e-23, z: -9.515537e-17, w: 1}
6144+
m_LocalPosition: {x: 0, y: 0, z: 44.06333}
61456145
m_LocalScale: {x: 1, y: 1, z: 1}
61466146
m_Children:
61476147
- {fileID: 589915245}
@@ -6867,8 +6867,8 @@ Transform:
68676867
m_CorrespondingSourceObject: {fileID: 0}
68686868
m_PrefabInternal: {fileID: 0}
68696869
m_GameObject: {fileID: 319155744}
6870-
m_LocalRotation: {x: 0.00073441956, y: 0.9716255, z: 0.0030171985, w: -0.23650442}
6871-
m_LocalPosition: {x: 3.7, y: -0.05, z: 52.63205}
6870+
m_LocalRotation: {x: 0.0007344209, y: 0.97162545, z: 0.003017204, w: -0.23650439}
6871+
m_LocalPosition: {x: 3.7, y: -0.05, z: 52.393333}
68726872
m_LocalScale: {x: 1, y: 1, z: 1}
68736873
m_Children:
68746874
- {fileID: 1818019340}
@@ -6933,8 +6933,8 @@ Transform:
69336933
m_CorrespondingSourceObject: {fileID: 0}
69346934
m_PrefabInternal: {fileID: 0}
69356935
m_GameObject: {fileID: 342782830}
6936-
m_LocalRotation: {x: 0.05299425, y: -0.10361045, z: 0.0055284128, w: 0.9931898}
6937-
m_LocalPosition: {x: 0.54, y: 0.28, z: 42.922047}
6936+
m_LocalRotation: {x: 0.05299425, y: -0.10361044, z: 0.005528411, w: 0.9931898}
6937+
m_LocalPosition: {x: 0.54, y: 0.28, z: 42.68333}
69386938
m_LocalScale: {x: 1, y: 1, z: 1}
69396939
m_Children:
69406940
- {fileID: 460196881}
@@ -7096,8 +7096,8 @@ Transform:
70967096
m_CorrespondingSourceObject: {fileID: 0}
70977097
m_PrefabInternal: {fileID: 0}
70987098
m_GameObject: {fileID: 453656773}
7099-
m_LocalRotation: {x: 0.018727804, y: 0.9720614, z: -0.08325275, w: 0.21866639}
7100-
m_LocalPosition: {x: -0.35, y: 0.15, z: 46.16205}
7099+
m_LocalRotation: {x: 0.018727811, y: 0.9720614, z: -0.08325275, w: 0.21866639}
7100+
m_LocalPosition: {x: -0.35, y: 0.15, z: 45.923332}
71017101
m_LocalScale: {x: 1, y: 1, z: 1}
71027102
m_Children:
71037103
- {fileID: 261545992}
@@ -7371,7 +7371,7 @@ Transform:
73717371
m_PrefabInternal: {fileID: 0}
73727372
m_GameObject: {fileID: 464569131}
73737373
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
7374-
m_LocalPosition: {x: 0, y: 0, z: 46.482048}
7374+
m_LocalPosition: {x: 0, y: 0, z: 46.243332}
73757375
m_LocalScale: {x: 1, y: 1, z: 1}
73767376
m_Children:
73777377
- {fileID: 658643123}
@@ -7522,8 +7522,8 @@ Transform:
75227522
m_CorrespondingSourceObject: {fileID: 0}
75237523
m_PrefabInternal: {fileID: 0}
75247524
m_GameObject: {fileID: 553992198}
7525-
m_LocalRotation: {x: -0.035988793, y: -0.21752433, z: -0.008026279, w: 0.97535825}
7526-
m_LocalPosition: {x: 0.23, y: -0.04, z: 44.992046}
7525+
m_LocalRotation: {x: -0.035988793, y: -0.21752432, z: -0.008026279, w: 0.9753582}
7526+
m_LocalPosition: {x: 0.23, y: -0.04, z: 44.75333}
75277527
m_LocalScale: {x: 1, y: 1, z: 1}
75287528
m_Children:
75297529
- {fileID: 1009215760}
@@ -7793,8 +7793,8 @@ Transform:
77937793
m_CorrespondingSourceObject: {fileID: 0}
77947794
m_PrefabInternal: {fileID: 0}
77957795
m_GameObject: {fileID: 598585126}
7796-
m_LocalRotation: {x: 0.18657567, y: 0.32359383, z: -0.06524742, w: 0.9253212}
7797-
m_LocalPosition: {x: -2.55, y: 1.72, z: 42.282047}
7796+
m_LocalRotation: {x: 0.1865757, y: 0.32359383, z: -0.06524733, w: 0.9253212}
7797+
m_LocalPosition: {x: -2.55, y: 1.72, z: 42.04333}
77987798
m_LocalScale: {x: 1, y: 1, z: 1}
77997799
m_Children:
78007800
- {fileID: 491925409}
@@ -7888,8 +7888,8 @@ Transform:
78887888
m_CorrespondingSourceObject: {fileID: 0}
78897889
m_PrefabInternal: {fileID: 0}
78907890
m_GameObject: {fileID: 638815473}
7891-
m_LocalRotation: {x: 0.17558037, y: -1.11358305e-17, z: 6.2443984e-17, w: 0.9844651}
7892-
m_LocalPosition: {x: 0, y: 0.21, z: 44.91205}
7891+
m_LocalRotation: {x: 0.17558037, y: -2.3445397e-17, z: 1.3145562e-16, w: 0.9844651}
7892+
m_LocalPosition: {x: 0, y: 0.21, z: 44.673332}
78937893
m_LocalScale: {x: 1, y: 1, z: 1}
78947894
m_Children:
78957895
- {fileID: 1974385124}
@@ -8056,7 +8056,7 @@ Transform:
80568056
m_PrefabInternal: {fileID: 0}
80578057
m_GameObject: {fileID: 672676451}
80588058
m_LocalRotation: {x: 0.05967898, y: 3.5463815e-15, z: -2.1202233e-16, w: 0.99821764}
8059-
m_LocalPosition: {x: 0, y: 0.03, z: 45.69692}
8059+
m_LocalPosition: {x: 0, y: 0.03, z: 44.993332}
80608060
m_LocalScale: {x: 1, y: 1, z: 1}
80618061
m_Children:
80628062
- {fileID: 2107671322}
@@ -8122,8 +8122,8 @@ Transform:
81228122
m_CorrespondingSourceObject: {fileID: 0}
81238123
m_PrefabInternal: {fileID: 0}
81248124
m_GameObject: {fileID: 686972371}
8125-
m_LocalRotation: {x: 5.04871e-29, y: 6.679729e-24, z: 2.7852632e-16, w: 1}
8126-
m_LocalPosition: {x: 0, y: 0, z: 44.68205}
8125+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
8126+
m_LocalPosition: {x: 0, y: 0, z: 44.443333}
81278127
m_LocalScale: {x: 1, y: 1, z: 1}
81288128
m_Children:
81298129
- {fileID: 1123089543}
@@ -8218,8 +8218,8 @@ Transform:
82188218
m_CorrespondingSourceObject: {fileID: 0}
82198219
m_PrefabInternal: {fileID: 0}
82208220
m_GameObject: {fileID: 695587732}
8221-
m_LocalRotation: {x: -0.0045868037, y: -0.009580641, z: -0.000043947006, w: 0.9999436}
8222-
m_LocalPosition: {x: 0, y: 0, z: 43.32205}
8221+
m_LocalRotation: {x: -0.004586804, y: -0.009580641, z: -0.00004394701, w: 0.9999436}
8222+
m_LocalPosition: {x: 0, y: 0, z: 43.083332}
82238223
m_LocalScale: {x: 1, y: 1, z: 1}
82248224
m_Children:
82258225
- {fileID: 247492099}
@@ -8299,8 +8299,8 @@ Transform:
82998299
m_CorrespondingSourceObject: {fileID: 0}
83008300
m_PrefabInternal: {fileID: 0}
83018301
m_GameObject: {fileID: 723230261}
8302-
m_LocalRotation: {x: 0.020600298, y: -0.104176745, z: 0.0021582798, w: 0.9943431}
8303-
m_LocalPosition: {x: 0.25, y: 0.05, z: 43.29692}
8302+
m_LocalRotation: {x: 0.020600278, y: -0.10417674, z: 0.0021582788, w: 0.9943431}
8303+
m_LocalPosition: {x: 0.25, y: 0.05, z: 44.06333}
83048304
m_LocalScale: {x: 1, y: 1, z: 1}
83058305
m_Children:
83068306
- {fileID: 1132041535}
@@ -8441,8 +8441,8 @@ Transform:
84418441
m_CorrespondingSourceObject: {fileID: 0}
84428442
m_PrefabInternal: {fileID: 0}
84438443
m_GameObject: {fileID: 755069695}
8444-
m_LocalRotation: {x: 0.023417965, y: 0.05505825, z: -0.0012916672, w: 0.9982077}
8445-
m_LocalPosition: {x: -0.59, y: 0.4, z: 35.97692}
8444+
m_LocalRotation: {x: 0.023417966, y: 0.05505825, z: -0.0012916673, w: 0.9982077}
8445+
m_LocalPosition: {x: -0.59, y: 0.4, z: 36.743332}
84468446
m_LocalScale: {x: 1, y: 1, z: 1}
84478447
m_Children:
84488448
- {fileID: 897503721}
@@ -8523,7 +8523,7 @@ Transform:
85238523
m_PrefabInternal: {fileID: 0}
85248524
m_GameObject: {fileID: 764424281}
85258525
m_LocalRotation: {x: -0.031993162, y: 0.9458106, z: 0.09830117, w: 0.3078241}
8526-
m_LocalPosition: {x: -6.05, y: -2.16, z: 52.786922}
8526+
m_LocalPosition: {x: -6.05, y: -2.16, z: 53.553333}
85278527
m_LocalScale: {x: 1, y: 1, z: 1}
85288528
m_Children:
85298529
- {fileID: 141733452}
@@ -9015,8 +9015,8 @@ Transform:
90159015
m_CorrespondingSourceObject: {fileID: 0}
90169016
m_PrefabInternal: {fileID: 0}
90179017
m_GameObject: {fileID: 1004993103}
9018-
m_LocalRotation: {x: -0.0057757343, y: 0.72045845, z: 0.0060007046, w: 0.6934481}
9019-
m_LocalPosition: {x: -3, y: -0.05, z: 44.56692}
9018+
m_LocalRotation: {x: -0.005775734, y: 0.72045845, z: 0.006000704, w: 0.6934482}
9019+
m_LocalPosition: {x: -3, y: -0.05, z: 45.333332}
90209020
m_LocalScale: {x: 1, y: 1, z: 1}
90219021
m_Children:
90229022
- {fileID: 1009110981}
@@ -9886,7 +9886,7 @@ Transform:
98869886
m_CorrespondingSourceObject: {fileID: 0}
98879887
m_PrefabInternal: {fileID: 0}
98889888
m_GameObject: {fileID: 1250517079}
9889-
m_LocalRotation: {x: -2.5863128e-11, y: 1, z: -0.00008533136, w: -1.2025933e-15}
9889+
m_LocalRotation: {x: -2.5863367e-11, y: 1, z: -0.000065863045, w: -3.6393896e-12}
98909890
m_LocalPosition: {x: 0, y: 0.04, z: 348.90372}
98919891
m_LocalScale: {x: 1, y: 1, z: 1}
98929892
m_Children:
@@ -9970,7 +9970,7 @@ Transform:
99709970
m_CorrespondingSourceObject: {fileID: 0}
99719971
m_PrefabInternal: {fileID: 0}
99729972
m_GameObject: {fileID: 1262182776}
9973-
m_LocalRotation: {x: 0.020600274, y: -0.10417671, z: 0.002158279, w: 1}
9973+
m_LocalRotation: {x: 0.020600291, y: -0.104176745, z: 0.0021582795, w: 1}
99749974
m_LocalPosition: {x: 0.25, y: 0.05, z: 113.3433}
99759975
m_LocalScale: {x: 1, y: 1, z: 1}
99769976
m_Children:
@@ -10193,8 +10193,8 @@ Transform:
1019310193
m_CorrespondingSourceObject: {fileID: 0}
1019410194
m_PrefabInternal: {fileID: 0}
1019510195
m_GameObject: {fileID: 1276685557}
10196-
m_LocalRotation: {x: -0.035989013, y: -0.21752574, z: -0.008026323, w: 0.97535783}
10197-
m_LocalPosition: {x: 0.23, y: -0.04, z: 114.0333}
10196+
m_LocalRotation: {x: -0.035988804, y: -0.2175243, z: -0.008026218, w: 0.97535825}
10197+
m_LocalPosition: {x: 0.23, y: -0.04, z: 44.75333}
1019810198
m_LocalScale: {x: 1, y: 1, z: 1}
1019910199
m_Children:
1020010200
- {fileID: 1991855850}
@@ -10463,8 +10463,8 @@ Transform:
1046310463
m_CorrespondingSourceObject: {fileID: 0}
1046410464
m_PrefabInternal: {fileID: 0}
1046510465
m_GameObject: {fileID: 1334764422}
10466-
m_LocalRotation: {x: -0.00497207, y: 0.99075997, z: 0.037851635, w: 0.13014352}
10467-
m_LocalPosition: {x: -0.27, y: -0.08, z: 46.492046}
10466+
m_LocalRotation: {x: -0.00497207, y: 0.99075997, z: 0.037851635, w: 0.13014351}
10467+
m_LocalPosition: {x: -0.27, y: -0.08, z: 46.25333}
1046810468
m_LocalScale: {x: 1, y: 1, z: 1}
1046910469
m_Children:
1047010470
- {fileID: 793851894}
@@ -10849,7 +10849,7 @@ Transform:
1084910849
m_PrefabInternal: {fileID: 0}
1085010850
m_GameObject: {fileID: 1473399169}
1085110851
m_LocalRotation: {x: -5.04871e-29, y: -6.297e-24, z: -1.1285281e-16, w: 1}
10852-
m_LocalPosition: {x: 0, y: 0, z: 44.68205}
10852+
m_LocalPosition: {x: 0, y: 0, z: 44.443333}
1085310853
m_LocalScale: {x: 1, y: 1, z: 1}
1085410854
m_Children:
1085510855
- {fileID: 1236552057}
@@ -16024,7 +16024,7 @@ MonoBehaviour:
1602416024
m_isVolumetricText: 0
1602516025
m_spriteAnimator: {fileID: 0}
1602616026
m_isInputParsingRequired: 0
16027-
m_inputSource: 0
16027+
m_inputSource: 3
1602816028
m_hasFontAssetChanged: 0
1602916029
m_subTextObjects:
1603016030
- {fileID: 0}
@@ -16503,8 +16503,8 @@ Transform:
1650316503
m_CorrespondingSourceObject: {fileID: 0}
1650416504
m_PrefabInternal: {fileID: 0}
1650516505
m_GameObject: {fileID: 1731981103}
16506-
m_LocalRotation: {x: 0.107229136, y: 0.13512665, z: 0.014711674, w: -0.98489916}
16507-
m_LocalPosition: {x: 0.33, y: -0.27, z: 44.302048}
16506+
m_LocalRotation: {x: -0.107229196, y: -0.13512656, z: -0.01471167, w: 0.98489916}
16507+
m_LocalPosition: {x: 0.33, y: -0.27, z: 44.06333}
1650816508
m_LocalScale: {x: 1, y: 1, z: 1}
1650916509
m_Children:
1651016510
- {fileID: 1287035803}
@@ -16570,7 +16570,7 @@ Transform:
1657016570
m_CorrespondingSourceObject: {fileID: 0}
1657116571
m_PrefabInternal: {fileID: 0}
1657216572
m_GameObject: {fileID: 1745426942}
16573-
m_LocalRotation: {x: 0.020600274, y: -0.10417671, z: 0.002158279, w: 0.9943431}
16573+
m_LocalRotation: {x: 0.020600291, y: -0.104176745, z: 0.0021582795, w: 0.9943431}
1657416574
m_LocalPosition: {x: 0.25, y: 0.05, z: 113.3433}
1657516575
m_LocalScale: {x: 1, y: 1, z: 1}
1657616576
m_Children:
@@ -16767,8 +16767,8 @@ Transform:
1676716767
m_CorrespondingSourceObject: {fileID: 0}
1676816768
m_PrefabInternal: {fileID: 0}
1676916769
m_GameObject: {fileID: 1863888859}
16770-
m_LocalRotation: {x: -0.010354358, y: 0.90155065, z: 0.021608273, w: 0.43200946}
16771-
m_LocalPosition: {x: -2.6, y: -0.16, z: 47.57205}
16770+
m_LocalRotation: {x: -0.010354374, y: 0.90155053, z: 0.021608282, w: 0.43200994}
16771+
m_LocalPosition: {x: -2.6, y: -0.16, z: 116.6133}
1677216772
m_LocalScale: {x: 1, y: 1, z: 1}
1677316773
m_Children:
1677416774
- {fileID: 1986687112}
@@ -16849,7 +16849,7 @@ Transform:
1684916849
m_CorrespondingSourceObject: {fileID: 0}
1685016850
m_PrefabInternal: {fileID: 0}
1685116851
m_GameObject: {fileID: 1871455912}
16852-
m_LocalRotation: {x: -9.154216e-10, y: 0.05855104, z: 5.368766e-11, w: 0.99828446}
16852+
m_LocalRotation: {x: -0.0000000015948395, y: 0.9977104, z: 0.000000023527205, w: 0.06763168}
1685316853
m_LocalPosition: {x: -1.8, y: 0, z: 30.19}
1685416854
m_LocalScale: {x: 1, y: 1, z: 1}
1685516855
m_Children:
@@ -17002,9 +17002,8 @@ Transform:
1700217002
m_CorrespondingSourceObject: {fileID: 0}
1700317003
m_PrefabInternal: {fileID: 0}
1700417004
m_GameObject: {fileID: 1930210082}
17005-
m_LocalRotation: {x: 0.0000000035654082, y: -0.91871417, z: -0.000000008294247,
17006-
w: -0.3949233}
17007-
m_LocalPosition: {x: -8.869678, y: -0.00000018056225, z: 50.10038}
17005+
m_LocalRotation: {x: -0.000000022370008, y: 0.1606905, z: 0.000000003641975, w: 0.9870049}
17006+
m_LocalPosition: {x: -0.43998894, y: -0.00000045329074, z: 6.9837866}
1700817007
m_LocalScale: {x: 1, y: 1, z: 1}
1700917008
m_Children:
1701017009
- {fileID: 454150109}
@@ -17639,8 +17638,8 @@ Transform:
1763917638
m_CorrespondingSourceObject: {fileID: 0}
1764017639
m_PrefabInternal: {fileID: 0}
1764117640
m_GameObject: {fileID: 2102078943}
17642-
m_LocalRotation: {x: -0.056473374, y: 0.86765915, z: 0.1013582, w: 0.48343042}
17643-
m_LocalPosition: {x: -1.2, y: -0.31, z: 46.192047}
17641+
m_LocalRotation: {x: -0.056473367, y: 0.86765915, z: 0.1013582, w: 0.48343045}
17642+
m_LocalPosition: {x: -1.2, y: -0.31, z: 17.684101}
1764417643
m_LocalScale: {x: 1, y: 1, z: 1}
1764517644
m_Children:
1764617645
- {fileID: 282573502}

0 commit comments

Comments
 (0)