Skip to content

Commit

Permalink
v1.7.1.0-beta rc1
Browse files Browse the repository at this point in the history
  • Loading branch information
@ipodtouch0218
ipodtouch0218 committed Sep 13, 2022
1 parent f920946 commit 643abac
Show file tree
Hide file tree
Showing 9 changed files with 893 additions and 1,333 deletions.
1 change: 0 additions & 1 deletion Assets/Resources/Prefabs/PlayerLuigi.prefab
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21661,7 +21661,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: eb46ec3ddc407dd4cafade9981e03a42, type: 3}
m_Name:
m_EditorClassIdentifier:
controlCamera: 0
currentPosition: {x: 0, y: 0, z: 0}
--- !u!114 &3651738984749022226
MonoBehaviour:
Expand Down
70 changes: 35 additions & 35 deletions Assets/Resources/Tilemaps/Palettes/Caves.prefab
View file
Original file line number Diff line number Diff line change
Expand Up @@ -761,75 +761,75 @@ Tilemap:
- m_RefCount: 0
m_Data: {r: NaN, g: NaN, b: NaN, a: NaN}
- m_RefCount: 1
m_Data: {r: 0.9549405, g: 0.47840017, b: 0.60475963, a: 1}
m_Data: {r: 0.7409081, g: 0.42313275, b: 0.43860245, a: 1}
- m_RefCount: 1
m_Data: {r: 0.807141, g: 0.3798893, b: 0.49831092, a: 1}
m_Data: {r: 0.7799431, g: 0.42842707, b: 0.51112103, a: 1}
- m_RefCount: 1
m_Data: {r: 0.84289116, g: 0.38749027, b: 0.3927877, a: 1}
m_Data: {r: 0.71983534, g: 0.3740679, b: 0.4529049, a: 1}
- m_RefCount: 1
m_Data: {r: 0.82520735, g: 0.3510748, b: 0.37901583, a: 1}
m_Data: {r: 0.9288124, g: 0.5324121, b: 0.6338532, a: 1}
- m_RefCount: 1
m_Data: {r: 0.98214376, g: 0.55925566, b: 0.68425065, a: 1}
m_Data: {r: 0.8575691, g: 0.5043323, b: 0.505664, a: 1}
- m_RefCount: 1
m_Data: {r: 0.90007573, g: 0.5230287, b: 0.5249163, a: 1}
m_Data: {r: 0.8446255, g: 0.44284773, b: 0.5502263, a: 1}
- m_RefCount: 1
m_Data: {r: 0.9801025, g: 0.61730105, b: 0.7263322, a: 1}
m_Data: {r: 0.9500534, g: 0.55579287, b: 0.5724843, a: 1}
- m_RefCount: 1
m_Data: {r: 0.8759282, g: 0.5163735, b: 0.5337877, a: 1}
m_Data: {r: 0.8400149, g: 0.44707924, b: 0.54580235, a: 1}
- m_RefCount: 1
m_Data: {r: 0.81291777, g: 0.46126267, b: 0.47820362, a: 1}
m_Data: {r: 0.94475144, g: 0.5286134, b: 0.6288015, a: 1}
- m_RefCount: 1
m_Data: {r: 0.7277881, g: 0.3188599, b: 0.34757563, a: 1}
m_Data: {r: 0.76496303, g: 0.46056852, b: 0.5062864, a: 1}
- m_RefCount: 1
m_Data: {r: 0.8780858, g: 0.47494677, b: 0.59583473, a: 1}
m_Data: {r: 0.83899504, g: 0.585596, b: 0.64211595, a: 1}
- m_RefCount: 1
m_Data: {r: 0.7209711, g: 0.36240676, b: 0.39329064, a: 1}
m_Data: {r: 0.99725085, g: 0.46101207, b: 0.6393777, a: 1}
- m_RefCount: 1
m_Data: {r: 0.7411261, g: 0.34149888, b: 0.417591, a: 1}
m_Data: {r: 0.9438981, g: 0.6119481, b: 0.7221652, a: 1}
- m_RefCount: 1
m_Data: {r: 0.9505956, g: 0.5005081, b: 0.63272446, a: 1}
m_Data: {r: 0.9613532, g: 0.405478, b: 0.58530104, a: 1}
- m_RefCount: 1
m_Data: {r: 0.95404506, g: 0.6400367, b: 0.66363937, a: 1}
m_Data: {r: 0.8479899, g: 0.34197435, b: 0.46403617, a: 1}
- m_RefCount: 1
m_Data: {r: 0.88847864, g: 0.5611503, b: 0.6247867, a: 1}
m_Data: {r: 0.8678314, g: 0.38436854, b: 0.46066138, a: 1}
- m_RefCount: 1
m_Data: {r: 0.8541411, g: 0.44973043, b: 0.52678543, a: 1}
m_Data: {r: 0.77870035, g: 0.36660758, b: 0.44137037, a: 1}
- m_RefCount: 1
m_Data: {r: 0.7124206, g: 0.29928115, b: 0.33072278, a: 1}
m_Data: {r: 0.7665352, g: 0.43043184, b: 0.43140978, a: 1}
- m_RefCount: 1
m_Data: {r: 0.98519623, g: 0.50952125, b: 0.5456942, a: 1}
m_Data: {r: 0.78182274, g: 0.35956612, b: 0.4022476, a: 1}
- m_RefCount: 1
m_Data: {r: 0.75630194, g: 0.46129978, b: 0.49322256, a: 1}
m_Data: {r: 0.9864722, g: 0.5925138, b: 0.6638288, a: 1}
- m_RefCount: 1
m_Data: {r: 0.79266703, g: 0.40388677, b: 0.5030582, a: 1}
m_Data: {r: 0.96306133, g: 0.62326276, b: 0.64079267, a: 1}
- m_RefCount: 1
m_Data: {r: 0.8783711, g: 0.5019345, b: 0.589809, a: 1}
m_Data: {r: 0.7686383, g: 0.34167612, b: 0.41413513, a: 1}
- m_RefCount: 1
m_Data: {r: 0.85054344, g: 0.49339464, b: 0.50057185, a: 1}
m_Data: {r: 0.947678, g: 0.6539544, b: 0.71479154, a: 1}
- m_RefCount: 1
m_Data: {r: 0.96508026, g: 0.49348122, b: 0.51402724, a: 1}
m_Data: {r: 0.81873685, g: 0.49182475, b: 0.590514, a: 1}
- m_RefCount: 1
m_Data: {r: 0.73428947, g: 0.43148297, b: 0.4567816, a: 1}
m_Data: {r: 0.87227863, g: 0.5171172, b: 0.5207192, a: 1}
- m_RefCount: 1
m_Data: {r: 0.9967832, g: 0.4520481, b: 0.5804243, a: 1}
m_Data: {r: 0.7533129, g: 0.34184286, b: 0.47309208, a: 1}
- m_RefCount: 1
m_Data: {r: 0.82785195, g: 0.40715483, b: 0.4520093, a: 1}
m_Data: {r: 0.9540169, g: 0.650708, b: 0.6987765, a: 1}
- m_RefCount: 1
m_Data: {r: 0.72511625, g: 0.4797913, b: 0.4897291, a: 1}
m_Data: {r: 0.81238204, g: 0.40650943, b: 0.5029, a: 1}
- m_RefCount: 1
m_Data: {r: 0.82409126, g: 0.41063222, b: 0.45209283, a: 1}
m_Data: {r: 0.81450367, g: 0.3947156, b: 0.4494795, a: 1}
- m_RefCount: 1
m_Data: {r: 0.94460595, g: 0.4750573, b: 0.5214307, a: 1}
m_Data: {r: 0.7955094, g: 0.52473515, b: 0.590265, a: 1}
- m_RefCount: 1
m_Data: {r: 0.87603444, g: 0.5446834, b: 0.6520536, a: 1}
m_Data: {r: 0.79844964, g: 0.5547752, b: 0.55771965, a: 1}
- m_RefCount: 1
m_Data: {r: 0.9157308, g: 0.3904514, b: 0.42175248, a: 1}
m_Data: {r: 0.8881267, g: 0.40531176, b: 0.50748634, a: 1}
- m_RefCount: 1
m_Data: {r: 0.93483347, g: 0.53098756, b: 0.6390259, a: 1}
m_Data: {r: 0.9962465, g: 0.44453126, b: 0.49927577, a: 1}
- m_RefCount: 1
m_Data: {r: 0.9585845, g: 0.44402546, b: 0.5939044, a: 1}
m_Data: {r: 0.9870217, g: 0.45985228, b: 0.5024961, a: 1}
- m_RefCount: 1
m_Data: {r: 0.9871719, g: 0.50102806, b: 0.5714389, a: 1}
m_Data: {r: 0.8757002, g: 0.4025778, b: 0.42818704, a: 1}
m_TileObjectToInstantiateArray: []
m_AnimationFrameRate: 1
m_Color: {r: 1, g: 1, b: 1, a: 1}
Expand Down
4 changes: 2 additions & 2 deletions Assets/Resources/Tilemaps/Palettes/Snow.prefab
View file
Original file line number Diff line number Diff line change
Expand Up @@ -281,9 +281,9 @@ Tilemap:
- m_RefCount: 11
m_Data: {r: 1, g: 1, b: 1, a: 1}
- m_RefCount: 1
m_Data: {r: 0.74325484, g: 0.31498235, b: 0.3354342, a: 1}
m_Data: {r: 0.73757, g: 0.41985926, b: 0.46396697, a: 1}
- m_RefCount: 1
m_Data: {r: 0.76324654, g: 0.5283659, b: 0.5475827, a: 1}
m_Data: {r: 0.8733104, g: 0.3699994, b: 0.39497235, a: 1}
m_TileObjectToInstantiateArray: []
m_AnimationFrameRate: 1
m_Color: {r: 1, g: 1, b: 1, a: 1}
Expand Down
6 changes: 3 additions & 3 deletions Assets/Scenes/Levels/CustomBonus.unity
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7881,7 +7881,7 @@ Tilemap:
- first: {x: -38, y: -6, z: 0}
second:
serializedVersion: 2
m_TileIndex: 33
m_TileIndex: 31
m_TileSpriteIndex: 15
m_TileMatrixIndex: 0
m_TileColorIndex: 0
Expand Down Expand Up @@ -12198,11 +12198,11 @@ Tilemap:
m_Data: {fileID: 11400000, guid: 7043ddc663263eb40856795807f2b95e, type: 2}
- m_RefCount: 8
m_Data: {fileID: 11400000, guid: 9ad4eae0a5ebcb14093df63e6fa5a712, type: 2}
- m_RefCount: 10
- m_RefCount: 11
m_Data: {fileID: 11400000, guid: 3532b2dd7d04184489604475da441af1, type: 2}
- m_RefCount: 14
m_Data: {fileID: 11400000, guid: 538396d9628097a4eb78f384c3911a64, type: 2}
- m_RefCount: 2
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 13fa1d1be77b6e542a0e52df08faf5c8, type: 2}
- m_RefCount: 21
m_Data: {fileID: 11400000, guid: da992613b62923c49a4ef2be7573b792, type: 2}
Expand Down
84 changes: 62 additions & 22 deletions Assets/Scenes/Levels/CustomDesert.unity
View file
Original file line number Diff line number Diff line change
Expand Up @@ -647,7 +647,7 @@ PrefabInstance:
- target: {fileID: 5500062339093502114, guid: 43d56bd18d06e9b4abe323618a20a228,
type: 3}
propertyPath: levelMinTileY
value: -12
value: -13
objectReference: {fileID: 0}
- target: {fileID: 5500062339093502114, guid: 43d56bd18d06e9b4abe323618a20a228,
type: 3}
Expand Down Expand Up @@ -677,7 +677,7 @@ PrefabInstance:
- target: {fileID: 5500062339093502114, guid: 43d56bd18d06e9b4abe323618a20a228,
type: 3}
propertyPath: levelHeightTile
value: 12
value: 13
objectReference: {fileID: 0}
- target: {fileID: 5500062339093502118, guid: 43d56bd18d06e9b4abe323618a20a228,
type: 3}
Expand Down Expand Up @@ -3137,9 +3137,9 @@ CompositeCollider2D:
- X: 170000000
Y: -55000000
- X: 170000000
Y: -60000000
Y: -65000000
- X: 175000000
Y: -60000000
Y: -65000000
- X: 175000000
Y: -45000000
- X: 165000000
Expand Down Expand Up @@ -3181,17 +3181,17 @@ CompositeCollider2D:
- X: -60000000
Y: -40000000
- X: -60000000
Y: -60000000
Y: -65000000
- X: -55000000
Y: -60000000
Y: -65000000
- - X: -160000000
Y: -55000000
- X: -75000000
Y: -55000000
- X: -75000000
Y: -60000000
Y: -65000000
- X: -70000000
Y: -60000000
Y: -65000000
- X: -70000000
Y: -45000000
- X: -135000000
Expand All @@ -3201,9 +3201,9 @@ CompositeCollider2D:
- X: -165000000
Y: -40000000
- X: -165000000
Y: -60000000
Y: -65000000
- X: -160000000
Y: -60000000
Y: -65000000
m_CompositePaths:
m_Paths:
- - {x: 1, y: 0}
Expand All @@ -3220,8 +3220,8 @@ CompositeCollider2D:
- {x: 7, y: -4.03125}
- {x: 7, y: -5.5}
- {x: 17, y: -5.5}
- {x: 17, y: -6}
- {x: 17.5, y: -6}
- {x: 17, y: -6.5}
- {x: 17.5, y: -6.5}
- {x: 17.5, y: -4.5}
- {x: 16.5, y: -4.5}
- {x: 15.5, y: -4}
Expand All @@ -3242,18 +3242,18 @@ CompositeCollider2D:
- {x: -2.5, y: -3}
- {x: -4.5, y: -4}
- {x: -6, y: -4}
- {x: -6, y: -6}
- {x: -5.5, y: -6}
- {x: -6, y: -6.5}
- {x: -5.5, y: -6.5}
- - {x: -16, y: -5.5}
- {x: -7.5, y: -5.5}
- {x: -7.5, y: -6}
- {x: -7, y: -6}
- {x: -7.5, y: -6.5}
- {x: -7, y: -6.5}
- {x: -7, y: -4.5}
- {x: -13.5, y: -4.5}
- {x: -14.5, y: -4}
- {x: -16.5, y: -4}
- {x: -16.5, y: -6}
- {x: -16, y: -6}
- {x: -16.5, y: -6.5}
- {x: -16, y: -6.5}
m_VertexDistance: 0.0005
m_OffsetDistance: 0
m_UseDelaunayMesh: 0
Expand Down Expand Up @@ -3353,6 +3353,46 @@ Tilemap:
m_GameObject: {fileID: 1816989167}
m_Enabled: 1
m_Tiles:
- first: {x: -33, y: -13, z: 0}
second:
serializedVersion: 2
m_TileIndex: 49
m_TileSpriteIndex: 30
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 2147483650
- first: {x: -15, y: -13, z: 0}
second:
serializedVersion: 2
m_TileIndex: 49
m_TileSpriteIndex: 30
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 2147483650
- first: {x: -12, y: -13, z: 0}
second:
serializedVersion: 2
m_TileIndex: 49
m_TileSpriteIndex: 30
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 2147483650
- first: {x: 34, y: -13, z: 0}
second:
serializedVersion: 2
m_TileIndex: 49
m_TileSpriteIndex: 30
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 2147483650
- first: {x: -33, y: -12, z: 0}
second:
serializedVersion: 2
Expand Down Expand Up @@ -6448,7 +6488,7 @@ Tilemap:
m_Data: {fileID: 11400000, guid: 4c2ac97eb99a4754990584e8c9bf5ea7, type: 2}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 171
- m_RefCount: 175
m_Data: {fileID: 11400000, guid: 843b27987e908ea499d454f660d4a7c5, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: f1c3f3be68aac7e428907ee4031ff0b8, type: 2}
Expand Down Expand Up @@ -6525,7 +6565,7 @@ Tilemap:
m_Data: {fileID: -1084836676, guid: a775520159383d847b8ce31256b06b01, type: 3}
- m_RefCount: 1
m_Data: {fileID: 48086323, guid: a775520159383d847b8ce31256b06b01, type: 3}
- m_RefCount: 7
- m_RefCount: 11
m_Data: {fileID: -994861787, guid: a775520159383d847b8ce31256b06b01, type: 3}
- m_RefCount: 3
m_Data: {fileID: 1315291416, guid: a775520159383d847b8ce31256b06b01, type: 3}
Expand Down Expand Up @@ -6614,7 +6654,7 @@ Tilemap:
- m_RefCount: 1
m_Data: {fileID: -1933302858, guid: a775520159383d847b8ce31256b06b01, type: 3}
m_TileMatrixArray:
- m_RefCount: 272
- m_RefCount: 276
m_Data:
e00: 1
e01: 0
Expand Down Expand Up @@ -6687,7 +6727,7 @@ Tilemap:
e32: 0
e33: 1
m_TileColorArray:
- m_RefCount: 291
- m_RefCount: 295
m_Data: {r: 1, g: 1, b: 1, a: 1}
- m_RefCount: 0
m_Data: {r: 2.1115e-41, g: 2.1115e-41, b: 2.1115e-41, a: 2.1115e-41}
Expand Down
4 changes: 2 additions & 2 deletions Assets/Scenes/Levels/CustomJungle.unity
View file
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ PrefabInstance:
- target: {fileID: 5500062339093502114, guid: 43d56bd18d06e9b4abe323618a20a228,
type: 3}
propertyPath: levelMinTileY
value: -11
value: -13
objectReference: {fileID: 0}
- target: {fileID: 5500062339093502114, guid: 43d56bd18d06e9b4abe323618a20a228,
type: 3}
Expand Down Expand Up @@ -440,7 +440,7 @@ PrefabInstance:
- target: {fileID: 5500062339093502114, guid: 43d56bd18d06e9b4abe323618a20a228,
type: 3}
propertyPath: levelHeightTile
value: 11
value: 13
objectReference: {fileID: 0}
- target: {fileID: 5500062339093502114, guid: 43d56bd18d06e9b4abe323618a20a228,
type: 3}
Expand Down
Loading

0 comments on commit 643abac

Please # to comment.