Skip to content

Commit f525ef9

Browse files
committed
add: test and added 22 block monsters
1 parent 3a7b81d commit f525ef9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+459
-100
lines changed

Assets/Resources/StaticData/Balance/Balance.asset

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,6 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: 987ce556149e4897a968651a2c50b554, type: 3}
1313
m_Name: Balance
1414
m_EditorClassIdentifier:
15-
Inventory:
16-
DefaultOpenedCells: {fileID: 11400000, guid: 2361ab47e4090e148983b9a8f3f47b24, type: 2}
17-
DefaultItems:
18-
- Id: apple01
19-
- Id: blueberry01
20-
- Id: blueberry01
21-
- Id: blueberry01
22-
- Id: apple01
15+
TileBalanceData:
16+
ColorEven: {r: 0, g: 0.764151, b: 0.029966794, a: 1}
17+
ColorNotEven: {r: 0, g: 0.5849056, b: 0.023996126, a: 1}
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: 73698c54e77f2b34ea84f49756a68126, type: 3}
13+
m_Name: Bat
14+
m_EditorClassIdentifier:
15+
id: Bat
16+
icon: {fileID: 21300000, guid: 46ccb3ef822a43d429313a5a80c54504, type: 3}
17+
prefab: {fileID: 1162074717683033587, guid: c60aa9f7bac665448b358145d95a6db4, type: 3}

Assets/Resources/StaticData/BlocksData/Test_5.asset.meta renamed to Assets/Resources/StaticData/BlocksData/Bat.asset.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Resources/StaticData/BlocksData/Test_6.asset renamed to Assets/Resources/StaticData/BlocksData/Bat_Lord.asset

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ MonoBehaviour:
1010
m_Enabled: 1
1111
m_EditorHideFlags: 0
1212
m_Script: {fileID: 11500000, guid: 73698c54e77f2b34ea84f49756a68126, type: 3}
13-
m_Name: Test_6
13+
m_Name: Bat_Lord
1414
m_EditorClassIdentifier:
15-
id: Test_6
15+
id: Bat_Lord
1616
icon: {fileID: 21300000, guid: 1cc5832122ec43a4cbd0c713119107c1, type: 3}
17-
prefab: {fileID: 0}
17+
prefab: {fileID: 2156180079196364993, guid: 925d3151938a8f94fb61678f556ba81e, type: 3}

Assets/Resources/StaticData/BlocksData/Test_3.asset.meta renamed to Assets/Resources/StaticData/BlocksData/Bat_Lord.asset.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: 73698c54e77f2b34ea84f49756a68126, type: 3}
13+
m_Name: Bee_Cute
14+
m_EditorClassIdentifier:
15+
id: Bee_Cute
16+
icon: {fileID: 21300000, guid: 8da47673cd771ef41b510dbc20b6aaa4, type: 3}
17+
prefab: {fileID: 3198499350609119052, guid: 9992beb367802434fbe4638bb61476bb, type: 3}

Assets/Resources/StaticData/BlocksData/Test_6.asset.meta renamed to Assets/Resources/StaticData/BlocksData/Bee_Cute.asset.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: 73698c54e77f2b34ea84f49756a68126, type: 3}
13+
m_Name: Bird
14+
m_EditorClassIdentifier:
15+
id: Bird
16+
icon: {fileID: 21300000, guid: ca2a8d657e8c0574fa5010534ce02501, type: 3}
17+
prefab: {fileID: 2361259873805981146, guid: 509cc0139dddd3e4fbe729e27b8f0dc8, type: 3}

Assets/Resources/StaticData/BlocksData/Test_4.asset.meta renamed to Assets/Resources/StaticData/BlocksData/Bird.asset.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Resources/StaticData/BlocksData/BlockLibrary.asset

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,27 @@ MonoBehaviour:
1313
m_Name: BlockLibrary
1414
m_EditorClassIdentifier:
1515
AllBlocks:
16-
- {fileID: 11400000, guid: d7831333fc0fec44f9c7d1e185ca6ba9, type: 2}
17-
- {fileID: 11400000, guid: 6f840c6e80be02847a36539af4966f44, type: 2}
18-
- {fileID: 11400000, guid: 653a1b7a0d0a7584db631a6d3fe22975, type: 2}
19-
- {fileID: 11400000, guid: 275269e371b517a4c904804a054d498d, type: 2}
20-
- {fileID: 11400000, guid: fe351b0a1c67ed04a93553f36a2c6c17, type: 2}
21-
- {fileID: 11400000, guid: 3fddecc790456f245919a58dea069552, type: 2}
22-
- {fileID: 11400000, guid: bea2451b1a5ce3a458317800588169f1, type: 2}
23-
- {fileID: 11400000, guid: fec0b7c3518cd74459f0ed42ede2827c, type: 2}
24-
- {fileID: 11400000, guid: 7b0fa29ca43f6c843994988a93b871bc, type: 2}
25-
- {fileID: 11400000, guid: 304b773702014ad4889ec095aebabf09, type: 2}
16+
- {fileID: 11400000, guid: 7c008304689593f4baea20e514714496, type: 2}
17+
- {fileID: 11400000, guid: 3281f2947b1d21e46bdd700052373997, type: 2}
18+
- {fileID: 11400000, guid: af6a4e061c1c8ef45927278d525928d3, type: 2}
19+
- {fileID: 11400000, guid: 71940379d9810c64fb8354a7ef7abee4, type: 2}
20+
- {fileID: 11400000, guid: 3ecfa51d6796b194dab7f56c1dfe83a2, type: 2}
21+
- {fileID: 11400000, guid: 38f45028e69ebf743ba9b146e4c48caf, type: 2}
22+
- {fileID: 11400000, guid: d21b921b94832c247b660e815a9a307c, type: 2}
23+
- {fileID: 11400000, guid: 5501e87212832764597e706da96fccf1, type: 2}
24+
- {fileID: 11400000, guid: 3e7229f76a0bc584496af065ff71a6b1, type: 2}
25+
- {fileID: 11400000, guid: 3f441a1822d87bf4ba3a26b08645b43f, type: 2}
26+
- {fileID: 11400000, guid: 39902db6f77c3d447b1f2674e0851345, type: 2}
27+
- {fileID: 11400000, guid: 5298b8c0b070a9442b4399da2a435870, type: 2}
28+
- {fileID: 11400000, guid: 698e8fa046282a740b969feb7a56ec88, type: 2}
29+
- {fileID: 11400000, guid: 4885b12574cdbbe46a73e45324eba231, type: 2}
30+
- {fileID: 11400000, guid: 3aac42a4794b6b647ba24cade531a466, type: 2}
31+
- {fileID: 11400000, guid: aa6fb5d5c6f4f1f47ab0f371d2de0a52, type: 2}
32+
- {fileID: 11400000, guid: fa81f3a27ad169649b259fa6ea6030bb, type: 2}
33+
- {fileID: 11400000, guid: 8e7b73995a27f1e438efc044208a1c3e, type: 2}
34+
- {fileID: 11400000, guid: 153768117ce05f24fb0434a5895826eb, type: 2}
35+
- {fileID: 11400000, guid: bbf2c40bac37345438ac8766c77bcde7, type: 2}
36+
- {fileID: 11400000, guid: d2c44b52101a30842b6f2fd681d54528, type: 2}
37+
- {fileID: 11400000, guid: 690beac9c4d5e8d4a8b79e13ecda8635, type: 2}
38+
- {fileID: 11400000, guid: 5fdd51bd819badc4b8615d673badacc3, type: 2}
39+
- {fileID: 11400000, guid: 59a2039f2b10e8743af7954ab29ac072, type: 2}

0 commit comments

Comments
 (0)