From 3cf2324bfe85522d90ba72706891e26b816f94cf Mon Sep 17 00:00:00 2001 From: yudonglin Date: Tue, 17 Aug 2021 16:49:35 -0700 Subject: [PATCH 01/11] change the way that certain data is stored and read --- Data/chapter_dialogs_example.yaml | 56 +------- Data/{blocks.yaml => database.yaml} | 210 +++++++++++++++++++++++++++- Data/decorations.yaml | 103 -------------- Data/info_example.yaml | 7 - Data/npcImageDatabase.yaml | 99 ------------- Data/producersList.yaml | 5 - Source/mainMenu.py | 12 +- 7 files changed, 215 insertions(+), 277 deletions(-) rename Data/{blocks.yaml => database.yaml} (70%) delete mode 100644 Data/decorations.yaml delete mode 100644 Data/info_example.yaml delete mode 100644 Data/npcImageDatabase.yaml delete mode 100644 Data/producersList.yaml diff --git a/Data/chapter_dialogs_example.yaml b/Data/chapter_dialogs_example.yaml index b9828208..1ebb9306 100644 --- a/Data/chapter_dialogs_example.yaml +++ b/Data/chapter_dialogs_example.yaml @@ -8,57 +8,7 @@ description: The description of the chapter, will be displayed during the loadin screen dialog_during_battle: null dialogs: - dialog_after_battle: - head: - background_img: null - background_music: null - characters_img: null - content: - - Put Content Here - last_dialog_id: null - narrator: Name - next_dialog_id: - target: 1 - type: default - 1: - background_img: null - background_music: null - characters_img: null - content: - - Put Content Here - last_dialog_id: head - narrator: Name - next_dialog_id: null - dialog_before_battle: - head: - background_img: null - background_music: null - characters_img: null - content: - - Put Content Here - last_dialog_id: null - narrator: Name - next_dialog_id: - target: 1 - type: default - 1: - background_img: null - background_music: null - characters_img: null - content: - - Put Content Here - last_dialog_id: head - narrator: Name - next_dialog_id: null - dialog_during_battle: - head: - background_img: - background_music: null - characters_img: null - content: - - '' - last_dialog_id: null - narrator: Name - next_dialog_id: - type: break + dialog_after_battle: {} + dialog_before_battle: {} + dialog_during_battle: {} title: The title of this chapter diff --git a/Data/blocks.yaml b/Data/database.yaml similarity index 70% rename from Data/blocks.yaml rename to Data/database.yaml index 2d8da1df..5135804a 100644 --- a/Data/blocks.yaml +++ b/Data/database.yaml @@ -1,4 +1,4 @@ -blocks: +Blocks: LowTileDirt01: canPassThrough: true LowTileDirtToStoneTransition01: @@ -437,3 +437,211 @@ blocks: canPassThrough: true TileWood04: canPassThrough: true +Contributors: + mainMenu: + - DIZZYs WALLPAPERS + sound: + - 影之光 +Decorations: + Desert_big_cactus_02: obstacle + Desert_big_cactus_03: obstacle + Desert_big_cactus_04: obstacle + Desert_big_flower_01: other + Desert_small_Agave_Cactus_01: other + Desert_small_Agave_Cactus_02: other + Desert_small_Agave_Cactus_03: other + Desert_small_Agave_Cactus_04: other + Desert_small_Bush_01: tree + Desert_small_Bush_02: tree + Desert_small_Cactus_02: obstacle + Desert_small_Cactus_03: obstacle + Desert_small_Cactus_04: obstacle + Desert_small_Cactus_05: obstacle + Desert_small_Cactus_06: obstacle + Desert_small_Cactus_07: obstacle + Desert_small_Cactus_09: obstacle + Desert_small_Cactus_10: obstacle + Desert_small_Cactus_11: obstacle + Desert_small_Cactus_12: obstacle + Desert_small_Cactus_13: obstacle + Desert_small_Cactus_14: obstacle + Desert_small_Cactus_15: obstacle + Desert_small_Flower_01: other + Desert_small_Flower_02: other + Desert_small_Flower_03: other + Desert_small_Flower_04: other + Forest_big_cypress_01: tree + Forest_big_cypress_02: tree + Forest_big_cypress_03: tree + Forest_big_stone_01: obstacle + Forest_big_stone_02: obstacle + Forest_big_tree_leaf_01: tree + Forest_big_tree_needle_03: tree + Forest_big_tree_needle_04: tree + Forest_deadBush3: other + Forest_deadTree1: other + Forest_deadTree2: other + Forest_deadTree4: other + Forest_deadbush5: other + Forest_small_bush_01: tree + Forest_small_bush_02: tree + Forest_small_clover_01: other + Forest_small_clover_02: other + Forest_small_clover_03: other + Forest_small_fern_01: other + Forest_small_fern_02: other + Forest_small_flower_01: other + Forest_small_flower_02: other + Forest_small_flower_03: other + Forest_small_grass_01: other + Forest_small_grass_02: other + Forest_small_grass_03: other + Forest_small_grass_04: other + Forest_small_grass_05: other + Forest_small_grass_06: other + Forest_small_grass_07: other + Forest_small_grass_08: other + Forest_small_mushroom_01: other + Forest_small_mushroom_02: other + Forest_small_mushroom_03: other + Forest_small_mushroom_04: other + Forest_small_tree_log_01: obstacle + Forest_small_tree_log_02: obstacle + Forest_small_tree_log_03: obstacle + Forest_small_tree_stump_01: obstacle + Forest_small_tree_stump_02: obstacle + Forest_small_tree_stump_03: obstacle + bamboo1: tree + bamboo2: tree + bamboo3: tree + bamboo4: tree + bamboo5: tree + bamboo6: tree + bamboo7: tree + bamboo8: tree + chest: chest + desert_skull_01: obstacle + desert_skull_02: obstacle + desert_skull_03: obstacle + forest_berrybush: tree + forest_bush4: other + forest_bush5: other + reed1: other + reed2: other + reed3: other + reed4: other + reed5: other + reed6: other + reed7: other + reed8: other + stone1: obstacle + stone2: obstacle + stone3: obstacle + waterbuds: other + waterplant0: other + waterplant1: other + waterplant2: other + waterplant3: other + waterplant4: other + waterplant5: other + waterplant6: other +Npc: + aa12: + - aa12.png + - aa12_hurt.png + asval: + - asval.png + - asval_hurt.png + contender: + - contender.png + - contender_hurt.png + fnfnc: + - fnfnc.png + - fnfnc_hurt.png + g11: + - g11.png + - g11_hurt.png + g36: + - g36.png + - g36_hurt.png + g41: + - g41.png + - g41_hurt.png + grizzly: + - grizzly.png + - grizzly_hurt.png + gsh-18: + - gsh-18.png + - gsh-18_hurt.png + helianthus: + - helianthus_1.png + - helianthus_2.png + - helianthus_3.png + - helianthus_4.png + hk416: + - hk416.png + - hk416_hurt.png + k: + - k.png + kalina: + - kalina_0.png + - kalina_1.png + - kalina_2.png + - kalina_3.png + - kalina_4.png + - kalina_5.png + - kalina_6.png + - kalina_7.png + - kalina_8.png + kp31: + - kp31.png + - kp31_hurt.png + kryuger: + - kryuger.png + lewis: + - lewis.png + - lewis_hurt.png + m14: + - m14.png + - m14_hurt.png + m1903: + - m1903.png + - m1903_hurt.png + m1928a1: + - m1928a1.png + - m1928a1_hurt.png + mg4: + - mg4.png + - mg4_hurt.png + negev: + - negev.png + - negev_hurt.png + nyto: + - nyto.png + pp1901: + - pp1901.png + - pp1901_hurt.png + saiga12: + - saiga12.png + - saiga12_hurt.png + sat8: + - sat8.png + - sat8_hurt.png + sr3mp: + - sr3mp.png + - sr3mp_hurt.png + sv-98: + - sv-98.png + - sv-98_hurt.png + ump45: + - ump45.png + - ump45_hurt.png + ump9: + - ump9.png + - ump9_hurt.png + wa2000: + - wa2000.png + - wa2000_hurt.png + welrod: + - welrod.png + - welrod_hurt.png diff --git a/Data/decorations.yaml b/Data/decorations.yaml deleted file mode 100644 index 24b04849..00000000 --- a/Data/decorations.yaml +++ /dev/null @@ -1,103 +0,0 @@ -decorations: - Desert_big_cactus_02: obstacle - Desert_big_cactus_03: obstacle - Desert_big_cactus_04: obstacle - Desert_big_flower_01: other - Desert_small_Agave_Cactus_01: other - Desert_small_Agave_Cactus_02: other - Desert_small_Agave_Cactus_03: other - Desert_small_Agave_Cactus_04: other - Desert_small_Bush_01: tree - Desert_small_Bush_02: tree - Desert_small_Cactus_02: obstacle - Desert_small_Cactus_03: obstacle - Desert_small_Cactus_04: obstacle - Desert_small_Cactus_05: obstacle - Desert_small_Cactus_06: obstacle - Desert_small_Cactus_07: obstacle - Desert_small_Cactus_09: obstacle - Desert_small_Cactus_10: obstacle - Desert_small_Cactus_11: obstacle - Desert_small_Cactus_12: obstacle - Desert_small_Cactus_13: obstacle - Desert_small_Cactus_14: obstacle - Desert_small_Cactus_15: obstacle - Desert_small_Flower_01: other - Desert_small_Flower_02: other - Desert_small_Flower_03: other - Desert_small_Flower_04: other - Forest_big_cypress_01: tree - Forest_big_cypress_02: tree - Forest_big_cypress_03: tree - Forest_big_stone_01: obstacle - Forest_big_stone_02: obstacle - Forest_big_tree_leaf_01: tree - Forest_big_tree_needle_03: tree - Forest_big_tree_needle_04: tree - Forest_deadBush3: other - Forest_deadTree1: other - Forest_deadTree2: other - Forest_deadTree4: other - Forest_deadbush5: other - Forest_small_bush_01: tree - Forest_small_bush_02: tree - Forest_small_clover_01: other - Forest_small_clover_02: other - Forest_small_clover_03: other - Forest_small_fern_01: other - Forest_small_fern_02: other - Forest_small_flower_01: other - Forest_small_flower_02: other - Forest_small_flower_03: other - Forest_small_grass_01: other - Forest_small_grass_02: other - Forest_small_grass_03: other - Forest_small_grass_04: other - Forest_small_grass_05: other - Forest_small_grass_06: other - Forest_small_grass_07: other - Forest_small_grass_08: other - Forest_small_mushroom_01: other - Forest_small_mushroom_02: other - Forest_small_mushroom_03: other - Forest_small_mushroom_04: other - Forest_small_tree_log_01: obstacle - Forest_small_tree_log_02: obstacle - Forest_small_tree_log_03: obstacle - Forest_small_tree_stump_01: obstacle - Forest_small_tree_stump_02: obstacle - Forest_small_tree_stump_03: obstacle - bamboo1: tree - bamboo2: tree - bamboo3: tree - bamboo4: tree - bamboo5: tree - bamboo6: tree - bamboo7: tree - bamboo8: tree - chest: chest - desert_skull_01: obstacle - desert_skull_02: obstacle - desert_skull_03: obstacle - forest_berrybush: tree - forest_bush4: other - forest_bush5: other - reed1: other - reed2: other - reed3: other - reed4: other - reed5: other - reed6: other - reed7: other - reed8: other - stone1: obstacle - stone2: obstacle - stone3: obstacle - waterbuds: other - waterplant0: other - waterplant1: other - waterplant2: other - waterplant3: other - waterplant4: other - waterplant5: other - waterplant6: other diff --git a/Data/info_example.yaml b/Data/info_example.yaml deleted file mode 100644 index 743197f9..00000000 --- a/Data/info_example.yaml +++ /dev/null @@ -1,7 +0,0 @@ -author: Put your name here -default_lang: null -link: https://whateve-you-want/maybe-your-github-link -title: - English: Example Project - SimplifiedChinese: 演示项目 -version: 0.0 diff --git a/Data/npcImageDatabase.yaml b/Data/npcImageDatabase.yaml deleted file mode 100644 index 8254edd5..00000000 --- a/Data/npcImageDatabase.yaml +++ /dev/null @@ -1,99 +0,0 @@ -aa12: -- aa12.png -- aa12_hurt.png -asval: -- asval.png -- asval_hurt.png -contender: -- contender.png -- contender_hurt.png -fnfnc: -- fnfnc.png -- fnfnc_hurt.png -g11: -- g11.png -- g11_hurt.png -g36: -- g36.png -- g36_hurt.png -g41: -- g41.png -- g41_hurt.png -grizzly: -- grizzly.png -- grizzly_hurt.png -gsh-18: -- gsh-18.png -- gsh-18_hurt.png -helianthus: -- helianthus_1.png -- helianthus_2.png -- helianthus_3.png -- helianthus_4.png -hk416: -- hk416.png -- hk416_hurt.png -k: -- k.png -kalina: -- kalina_0.png -- kalina_1.png -- kalina_2.png -- kalina_3.png -- kalina_4.png -- kalina_5.png -- kalina_6.png -- kalina_7.png -- kalina_8.png -kp31: -- kp31.png -- kp31_hurt.png -kryuger: -- kryuger.png -lewis: -- lewis.png -- lewis_hurt.png -m14: -- m14.png -- m14_hurt.png -m1903: -- m1903.png -- m1903_hurt.png -m1928a1: -- m1928a1.png -- m1928a1_hurt.png -mg4: -- mg4.png -- mg4_hurt.png -negev: -- negev.png -- negev_hurt.png -nyto: -- nyto.png -pp1901: -- pp1901.png -- pp1901_hurt.png -saiga12: -- saiga12.png -- saiga12_hurt.png -sat8: -- sat8.png -- sat8_hurt.png -sr3mp: -- sr3mp.png -- sr3mp_hurt.png -sv-98: -- sv-98.png -- sv-98_hurt.png -ump45: -- ump45.png -- ump45_hurt.png -ump9: -- ump9.png -- ump9_hurt.png -wa2000: -- wa2000.png -- wa2000_hurt.png -welrod: -- welrod.png -- welrod_hurt.png diff --git a/Data/producersList.yaml b/Data/producersList.yaml deleted file mode 100644 index f558ce17..00000000 --- a/Data/producersList.yaml +++ /dev/null @@ -1,5 +0,0 @@ -producersList: - mainMenu: - - DIZZYs WALLPAPERS - sound: - - 影之光 diff --git a/Source/mainMenu.py b/Source/mainMenu.py index bd3c00a0..c101c7c5 100644 --- a/Source/mainMenu.py +++ b/Source/mainMenu.py @@ -98,9 +98,7 @@ def __reload_workshop_files_list(self, screen_size: tuple, createMode: bool = Fa try: info_data = linpg.config.load(os.path.join(path, "info.yaml")) except Exception: - info_data = linpg.config.load(r"Data/info_example.yaml") - info_data["default_lang"] = linpg.setting.language - linpg.config.save(os.path.join(path, "info.yaml"), info_data) + linpg.create_new_project(path, "yaml") self.workshop_files_text.append(os.path.basename(path)) self.workshop_files.append(info_data["title"][linpg.setting.language]) self.workshop_files.append(linpg.lang.get_text("Global", "back")) @@ -228,12 +226,8 @@ def __create_new_project(self) -> None: while os.path.exists(os.path.join("Data", "workshop", fileName)): fileName = "{0} ({1})".format(fileDefaultName, avoidDuplicateId) avoidDuplicateId += 1 - # 创建文件夹 - os.makedirs(os.path.join("Data", "workshop", fileName)) - # 储存数据 - info_data: dict = linpg.config.load(r"Data/info_example.yaml") - info_data["default_lang"] = linpg.setting.language - linpg.config.save(os.path.join("Data", "workshop", fileName, "info.yaml"), info_data) + # 创建项目模板 + linpg.create_new_project(os.path.join("Data", "workshop", fileName), "yaml") # 创建新的对话文和地图文件 def __create_new_chapter(self) -> None: From 303f7da90e887ae31ff26780540d5ea067f7f05f Mon Sep 17 00:00:00 2001 From: yudonglin Date: Tue, 24 Aug 2021 16:07:01 -0700 Subject: [PATCH 02/11] adopt some changes that will come with the upcoming linpg update, as well as removing unessential assets --- .gitignore | 3 ++- Assets/image/UI/add.png | 3 --- Assets/image/UI/back.png | 3 --- Assets/image/UI/container.png | 3 --- Assets/image/UI/container_button.png | 3 --- Assets/image/UI/delete.png | 3 --- Assets/image/UI/deselect.png | 3 --- Assets/image/UI/dialog_auto.png | 3 --- Assets/image/UI/dialog_hide.png | 3 --- Assets/image/UI/dialog_history.png | 3 --- Assets/image/UI/dialog_show.png | 3 --- Assets/image/UI/dialog_skip.png | 3 --- Assets/image/UI/menu.png | 3 --- Assets/image/UI/mouse.png | 3 --- Assets/image/UI/mouse_icon.png | 3 --- Assets/image/UI/mouse_none.png | 3 --- Assets/image/UI/option.png | 3 --- Assets/image/UI/option_selected.png | 3 --- Assets/image/UI/previous.png | 3 --- Assets/image/UI/reload.png | 3 --- Assets/image/UI/save.png | 3 --- Assets/image/UI/setting_bar_circle.png | 3 --- Assets/image/UI/setting_bar_empty.png | 3 --- Assets/image/UI/setting_bar_full.png | 3 --- Assets/image/UI/setting_baseImg.png | 3 --- Assets/image/fix.bat | 6 ------ Data/chapter_map_example.yaml | 2 +- Data/main_chapter/chapter1_map.yaml | 2 +- Source/base.py | 8 +++++--- Source/core/editor.py | 26 +++++++++++++------------- Source/core/ui.py | 2 +- 31 files changed, 23 insertions(+), 98 deletions(-) delete mode 100644 Assets/image/UI/add.png delete mode 100644 Assets/image/UI/back.png delete mode 100644 Assets/image/UI/container.png delete mode 100644 Assets/image/UI/container_button.png delete mode 100644 Assets/image/UI/delete.png delete mode 100644 Assets/image/UI/deselect.png delete mode 100644 Assets/image/UI/dialog_auto.png delete mode 100644 Assets/image/UI/dialog_hide.png delete mode 100644 Assets/image/UI/dialog_history.png delete mode 100644 Assets/image/UI/dialog_show.png delete mode 100644 Assets/image/UI/dialog_skip.png delete mode 100644 Assets/image/UI/menu.png delete mode 100644 Assets/image/UI/mouse.png delete mode 100644 Assets/image/UI/mouse_icon.png delete mode 100644 Assets/image/UI/mouse_none.png delete mode 100644 Assets/image/UI/option.png delete mode 100644 Assets/image/UI/option_selected.png delete mode 100644 Assets/image/UI/previous.png delete mode 100644 Assets/image/UI/reload.png delete mode 100644 Assets/image/UI/save.png delete mode 100644 Assets/image/UI/setting_bar_circle.png delete mode 100644 Assets/image/UI/setting_bar_empty.png delete mode 100644 Assets/image/UI/setting_bar_full.png delete mode 100644 Assets/image/UI/setting_baseImg.png delete mode 100644 Assets/image/fix.bat diff --git a/.gitignore b/.gitignore index 25a11fc3..e23cbf54 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,5 @@ Data/workshop/ Source_pyd/ dist/ crash_reports/ -test.py \ No newline at end of file +test.py +dev.key diff --git a/Assets/image/UI/add.png b/Assets/image/UI/add.png deleted file mode 100644 index 9174efdc..00000000 --- a/Assets/image/UI/add.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0e86ec29a22156c396761b390d23162abf27a737cd0096af37a7bfcdc9c4182d -size 1355 diff --git a/Assets/image/UI/back.png b/Assets/image/UI/back.png deleted file mode 100644 index 09a7c3e8..00000000 --- a/Assets/image/UI/back.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2f5341e9042070ab6e50a479dd6e017ca4f5f34d2e4a57d0a4e26c4c25402bbd -size 3208 diff --git a/Assets/image/UI/container.png b/Assets/image/UI/container.png deleted file mode 100644 index cd0020bf..00000000 --- a/Assets/image/UI/container.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f964e9c0290e5a8c558cf7f5cd1da6c87a8a916c38c8cc0bd7a6c14ca19e874b -size 39791 diff --git a/Assets/image/UI/container_button.png b/Assets/image/UI/container_button.png deleted file mode 100644 index 0fa5d1ba..00000000 --- a/Assets/image/UI/container_button.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:66b98dcc4a1a299eed26b61f4022f1915e30c9af480e241c9ccd7cd7cad45de6 -size 6834 diff --git a/Assets/image/UI/delete.png b/Assets/image/UI/delete.png deleted file mode 100644 index dce761cb..00000000 --- a/Assets/image/UI/delete.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c78a1128764f8d380899b4dce6b6ccebe1f9bcbb71803fac09c22a1131a866ac -size 2058 diff --git a/Assets/image/UI/deselect.png b/Assets/image/UI/deselect.png deleted file mode 100644 index b2b3198b..00000000 --- a/Assets/image/UI/deselect.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4394d649fbd86fbe20f3385865359d09dffa6f00aa3d0a8cc6909f83935388c2 -size 4687 diff --git a/Assets/image/UI/dialog_auto.png b/Assets/image/UI/dialog_auto.png deleted file mode 100644 index 9109e9ef..00000000 --- a/Assets/image/UI/dialog_auto.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1b3ba7cce2049bf2657cedcd9762d6024c1c5c379293307dba8a9029ca773579 -size 3923 diff --git a/Assets/image/UI/dialog_hide.png b/Assets/image/UI/dialog_hide.png deleted file mode 100644 index b5778fa2..00000000 --- a/Assets/image/UI/dialog_hide.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3e416df1459d81748ecf1390a7c6c59e4b0da8a237b4d6acee43f44eff21ce05 -size 4422 diff --git a/Assets/image/UI/dialog_history.png b/Assets/image/UI/dialog_history.png deleted file mode 100644 index caa8e238..00000000 --- a/Assets/image/UI/dialog_history.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7bb4ad7e555facdb0fc226f552de8c8e7a013ee0c90c93c410bdfdf902c50317 -size 1886 diff --git a/Assets/image/UI/dialog_show.png b/Assets/image/UI/dialog_show.png deleted file mode 100644 index feeb3dfb..00000000 --- a/Assets/image/UI/dialog_show.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c4a7705171bf2592da7f843a2352f0a1cc4a1391168e8256a1cfc15d0c7c24c6 -size 3857 diff --git a/Assets/image/UI/dialog_skip.png b/Assets/image/UI/dialog_skip.png deleted file mode 100644 index ec17064b..00000000 --- a/Assets/image/UI/dialog_skip.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:43be934f6767809f568fd2c36f6f3670c2fd09543a2a4a9f1e76a7580ef32e70 -size 2591 diff --git a/Assets/image/UI/menu.png b/Assets/image/UI/menu.png deleted file mode 100644 index 3a7fe481..00000000 --- a/Assets/image/UI/menu.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:224fd78902d6473eb05baa55c758948b4cd27b45e148c516b39a447191b1f3d4 -size 4105 diff --git a/Assets/image/UI/mouse.png b/Assets/image/UI/mouse.png deleted file mode 100644 index 55912c6c..00000000 --- a/Assets/image/UI/mouse.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c0060b136a08741fcea25972a34c5f0343f9f4e0dd93442dd10de947f9f3c145 -size 1681 diff --git a/Assets/image/UI/mouse_icon.png b/Assets/image/UI/mouse_icon.png deleted file mode 100644 index 0467642d..00000000 --- a/Assets/image/UI/mouse_icon.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c5f4e780ff247e7da8371207d2c1ea2c1714c98deae7f1ec72b02ac6b033611a -size 4613 diff --git a/Assets/image/UI/mouse_none.png b/Assets/image/UI/mouse_none.png deleted file mode 100644 index 800af1cb..00000000 --- a/Assets/image/UI/mouse_none.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:be8be4f7cb20127cabe94945e739647b5b73633daf2d3d25587d049f5aa41a9e -size 1705 diff --git a/Assets/image/UI/option.png b/Assets/image/UI/option.png deleted file mode 100644 index 97faa275..00000000 --- a/Assets/image/UI/option.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9c3c1cf8ee048f19ec5214d054d3ded371cfc2f91a3ab0149c06f6ba50b13b81 -size 3591 diff --git a/Assets/image/UI/option_selected.png b/Assets/image/UI/option_selected.png deleted file mode 100644 index ff6e8994..00000000 --- a/Assets/image/UI/option_selected.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:39799ac9d4c20b5d0659cfd55cff97804dc4b33158393ce7465868e5ceb6bf0e -size 4398 diff --git a/Assets/image/UI/previous.png b/Assets/image/UI/previous.png deleted file mode 100644 index 672893cb..00000000 --- a/Assets/image/UI/previous.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1ab86e326161d99a33bda430284e3a56f9a27346a33014871b1bc221ed15cf44 -size 2560 diff --git a/Assets/image/UI/reload.png b/Assets/image/UI/reload.png deleted file mode 100644 index b16c2246..00000000 --- a/Assets/image/UI/reload.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b79cb5578e166e420ce6058be599d867da128475ce62b4ae1a6925eee49699fd -size 3753 diff --git a/Assets/image/UI/save.png b/Assets/image/UI/save.png deleted file mode 100644 index 93117a59..00000000 --- a/Assets/image/UI/save.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dc6ed08658d17b733d62f8401d290461db942a626f4cafab10e315281b42eefa -size 1931 diff --git a/Assets/image/UI/setting_bar_circle.png b/Assets/image/UI/setting_bar_circle.png deleted file mode 100644 index a94ab957..00000000 --- a/Assets/image/UI/setting_bar_circle.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fa59984a4720435dabe55b382c1da00eb6bc0ea50adc2cc65abe0d1cf43e37d6 -size 413 diff --git a/Assets/image/UI/setting_bar_empty.png b/Assets/image/UI/setting_bar_empty.png deleted file mode 100644 index 286c3f5b..00000000 --- a/Assets/image/UI/setting_bar_empty.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:988ca00c00a44babdbebdbb03e8815fe196fc93d822a3d43d35c80b0e81effd6 -size 727 diff --git a/Assets/image/UI/setting_bar_full.png b/Assets/image/UI/setting_bar_full.png deleted file mode 100644 index 8bbd61ce..00000000 --- a/Assets/image/UI/setting_bar_full.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5346c3577c01b7649d25532af8d6d083b2a714329afbde746c243e975f98d90c -size 915 diff --git a/Assets/image/UI/setting_baseImg.png b/Assets/image/UI/setting_baseImg.png deleted file mode 100644 index ba361ee2..00000000 --- a/Assets/image/UI/setting_baseImg.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5245acd378b326ad2ff387f82658c2c681b5229290f710105244febcbf83b43a -size 20769 diff --git a/Assets/image/fix.bat b/Assets/image/fix.bat deleted file mode 100644 index 3b10048c..00000000 --- a/Assets/image/fix.bat +++ /dev/null @@ -1,6 +0,0 @@ -@echo off -echo ImageMagick fix libpng warning: iCCP: Not recognizing known sRGB profile ...... -echo Search PNG in subdirs and process ... -set fn=D:\ImageMagick-7.0.10-10-portable-Q16-x64\convert.exe -for /f "tokens=*" %%i in ('dir/s/b *.png') do "%fn%" "%%i" -strip "%%i" -pause \ No newline at end of file diff --git a/Data/chapter_map_example.yaml b/Data/chapter_map_example.yaml index cbf1c5dd..7fd52880 100644 --- a/Data/chapter_map_example.yaml +++ b/Data/chapter_map_example.yaml @@ -1,5 +1,5 @@ atNight: false -backgroundImage: snowfield.jpg +background_image: snowfield.jpg background_music: Combat_02_RemnantFantasyPackage_Synari.ogg character: sv-98: diff --git a/Data/main_chapter/chapter1_map.yaml b/Data/main_chapter/chapter1_map.yaml index 7362311b..e24baa19 100644 --- a/Data/main_chapter/chapter1_map.yaml +++ b/Data/main_chapter/chapter1_map.yaml @@ -1,5 +1,5 @@ atNight: false -backgroundImage: snowfield.jpg +background_image: snowfield.jpg background_music: Combat_02_RemnantFantasyPackage_Synari.ogg character: asval: diff --git a/Source/base.py b/Source/base.py index c50fb229..acba63f5 100644 --- a/Source/base.py +++ b/Source/base.py @@ -1,9 +1,11 @@ import os from glob import glob -import linpg - -# from linpgdev import linpg +if os.path.exists("dev.key"): + from linpgdev import linpg + linpg.setting.set_developer_mode(True) +else: + import linpg __all__ = ["linpg", "os", "glob", "RPC", "ALPHA_BUILD_WARNING", "LARGE_IMAGE"] diff --git a/Source/core/editor.py b/Source/core/editor.py index e8afb28f..5639b262 100644 --- a/Source/core/editor.py +++ b/Source/core/editor.py @@ -27,7 +27,7 @@ def load( ) -> None: self._initialize(chapterType, chapterId, projectName) self.folder_for_save_file, self.name_for_save_file = os.path.split(self.get_map_file_location()) - self.decorations_setting = linpg.config.load("Data/decorations.yaml", "decorations") + self.decorations_setting = linpg.config.load("Data/database.yaml", "decorations") # 载入地图数据 mapFileData: dict = linpg.config.load(self.get_map_file_location()) # 初始化角色信息 @@ -60,7 +60,7 @@ def load( panding: int = int(screen.get_height() * 0.01) font_size: int = int(button_width / 3) self.__button_select_block = linpg.load.button_with_text_in_center( - "Assets/image/UI/menu.png", + "button.png", linpg.lang.get_text("MapEditor", "block"), "black", font_size, @@ -68,7 +68,7 @@ def load( 100, ) self.__button_select_decoration = linpg.load.button_with_text_in_center( - "Assets/image/UI/menu.png", + "button.png", linpg.lang.get_text("MapEditor", "decoration"), "black", font_size, @@ -88,12 +88,12 @@ def load( ) self.__button_select_decoration.set_left(self.__button_select_block.right + panding) self.__UIContainerRight = linpg.load.dynamic_image( - r"Assets/image/UI/container.png", + "container.png", (0, 0), (container_width, container_height), ) self.__UIContainerButtonRight = linpg.load.movable_image( - r"Assets/image/UI/container_button.png", + "container_button.png", ( int(screen.get_width() - button_width), int((screen.get_height() - button_height) / 2), @@ -151,7 +151,7 @@ def load( panding = int(screen.get_height() * 0.01) font_size = int(button_height / 2) self.__button_select_character = linpg.load.button_with_text_in_center( - "Assets/image/UI/menu.png", + "button.png", linpg.lang.get_text("General", "griffin_Kryuger"), "black", font_size, @@ -159,7 +159,7 @@ def load( 100, ) self.__button_select_sangvisFerri = linpg.load.button_with_text_in_center( - "Assets/image/UI/menu.png", + "button.png", linpg.lang.get_text("General", "sangvis_ferri"), "black", font_size, @@ -167,12 +167,12 @@ def load( 100, ) self.__UIContainerBottom = linpg.load.dynamic_image( - r"Assets/image/UI/container.png", + "container.png", (0, 0), (container_width, container_height), ) self.__UIContainerButtonBottom = linpg.load.movable_image( - r"Assets/image/UI/container_button.png", + "container_button.png", ( int((container_width - button_width) / 2), int(screen.get_height() - button_height), @@ -243,7 +243,7 @@ def load( UI_y = int(screen.get_height() * 0.02) font_size = int(self.MAP.block_width * 0.2) self.UIButton["save"] = linpg.load.button_with_text_in_center( - "Assets/image/UI/menu.png", + "button.png", linpg.lang.get_text("Global", "save"), "black", font_size, @@ -252,7 +252,7 @@ def load( ) UI_x += self.UIButton["save"].get_width() + font_size self.UIButton["back"] = linpg.load.button_with_text_in_center( - "Assets/image/UI/menu.png", + "button.png", linpg.lang.get_text("Global", "back"), "black", font_size, @@ -261,7 +261,7 @@ def load( ) UI_x += self.UIButton["back"].get_width() + font_size self.UIButton["delete"] = linpg.load.button_with_text_in_center( - "Assets/image/UI/menu.png", + "button.png", linpg.lang.get_text("Global", "delete"), "black", font_size, @@ -270,7 +270,7 @@ def load( ) UI_x += self.UIButton["delete"].get_width() + font_size self.UIButton["reload"] = linpg.load.button_with_text_in_center( - "Assets/image/UI/menu.png", + "button.png", linpg.lang.get_text("Global", "reload_file"), "black", font_size, diff --git a/Source/core/ui.py b/Source/core/ui.py index 3c29d932..3824bbe2 100644 --- a/Source/core/ui.py +++ b/Source/core/ui.py @@ -170,7 +170,7 @@ def draw(self, screen: linpg.ImageSurface) -> None: class SelectMenu: def __init__(self): selectMenuTxtDic: dict = linpg.lang.get_text("SelectMenu") - self.selectButtonImg = linpg.load.img(r"Assets/image/UI/menu.png") + self.selectButtonImg = linpg.load.img("button.png") # 攻击 self.attackAP = linpg.AP_IS_NEEDED_TO_ATTACK self.attackTxt = selectMenuTxtDic["attack"] From ce7093d4f2730b1ddef8855662b5b4791d0f3b1f Mon Sep 17 00:00:00 2001 From: yudonglin Date: Thu, 9 Sep 2021 17:47:14 -0700 Subject: [PATCH 03/11] some assets are removed because they have become the default assets of linpg --- Assets/image/environment/block/LowTileDirt01.png | 3 --- .../environment/block/LowTileDirtToStoneTransition01.png | 3 --- .../environment/block/LowTileDirtToStoneTransition02.png | 3 --- Assets/image/environment/block/LowTileRiverbed01.png | 3 --- Assets/image/environment/block/LowTileRiverbed02.png | 3 --- Assets/image/environment/block/LowTileRiverbed03.png | 3 --- Assets/image/environment/block/LowTileRiverbed04.png | 3 --- Assets/image/environment/block/LowTileSand01.png | 3 --- Assets/image/environment/block/LowTileSand02.png | 3 --- Assets/image/environment/block/LowTileSand03.png | 3 --- Assets/image/environment/block/LowTileStone01.png | 3 --- Assets/image/environment/block/LowTileStone02.png | 3 --- Assets/image/environment/block/LowTileStone03.png | 3 --- Assets/image/environment/block/OverlayCracks01.png | 3 --- Assets/image/environment/block/OverlayCracks02.png | 3 --- Assets/image/environment/block/OverlayGlow01.png | 3 --- Assets/image/environment/block/OverlayGlow02.png | 3 --- Assets/image/environment/block/OverlayGrass01.png | 3 --- Assets/image/environment/block/OverlayGrassHalfH01.png | 3 --- Assets/image/environment/block/OverlayGrassHalfH02.png | 3 --- Assets/image/environment/block/OverlayGrassHalfV01.png | 3 --- Assets/image/environment/block/OverlayGrassHalfV02Kopie.png | 3 --- Assets/image/environment/block/OverlayGrassPatch01.png | 3 --- Assets/image/environment/block/OverlayGrassPatch02.png | 3 --- Assets/image/environment/block/OverlayGrassPatch02H01.png | 3 --- Assets/image/environment/block/OverlayGrassPatch02H02.png | 3 --- Assets/image/environment/block/OverlayGrassPatch02V01.png | 3 --- Assets/image/environment/block/OverlayGrassPatch02V02.png | 3 --- Assets/image/environment/block/OverlayGrassPatch03.png | 3 --- Assets/image/environment/block/OverlayGrassPatch03H01.png | 3 --- Assets/image/environment/block/OverlayGrassPatch03H02.png | 3 --- Assets/image/environment/block/OverlayGrassPatch03V01.png | 3 --- Assets/image/environment/block/OverlayGrassPatch03V02.png | 3 --- Assets/image/environment/block/OverlayGrassPatchH01.png | 3 --- Assets/image/environment/block/OverlayGrassPatchH02.png | 3 --- Assets/image/environment/block/OverlayGrassPatchV01.png | 3 --- Assets/image/environment/block/OverlayGrassPatchV02.png | 3 --- Assets/image/environment/block/OverlayPathCross.png | 3 --- Assets/image/environment/block/OverlayPathCross301.png | 3 --- Assets/image/environment/block/OverlayPathCross302.png | 3 --- Assets/image/environment/block/OverlayPathCross303.png | 3 --- Assets/image/environment/block/OverlayPathCross304.png | 3 --- Assets/image/environment/block/OverlayPathCurve01.png | 3 --- Assets/image/environment/block/OverlayPathCurve02.png | 3 --- Assets/image/environment/block/OverlayPathCurve03.png | 3 --- Assets/image/environment/block/OverlayPathCurve04.png | 3 --- Assets/image/environment/block/OverlayPathEnd01.png | 3 --- Assets/image/environment/block/OverlayPathEnd02.png | 3 --- Assets/image/environment/block/OverlayPathEnd03.png | 3 --- Assets/image/environment/block/OverlayPathEnd04.png | 3 --- Assets/image/environment/block/OverlayPathSingle.png | 3 --- Assets/image/environment/block/OverlayPathStraight01.png | 3 --- Assets/image/environment/block/OverlayPathStraight02.png | 3 --- Assets/image/environment/block/OverlayRoofHay01.png | 3 --- Assets/image/environment/block/OverlayRoofHay02.png | 3 --- Assets/image/environment/block/OverlayRoofHay03.png | 3 --- Assets/image/environment/block/OverlayRoofHay04.png | 3 --- Assets/image/environment/block/OverlayRoofHay05.png | 3 --- Assets/image/environment/block/OverlayRoofHay06.png | 3 --- Assets/image/environment/block/OverlayRoofHay07.png | 3 --- Assets/image/environment/block/OverlayRoofHay08.png | 3 --- Assets/image/environment/block/OverlayRoofHay09.png | 3 --- Assets/image/environment/block/OverlayRoofHay10.png | 3 --- Assets/image/environment/block/OverlayRoofHay11.png | 3 --- Assets/image/environment/block/OverlayRoofHay12.png | 3 --- Assets/image/environment/block/OverlayRoofHay13.png | 3 --- Assets/image/environment/block/OverlayShoreCornerD.png | 3 --- Assets/image/environment/block/OverlayShoreCornerL.png | 3 --- Assets/image/environment/block/OverlayShoreCornerR.png | 3 --- Assets/image/environment/block/OverlayShoreCornerRU.png | 3 --- Assets/image/environment/block/OverlayShoreCornerU.png | 3 --- Assets/image/environment/block/OverlayShoreStraightLD.png | 3 --- Assets/image/environment/block/OverlayShoreStraightLU.png | 3 --- Assets/image/environment/block/OverlayShoreStraightRD.png | 3 --- Assets/image/environment/block/OverlayShoreStraightRU.png | 3 --- Assets/image/environment/block/OverlayStonePieces01.png | 3 --- .../image/environment/block/OverlayStonePieces01HalfH01.png | 3 --- .../image/environment/block/OverlayStonePieces01HalfH02.png | 3 --- .../image/environment/block/OverlayStonePieces01HalfV01.png | 3 --- .../image/environment/block/OverlayStonePieces01HalfV02.png | 3 --- Assets/image/environment/block/OverlayStonePieces02.png | 3 --- .../image/environment/block/OverlayStonePieces02HalfH01.png | 3 --- .../image/environment/block/OverlayStonePieces02HalfH02.png | 3 --- .../image/environment/block/OverlayStonePieces02HalfV01.png | 3 --- .../image/environment/block/OverlayStonePieces02HalfV02.png | 3 --- Assets/image/environment/block/OverlayWater01.png | 3 --- Assets/image/environment/block/OverlayWater02.png | 3 --- Assets/image/environment/block/PropStairStone01.png | 3 --- Assets/image/environment/block/PropStairStone02.png | 3 --- Assets/image/environment/block/PropStairStone03.png | 3 --- Assets/image/environment/block/PropStairStone04.png | 3 --- Assets/image/environment/block/PropStairStone05.png | 3 --- Assets/image/environment/block/PropStairStone06.png | 3 --- Assets/image/environment/block/PropStairStone07.png | 3 --- Assets/image/environment/block/PropStairStone08.png | 3 --- Assets/image/environment/block/PropStairStone09.png | 3 --- Assets/image/environment/block/PropStairStone10.png | 3 --- Assets/image/environment/block/PropStairStone11.png | 3 --- Assets/image/environment/block/PropStairStone12.png | 3 --- Assets/image/environment/block/TileBrickBrick01.png | 3 --- Assets/image/environment/block/TileBrickBrick02.png | 3 --- Assets/image/environment/block/TileBrickBrick03.png | 3 --- Assets/image/environment/block/TileBrickBrick04.png | 3 --- Assets/image/environment/block/TileBrickSandStone01.png | 3 --- Assets/image/environment/block/TileBrickSnow01.png | 3 --- Assets/image/environment/block/TileBrickStone01.png | 3 --- Assets/image/environment/block/TileBrickStone0102.png | 3 --- Assets/image/environment/block/TileBrickStone0103.png | 3 --- Assets/image/environment/block/TileBrickStone0104.png | 3 --- Assets/image/environment/block/TileBrickStone0105.png | 3 --- Assets/image/environment/block/TileBrickStone0201.png | 3 --- Assets/image/environment/block/TileDirt01.png | 3 --- Assets/image/environment/block/TileDirt01Grass01.png | 3 --- Assets/image/environment/block/TileDirt01GrassPatch01.png | 3 --- Assets/image/environment/block/TileDirt01GrassPatch02.png | 3 --- Assets/image/environment/block/TileDirt01GrassPatch03.png | 3 --- .../image/environment/block/TileDirt01GrassPath3Cross01.png | 3 --- .../image/environment/block/TileDirt01GrassPath3Cross02.png | 3 --- .../image/environment/block/TileDirt01GrassPath3Cross03.png | 3 --- .../image/environment/block/TileDirt01GrassPath3Cross04.png | 3 --- Assets/image/environment/block/TileDirt01GrassPath4Cross.png | 3 --- Assets/image/environment/block/TileDirt01GrassPathCurve01.png | 3 --- Assets/image/environment/block/TileDirt01GrassPathCurve02.png | 3 --- Assets/image/environment/block/TileDirt01GrassPathCurve03.png | 3 --- Assets/image/environment/block/TileDirt01GrassPathCurve04.png | 3 --- Assets/image/environment/block/TileDirt01GrassPathEnd01.png | 3 --- Assets/image/environment/block/TileDirt01GrassPathEnd02.png | 3 --- Assets/image/environment/block/TileDirt01GrassPathEnd03.png | 3 --- Assets/image/environment/block/TileDirt01GrassPathEnd04.png | 3 --- Assets/image/environment/block/TileDirt01GrassPathSingle.png | 3 --- .../image/environment/block/TileDirt01GrassPathStraight01.png | 3 --- .../image/environment/block/TileDirt01GrassPathStraight02.png | 3 --- Assets/image/environment/block/TileDirt01ToSnow01.png | 3 --- Assets/image/environment/block/TileDirt01ToSnow02.png | 3 --- Assets/image/environment/block/TileDirt01ToStone01.png | 3 --- Assets/image/environment/block/TileDirt01ToStone02.png | 3 --- Assets/image/environment/block/TileDirt02.png | 3 --- Assets/image/environment/block/TileDirt02ToStone01.png | 3 --- Assets/image/environment/block/TileDirt02ToStone02.png | 3 --- Assets/image/environment/block/TileLava01.png | 3 --- Assets/image/environment/block/TileLava02.png | 3 --- Assets/image/environment/block/TileLavaCracks01.png | 3 --- Assets/image/environment/block/TileLavaStone01.png | 3 --- Assets/image/environment/block/TileRiverbed01.png | 3 --- Assets/image/environment/block/TileRiverbed02.png | 3 --- Assets/image/environment/block/TileRiverbed03.png | 3 --- Assets/image/environment/block/TileRiverbed04.png | 3 --- Assets/image/environment/block/TileSand01.png | 3 --- Assets/image/environment/block/TileSand01ToStone01.png | 3 --- Assets/image/environment/block/TileSand01ToStone02.png | 3 --- Assets/image/environment/block/TileSand02.png | 3 --- Assets/image/environment/block/TileSand02ToStone01.png | 3 --- Assets/image/environment/block/TileSand02ToStone02.png | 3 --- Assets/image/environment/block/TileSand03.png | 3 --- Assets/image/environment/block/TileSand03ToStone01.png | 3 --- Assets/image/environment/block/TileSand03ToStone02.png | 3 --- Assets/image/environment/block/TileSand04.png | 3 --- Assets/image/environment/block/TileSnow01.png | 3 --- Assets/image/environment/block/TileSnow01ToStone01.png | 3 --- Assets/image/environment/block/TileSnow01ToStone02.png | 3 --- Assets/image/environment/block/TileSnow02.png | 3 --- Assets/image/environment/block/TileSnow02ToStone01.png | 3 --- Assets/image/environment/block/TileSnow02ToStone02.png | 3 --- Assets/image/environment/block/TileStone01.png | 3 --- Assets/image/environment/block/TileStone02.png | 3 --- Assets/image/environment/block/TileStone03.png | 3 --- Assets/image/environment/block/TileTemplate01.png | 3 --- Assets/image/environment/block/TileWater01.png | 3 --- Assets/image/environment/block/TileWaterBlock.png | 3 --- Assets/image/environment/block/TileWaterShore1C01.png | 3 --- Assets/image/environment/block/TileWaterShore1C02.png | 3 --- Assets/image/environment/block/TileWaterShore1C03.png | 3 --- Assets/image/environment/block/TileWaterShore1C04.png | 3 --- Assets/image/environment/block/TileWaterShore1S01.png | 3 --- Assets/image/environment/block/TileWaterShore1S02.png | 3 --- Assets/image/environment/block/TileWaterShore1S03.png | 3 --- Assets/image/environment/block/TileWaterShore1S04.png | 3 --- Assets/image/environment/block/TileWaterShore1S1C01.png | 3 --- Assets/image/environment/block/TileWaterShore1S1C02.png | 3 --- Assets/image/environment/block/TileWaterShore1S1C03.png | 3 --- Assets/image/environment/block/TileWaterShore1S1C04.png | 3 --- Assets/image/environment/block/TileWaterShore1S1C05.png | 3 --- Assets/image/environment/block/TileWaterShore1S1C06.png | 3 --- Assets/image/environment/block/TileWaterShore1S1C07.png | 3 --- Assets/image/environment/block/TileWaterShore1S1C08.png | 3 --- Assets/image/environment/block/TileWaterShore1S2C01.png | 3 --- Assets/image/environment/block/TileWaterShore1S2C02.png | 3 --- Assets/image/environment/block/TileWaterShore1S2C03.png | 3 --- Assets/image/environment/block/TileWaterShore1S2C04.png | 3 --- Assets/image/environment/block/TileWaterShore2C01.png | 3 --- Assets/image/environment/block/TileWaterShore2C02.png | 3 --- Assets/image/environment/block/TileWaterShore2C03.png | 3 --- Assets/image/environment/block/TileWaterShore2C04.png | 3 --- Assets/image/environment/block/TileWaterShore2C05.png | 3 --- Assets/image/environment/block/TileWaterShore2C06.png | 3 --- Assets/image/environment/block/TileWaterShore2S01.png | 3 --- Assets/image/environment/block/TileWaterShore2S02.png | 3 --- Assets/image/environment/block/TileWaterShore2S03.png | 3 --- Assets/image/environment/block/TileWaterShore2S04.png | 3 --- Assets/image/environment/block/TileWaterShore2S05.png | 3 --- Assets/image/environment/block/TileWaterShore2S06.png | 3 --- Assets/image/environment/block/TileWaterShore2S1C01.png | 3 --- Assets/image/environment/block/TileWaterShore2S1C02.png | 3 --- Assets/image/environment/block/TileWaterShore2S1C03.png | 3 --- Assets/image/environment/block/TileWaterShore2S1C04.png | 3 --- Assets/image/environment/block/TileWaterShore3C01.png | 3 --- Assets/image/environment/block/TileWaterShore3C02.png | 3 --- Assets/image/environment/block/TileWaterShore3C03.png | 3 --- Assets/image/environment/block/TileWaterShore3C04.png | 3 --- Assets/image/environment/block/TileWaterShore3S01.png | 3 --- Assets/image/environment/block/TileWaterShore3S02.png | 3 --- Assets/image/environment/block/TileWaterShore3S03.png | 3 --- Assets/image/environment/block/TileWaterShore3S04.png | 3 --- Assets/image/environment/block/TileWaterShore4C01.png | 3 --- Assets/image/environment/block/TileWaterShore4S04.png | 3 --- Assets/image/environment/block/TileWood01.png | 3 --- Assets/image/environment/block/TileWood02.png | 3 --- Assets/image/environment/block/TileWood03.png | 3 --- Assets/image/environment/block/TileWood04.png | 3 --- Assets/image/environment/decoration/Desert_big_cactus_02.png | 3 --- Assets/image/environment/decoration/Desert_big_cactus_03.png | 3 --- Assets/image/environment/decoration/Desert_big_cactus_04.png | 3 --- Assets/image/environment/decoration/Desert_big_flower_01.png | 3 --- .../environment/decoration/Desert_small_Agave_Cactus_01.png | 3 --- .../environment/decoration/Desert_small_Agave_Cactus_02.png | 3 --- .../environment/decoration/Desert_small_Agave_Cactus_03.png | 3 --- .../environment/decoration/Desert_small_Agave_Cactus_04.png | 3 --- Assets/image/environment/decoration/Desert_small_Bush_01.png | 3 --- Assets/image/environment/decoration/Desert_small_Bush_02.png | 3 --- .../image/environment/decoration/Desert_small_Cactus_02.png | 3 --- .../image/environment/decoration/Desert_small_Cactus_03.png | 3 --- .../image/environment/decoration/Desert_small_Cactus_04.png | 3 --- .../image/environment/decoration/Desert_small_Cactus_05.png | 3 --- .../image/environment/decoration/Desert_small_Cactus_06.png | 3 --- .../image/environment/decoration/Desert_small_Cactus_07.png | 3 --- .../image/environment/decoration/Desert_small_Cactus_09.png | 3 --- .../image/environment/decoration/Desert_small_Cactus_10.png | 3 --- .../image/environment/decoration/Desert_small_Cactus_11.png | 3 --- .../image/environment/decoration/Desert_small_Cactus_12.png | 3 --- .../image/environment/decoration/Desert_small_Cactus_13.png | 3 --- .../image/environment/decoration/Desert_small_Cactus_14.png | 3 --- .../image/environment/decoration/Desert_small_Cactus_15.png | 3 --- .../image/environment/decoration/Desert_small_Flower_01.png | 3 --- .../image/environment/decoration/Desert_small_Flower_02.png | 3 --- .../image/environment/decoration/Desert_small_Flower_03.png | 3 --- .../image/environment/decoration/Desert_small_Flower_04.png | 3 --- Assets/image/environment/decoration/Forest_big_cypress_01.png | 3 --- Assets/image/environment/decoration/Forest_big_cypress_02.png | 3 --- Assets/image/environment/decoration/Forest_big_cypress_03.png | 3 --- Assets/image/environment/decoration/Forest_big_stone_01.png | 3 --- Assets/image/environment/decoration/Forest_big_stone_02.png | 3 --- .../image/environment/decoration/Forest_big_tree_leaf_01.png | 3 --- .../environment/decoration/Forest_big_tree_needle_03.png | 3 --- .../environment/decoration/Forest_big_tree_needle_04.png | 3 --- Assets/image/environment/decoration/Forest_deadBush3.png | 3 --- Assets/image/environment/decoration/Forest_deadTree1.png | 3 --- Assets/image/environment/decoration/Forest_deadTree2.png | 3 --- Assets/image/environment/decoration/Forest_deadTree4.png | 3 --- Assets/image/environment/decoration/Forest_deadbush5.png | 3 --- Assets/image/environment/decoration/Forest_small_bush_01.png | 3 --- Assets/image/environment/decoration/Forest_small_bush_02.png | 3 --- .../image/environment/decoration/Forest_small_clover_01.png | 3 --- .../image/environment/decoration/Forest_small_clover_02.png | 3 --- .../image/environment/decoration/Forest_small_clover_03.png | 3 --- Assets/image/environment/decoration/Forest_small_fern_01.png | 3 --- Assets/image/environment/decoration/Forest_small_fern_02.png | 3 --- .../image/environment/decoration/Forest_small_flower_01.png | 3 --- .../image/environment/decoration/Forest_small_flower_02.png | 3 --- .../image/environment/decoration/Forest_small_flower_03.png | 3 --- Assets/image/environment/decoration/Forest_small_grass_01.png | 3 --- Assets/image/environment/decoration/Forest_small_grass_02.png | 3 --- Assets/image/environment/decoration/Forest_small_grass_03.png | 3 --- Assets/image/environment/decoration/Forest_small_grass_04.png | 3 --- Assets/image/environment/decoration/Forest_small_grass_05.png | 3 --- Assets/image/environment/decoration/Forest_small_grass_06.png | 3 --- Assets/image/environment/decoration/Forest_small_grass_07.png | 3 --- Assets/image/environment/decoration/Forest_small_grass_08.png | 3 --- .../image/environment/decoration/Forest_small_mushroom_01.png | 3 --- .../image/environment/decoration/Forest_small_mushroom_02.png | 3 --- .../image/environment/decoration/Forest_small_mushroom_03.png | 3 --- .../image/environment/decoration/Forest_small_mushroom_04.png | 3 --- .../image/environment/decoration/Forest_small_tree_log_01.png | 3 --- .../image/environment/decoration/Forest_small_tree_log_02.png | 3 --- .../image/environment/decoration/Forest_small_tree_log_03.png | 3 --- .../environment/decoration/Forest_small_tree_stump_01.png | 3 --- .../environment/decoration/Forest_small_tree_stump_02.png | 3 --- .../environment/decoration/Forest_small_tree_stump_03.png | 3 --- Assets/image/environment/decoration/bamboo1.png | 3 --- Assets/image/environment/decoration/bamboo2.png | 3 --- Assets/image/environment/decoration/bamboo3.png | 3 --- Assets/image/environment/decoration/bamboo4.png | 3 --- Assets/image/environment/decoration/bamboo5.png | 3 --- Assets/image/environment/decoration/bamboo6.png | 3 --- Assets/image/environment/decoration/bamboo7.png | 3 --- Assets/image/environment/decoration/bamboo8.png | 3 --- Assets/image/environment/decoration/campfire/0.png | 3 --- Assets/image/environment/decoration/campfire/1.png | 3 --- Assets/image/environment/decoration/campfire/10.png | 3 --- Assets/image/environment/decoration/campfire/2.png | 3 --- Assets/image/environment/decoration/campfire/3.png | 3 --- Assets/image/environment/decoration/campfire/4.png | 3 --- Assets/image/environment/decoration/campfire/5.png | 3 --- Assets/image/environment/decoration/campfire/6.png | 3 --- Assets/image/environment/decoration/campfire/7.png | 3 --- Assets/image/environment/decoration/campfire/8.png | 3 --- Assets/image/environment/decoration/campfire/9.png | 3 --- Assets/image/environment/decoration/chest.png | 3 --- Assets/image/environment/decoration/desert_skull_01.png | 3 --- Assets/image/environment/decoration/desert_skull_02.png | 3 --- Assets/image/environment/decoration/desert_skull_03.png | 3 --- Assets/image/environment/decoration/forest_berrybush.png | 3 --- Assets/image/environment/decoration/forest_bush4.png | 3 --- Assets/image/environment/decoration/forest_bush5.png | 3 --- Assets/image/environment/decoration/reed1.png | 3 --- Assets/image/environment/decoration/reed2.png | 3 --- Assets/image/environment/decoration/reed3.png | 3 --- Assets/image/environment/decoration/reed4.png | 3 --- Assets/image/environment/decoration/reed5.png | 3 --- Assets/image/environment/decoration/reed6.png | 3 --- Assets/image/environment/decoration/reed7.png | 3 --- Assets/image/environment/decoration/reed8.png | 3 --- Assets/image/environment/decoration/stone1.png | 3 --- Assets/image/environment/decoration/stone2.png | 3 --- Assets/image/environment/decoration/stone3.png | 3 --- Assets/image/environment/decoration/waterbuds.png | 3 --- Assets/image/environment/decoration/waterplant0.png | 3 --- Assets/image/environment/decoration/waterplant1.png | 3 --- Assets/image/environment/decoration/waterplant2.png | 3 --- Assets/image/environment/decoration/waterplant3.png | 3 --- Assets/image/environment/decoration/waterplant4.png | 3 --- Assets/image/environment/decoration/waterplant5.png | 3 --- Assets/image/environment/decoration/waterplant6.png | 3 --- Assets/image/environment/snow/snowflake1.png | 3 --- Assets/image/environment/snow/snowflake10.png | 3 --- Assets/image/environment/snow/snowflake11.png | 3 --- Assets/image/environment/snow/snowflake12.png | 3 --- Assets/image/environment/snow/snowflake13.png | 3 --- Assets/image/environment/snow/snowflake14.png | 3 --- Assets/image/environment/snow/snowflake15.png | 3 --- Assets/image/environment/snow/snowflake16.png | 3 --- Assets/image/environment/snow/snowflake2.png | 3 --- Assets/image/environment/snow/snowflake3.png | 3 --- Assets/image/environment/snow/snowflake4.png | 3 --- Assets/image/environment/snow/snowflake5.png | 3 --- Assets/image/environment/snow/snowflake6.png | 3 --- Assets/image/environment/snow/snowflake7.png | 3 --- Assets/image/environment/snow/snowflake8.png | 3 --- Assets/image/environment/snow/snowflake9.png | 3 --- Data/main_chapter/chapter1_map.yaml | 2 +- Source/base.py | 1 + Source/core/editor.py | 4 ++-- 351 files changed, 4 insertions(+), 1047 deletions(-) delete mode 100644 Assets/image/environment/block/LowTileDirt01.png delete mode 100644 Assets/image/environment/block/LowTileDirtToStoneTransition01.png delete mode 100644 Assets/image/environment/block/LowTileDirtToStoneTransition02.png delete mode 100644 Assets/image/environment/block/LowTileRiverbed01.png delete mode 100644 Assets/image/environment/block/LowTileRiverbed02.png delete mode 100644 Assets/image/environment/block/LowTileRiverbed03.png delete mode 100644 Assets/image/environment/block/LowTileRiverbed04.png delete mode 100644 Assets/image/environment/block/LowTileSand01.png delete mode 100644 Assets/image/environment/block/LowTileSand02.png delete mode 100644 Assets/image/environment/block/LowTileSand03.png delete mode 100644 Assets/image/environment/block/LowTileStone01.png delete mode 100644 Assets/image/environment/block/LowTileStone02.png delete mode 100644 Assets/image/environment/block/LowTileStone03.png delete mode 100644 Assets/image/environment/block/OverlayCracks01.png delete mode 100644 Assets/image/environment/block/OverlayCracks02.png delete mode 100644 Assets/image/environment/block/OverlayGlow01.png delete mode 100644 Assets/image/environment/block/OverlayGlow02.png delete mode 100644 Assets/image/environment/block/OverlayGrass01.png delete mode 100644 Assets/image/environment/block/OverlayGrassHalfH01.png delete mode 100644 Assets/image/environment/block/OverlayGrassHalfH02.png delete mode 100644 Assets/image/environment/block/OverlayGrassHalfV01.png delete mode 100644 Assets/image/environment/block/OverlayGrassHalfV02Kopie.png delete mode 100644 Assets/image/environment/block/OverlayGrassPatch01.png delete mode 100644 Assets/image/environment/block/OverlayGrassPatch02.png delete mode 100644 Assets/image/environment/block/OverlayGrassPatch02H01.png delete mode 100644 Assets/image/environment/block/OverlayGrassPatch02H02.png delete mode 100644 Assets/image/environment/block/OverlayGrassPatch02V01.png delete mode 100644 Assets/image/environment/block/OverlayGrassPatch02V02.png delete mode 100644 Assets/image/environment/block/OverlayGrassPatch03.png delete mode 100644 Assets/image/environment/block/OverlayGrassPatch03H01.png delete mode 100644 Assets/image/environment/block/OverlayGrassPatch03H02.png delete mode 100644 Assets/image/environment/block/OverlayGrassPatch03V01.png delete mode 100644 Assets/image/environment/block/OverlayGrassPatch03V02.png delete mode 100644 Assets/image/environment/block/OverlayGrassPatchH01.png delete mode 100644 Assets/image/environment/block/OverlayGrassPatchH02.png delete mode 100644 Assets/image/environment/block/OverlayGrassPatchV01.png delete mode 100644 Assets/image/environment/block/OverlayGrassPatchV02.png delete mode 100644 Assets/image/environment/block/OverlayPathCross.png delete mode 100644 Assets/image/environment/block/OverlayPathCross301.png delete mode 100644 Assets/image/environment/block/OverlayPathCross302.png delete mode 100644 Assets/image/environment/block/OverlayPathCross303.png delete mode 100644 Assets/image/environment/block/OverlayPathCross304.png delete mode 100644 Assets/image/environment/block/OverlayPathCurve01.png delete mode 100644 Assets/image/environment/block/OverlayPathCurve02.png delete mode 100644 Assets/image/environment/block/OverlayPathCurve03.png delete mode 100644 Assets/image/environment/block/OverlayPathCurve04.png delete mode 100644 Assets/image/environment/block/OverlayPathEnd01.png delete mode 100644 Assets/image/environment/block/OverlayPathEnd02.png delete mode 100644 Assets/image/environment/block/OverlayPathEnd03.png delete mode 100644 Assets/image/environment/block/OverlayPathEnd04.png delete mode 100644 Assets/image/environment/block/OverlayPathSingle.png delete mode 100644 Assets/image/environment/block/OverlayPathStraight01.png delete mode 100644 Assets/image/environment/block/OverlayPathStraight02.png delete mode 100644 Assets/image/environment/block/OverlayRoofHay01.png delete mode 100644 Assets/image/environment/block/OverlayRoofHay02.png delete mode 100644 Assets/image/environment/block/OverlayRoofHay03.png delete mode 100644 Assets/image/environment/block/OverlayRoofHay04.png delete mode 100644 Assets/image/environment/block/OverlayRoofHay05.png delete mode 100644 Assets/image/environment/block/OverlayRoofHay06.png delete mode 100644 Assets/image/environment/block/OverlayRoofHay07.png delete mode 100644 Assets/image/environment/block/OverlayRoofHay08.png delete mode 100644 Assets/image/environment/block/OverlayRoofHay09.png delete mode 100644 Assets/image/environment/block/OverlayRoofHay10.png delete mode 100644 Assets/image/environment/block/OverlayRoofHay11.png delete mode 100644 Assets/image/environment/block/OverlayRoofHay12.png delete mode 100644 Assets/image/environment/block/OverlayRoofHay13.png delete mode 100644 Assets/image/environment/block/OverlayShoreCornerD.png delete mode 100644 Assets/image/environment/block/OverlayShoreCornerL.png delete mode 100644 Assets/image/environment/block/OverlayShoreCornerR.png delete mode 100644 Assets/image/environment/block/OverlayShoreCornerRU.png delete mode 100644 Assets/image/environment/block/OverlayShoreCornerU.png delete mode 100644 Assets/image/environment/block/OverlayShoreStraightLD.png delete mode 100644 Assets/image/environment/block/OverlayShoreStraightLU.png delete mode 100644 Assets/image/environment/block/OverlayShoreStraightRD.png delete mode 100644 Assets/image/environment/block/OverlayShoreStraightRU.png delete mode 100644 Assets/image/environment/block/OverlayStonePieces01.png delete mode 100644 Assets/image/environment/block/OverlayStonePieces01HalfH01.png delete mode 100644 Assets/image/environment/block/OverlayStonePieces01HalfH02.png delete mode 100644 Assets/image/environment/block/OverlayStonePieces01HalfV01.png delete mode 100644 Assets/image/environment/block/OverlayStonePieces01HalfV02.png delete mode 100644 Assets/image/environment/block/OverlayStonePieces02.png delete mode 100644 Assets/image/environment/block/OverlayStonePieces02HalfH01.png delete mode 100644 Assets/image/environment/block/OverlayStonePieces02HalfH02.png delete mode 100644 Assets/image/environment/block/OverlayStonePieces02HalfV01.png delete mode 100644 Assets/image/environment/block/OverlayStonePieces02HalfV02.png delete mode 100644 Assets/image/environment/block/OverlayWater01.png delete mode 100644 Assets/image/environment/block/OverlayWater02.png delete mode 100644 Assets/image/environment/block/PropStairStone01.png delete mode 100644 Assets/image/environment/block/PropStairStone02.png delete mode 100644 Assets/image/environment/block/PropStairStone03.png delete mode 100644 Assets/image/environment/block/PropStairStone04.png delete mode 100644 Assets/image/environment/block/PropStairStone05.png delete mode 100644 Assets/image/environment/block/PropStairStone06.png delete mode 100644 Assets/image/environment/block/PropStairStone07.png delete mode 100644 Assets/image/environment/block/PropStairStone08.png delete mode 100644 Assets/image/environment/block/PropStairStone09.png delete mode 100644 Assets/image/environment/block/PropStairStone10.png delete mode 100644 Assets/image/environment/block/PropStairStone11.png delete mode 100644 Assets/image/environment/block/PropStairStone12.png delete mode 100644 Assets/image/environment/block/TileBrickBrick01.png delete mode 100644 Assets/image/environment/block/TileBrickBrick02.png delete mode 100644 Assets/image/environment/block/TileBrickBrick03.png delete mode 100644 Assets/image/environment/block/TileBrickBrick04.png delete mode 100644 Assets/image/environment/block/TileBrickSandStone01.png delete mode 100644 Assets/image/environment/block/TileBrickSnow01.png delete mode 100644 Assets/image/environment/block/TileBrickStone01.png delete mode 100644 Assets/image/environment/block/TileBrickStone0102.png delete mode 100644 Assets/image/environment/block/TileBrickStone0103.png delete mode 100644 Assets/image/environment/block/TileBrickStone0104.png delete mode 100644 Assets/image/environment/block/TileBrickStone0105.png delete mode 100644 Assets/image/environment/block/TileBrickStone0201.png delete mode 100644 Assets/image/environment/block/TileDirt01.png delete mode 100644 Assets/image/environment/block/TileDirt01Grass01.png delete mode 100644 Assets/image/environment/block/TileDirt01GrassPatch01.png delete mode 100644 Assets/image/environment/block/TileDirt01GrassPatch02.png delete mode 100644 Assets/image/environment/block/TileDirt01GrassPatch03.png delete mode 100644 Assets/image/environment/block/TileDirt01GrassPath3Cross01.png delete mode 100644 Assets/image/environment/block/TileDirt01GrassPath3Cross02.png delete mode 100644 Assets/image/environment/block/TileDirt01GrassPath3Cross03.png delete mode 100644 Assets/image/environment/block/TileDirt01GrassPath3Cross04.png delete mode 100644 Assets/image/environment/block/TileDirt01GrassPath4Cross.png delete mode 100644 Assets/image/environment/block/TileDirt01GrassPathCurve01.png delete mode 100644 Assets/image/environment/block/TileDirt01GrassPathCurve02.png delete mode 100644 Assets/image/environment/block/TileDirt01GrassPathCurve03.png delete mode 100644 Assets/image/environment/block/TileDirt01GrassPathCurve04.png delete mode 100644 Assets/image/environment/block/TileDirt01GrassPathEnd01.png delete mode 100644 Assets/image/environment/block/TileDirt01GrassPathEnd02.png delete mode 100644 Assets/image/environment/block/TileDirt01GrassPathEnd03.png delete mode 100644 Assets/image/environment/block/TileDirt01GrassPathEnd04.png delete mode 100644 Assets/image/environment/block/TileDirt01GrassPathSingle.png delete mode 100644 Assets/image/environment/block/TileDirt01GrassPathStraight01.png delete mode 100644 Assets/image/environment/block/TileDirt01GrassPathStraight02.png delete mode 100644 Assets/image/environment/block/TileDirt01ToSnow01.png delete mode 100644 Assets/image/environment/block/TileDirt01ToSnow02.png delete mode 100644 Assets/image/environment/block/TileDirt01ToStone01.png delete mode 100644 Assets/image/environment/block/TileDirt01ToStone02.png delete mode 100644 Assets/image/environment/block/TileDirt02.png delete mode 100644 Assets/image/environment/block/TileDirt02ToStone01.png delete mode 100644 Assets/image/environment/block/TileDirt02ToStone02.png delete mode 100644 Assets/image/environment/block/TileLava01.png delete mode 100644 Assets/image/environment/block/TileLava02.png delete mode 100644 Assets/image/environment/block/TileLavaCracks01.png delete mode 100644 Assets/image/environment/block/TileLavaStone01.png delete mode 100644 Assets/image/environment/block/TileRiverbed01.png delete mode 100644 Assets/image/environment/block/TileRiverbed02.png delete mode 100644 Assets/image/environment/block/TileRiverbed03.png delete mode 100644 Assets/image/environment/block/TileRiverbed04.png delete mode 100644 Assets/image/environment/block/TileSand01.png delete mode 100644 Assets/image/environment/block/TileSand01ToStone01.png delete mode 100644 Assets/image/environment/block/TileSand01ToStone02.png delete mode 100644 Assets/image/environment/block/TileSand02.png delete mode 100644 Assets/image/environment/block/TileSand02ToStone01.png delete mode 100644 Assets/image/environment/block/TileSand02ToStone02.png delete mode 100644 Assets/image/environment/block/TileSand03.png delete mode 100644 Assets/image/environment/block/TileSand03ToStone01.png delete mode 100644 Assets/image/environment/block/TileSand03ToStone02.png delete mode 100644 Assets/image/environment/block/TileSand04.png delete mode 100644 Assets/image/environment/block/TileSnow01.png delete mode 100644 Assets/image/environment/block/TileSnow01ToStone01.png delete mode 100644 Assets/image/environment/block/TileSnow01ToStone02.png delete mode 100644 Assets/image/environment/block/TileSnow02.png delete mode 100644 Assets/image/environment/block/TileSnow02ToStone01.png delete mode 100644 Assets/image/environment/block/TileSnow02ToStone02.png delete mode 100644 Assets/image/environment/block/TileStone01.png delete mode 100644 Assets/image/environment/block/TileStone02.png delete mode 100644 Assets/image/environment/block/TileStone03.png delete mode 100644 Assets/image/environment/block/TileTemplate01.png delete mode 100644 Assets/image/environment/block/TileWater01.png delete mode 100644 Assets/image/environment/block/TileWaterBlock.png delete mode 100644 Assets/image/environment/block/TileWaterShore1C01.png delete mode 100644 Assets/image/environment/block/TileWaterShore1C02.png delete mode 100644 Assets/image/environment/block/TileWaterShore1C03.png delete mode 100644 Assets/image/environment/block/TileWaterShore1C04.png delete mode 100644 Assets/image/environment/block/TileWaterShore1S01.png delete mode 100644 Assets/image/environment/block/TileWaterShore1S02.png delete mode 100644 Assets/image/environment/block/TileWaterShore1S03.png delete mode 100644 Assets/image/environment/block/TileWaterShore1S04.png delete mode 100644 Assets/image/environment/block/TileWaterShore1S1C01.png delete mode 100644 Assets/image/environment/block/TileWaterShore1S1C02.png delete mode 100644 Assets/image/environment/block/TileWaterShore1S1C03.png delete mode 100644 Assets/image/environment/block/TileWaterShore1S1C04.png delete mode 100644 Assets/image/environment/block/TileWaterShore1S1C05.png delete mode 100644 Assets/image/environment/block/TileWaterShore1S1C06.png delete mode 100644 Assets/image/environment/block/TileWaterShore1S1C07.png delete mode 100644 Assets/image/environment/block/TileWaterShore1S1C08.png delete mode 100644 Assets/image/environment/block/TileWaterShore1S2C01.png delete mode 100644 Assets/image/environment/block/TileWaterShore1S2C02.png delete mode 100644 Assets/image/environment/block/TileWaterShore1S2C03.png delete mode 100644 Assets/image/environment/block/TileWaterShore1S2C04.png delete mode 100644 Assets/image/environment/block/TileWaterShore2C01.png delete mode 100644 Assets/image/environment/block/TileWaterShore2C02.png delete mode 100644 Assets/image/environment/block/TileWaterShore2C03.png delete mode 100644 Assets/image/environment/block/TileWaterShore2C04.png delete mode 100644 Assets/image/environment/block/TileWaterShore2C05.png delete mode 100644 Assets/image/environment/block/TileWaterShore2C06.png delete mode 100644 Assets/image/environment/block/TileWaterShore2S01.png delete mode 100644 Assets/image/environment/block/TileWaterShore2S02.png delete mode 100644 Assets/image/environment/block/TileWaterShore2S03.png delete mode 100644 Assets/image/environment/block/TileWaterShore2S04.png delete mode 100644 Assets/image/environment/block/TileWaterShore2S05.png delete mode 100644 Assets/image/environment/block/TileWaterShore2S06.png delete mode 100644 Assets/image/environment/block/TileWaterShore2S1C01.png delete mode 100644 Assets/image/environment/block/TileWaterShore2S1C02.png delete mode 100644 Assets/image/environment/block/TileWaterShore2S1C03.png delete mode 100644 Assets/image/environment/block/TileWaterShore2S1C04.png delete mode 100644 Assets/image/environment/block/TileWaterShore3C01.png delete mode 100644 Assets/image/environment/block/TileWaterShore3C02.png delete mode 100644 Assets/image/environment/block/TileWaterShore3C03.png delete mode 100644 Assets/image/environment/block/TileWaterShore3C04.png delete mode 100644 Assets/image/environment/block/TileWaterShore3S01.png delete mode 100644 Assets/image/environment/block/TileWaterShore3S02.png delete mode 100644 Assets/image/environment/block/TileWaterShore3S03.png delete mode 100644 Assets/image/environment/block/TileWaterShore3S04.png delete mode 100644 Assets/image/environment/block/TileWaterShore4C01.png delete mode 100644 Assets/image/environment/block/TileWaterShore4S04.png delete mode 100644 Assets/image/environment/block/TileWood01.png delete mode 100644 Assets/image/environment/block/TileWood02.png delete mode 100644 Assets/image/environment/block/TileWood03.png delete mode 100644 Assets/image/environment/block/TileWood04.png delete mode 100644 Assets/image/environment/decoration/Desert_big_cactus_02.png delete mode 100644 Assets/image/environment/decoration/Desert_big_cactus_03.png delete mode 100644 Assets/image/environment/decoration/Desert_big_cactus_04.png delete mode 100644 Assets/image/environment/decoration/Desert_big_flower_01.png delete mode 100644 Assets/image/environment/decoration/Desert_small_Agave_Cactus_01.png delete mode 100644 Assets/image/environment/decoration/Desert_small_Agave_Cactus_02.png delete mode 100644 Assets/image/environment/decoration/Desert_small_Agave_Cactus_03.png delete mode 100644 Assets/image/environment/decoration/Desert_small_Agave_Cactus_04.png delete mode 100644 Assets/image/environment/decoration/Desert_small_Bush_01.png delete mode 100644 Assets/image/environment/decoration/Desert_small_Bush_02.png delete mode 100644 Assets/image/environment/decoration/Desert_small_Cactus_02.png delete mode 100644 Assets/image/environment/decoration/Desert_small_Cactus_03.png delete mode 100644 Assets/image/environment/decoration/Desert_small_Cactus_04.png delete mode 100644 Assets/image/environment/decoration/Desert_small_Cactus_05.png delete mode 100644 Assets/image/environment/decoration/Desert_small_Cactus_06.png delete mode 100644 Assets/image/environment/decoration/Desert_small_Cactus_07.png delete mode 100644 Assets/image/environment/decoration/Desert_small_Cactus_09.png delete mode 100644 Assets/image/environment/decoration/Desert_small_Cactus_10.png delete mode 100644 Assets/image/environment/decoration/Desert_small_Cactus_11.png delete mode 100644 Assets/image/environment/decoration/Desert_small_Cactus_12.png delete mode 100644 Assets/image/environment/decoration/Desert_small_Cactus_13.png delete mode 100644 Assets/image/environment/decoration/Desert_small_Cactus_14.png delete mode 100644 Assets/image/environment/decoration/Desert_small_Cactus_15.png delete mode 100644 Assets/image/environment/decoration/Desert_small_Flower_01.png delete mode 100644 Assets/image/environment/decoration/Desert_small_Flower_02.png delete mode 100644 Assets/image/environment/decoration/Desert_small_Flower_03.png delete mode 100644 Assets/image/environment/decoration/Desert_small_Flower_04.png delete mode 100644 Assets/image/environment/decoration/Forest_big_cypress_01.png delete mode 100644 Assets/image/environment/decoration/Forest_big_cypress_02.png delete mode 100644 Assets/image/environment/decoration/Forest_big_cypress_03.png delete mode 100644 Assets/image/environment/decoration/Forest_big_stone_01.png delete mode 100644 Assets/image/environment/decoration/Forest_big_stone_02.png delete mode 100644 Assets/image/environment/decoration/Forest_big_tree_leaf_01.png delete mode 100644 Assets/image/environment/decoration/Forest_big_tree_needle_03.png delete mode 100644 Assets/image/environment/decoration/Forest_big_tree_needle_04.png delete mode 100644 Assets/image/environment/decoration/Forest_deadBush3.png delete mode 100644 Assets/image/environment/decoration/Forest_deadTree1.png delete mode 100644 Assets/image/environment/decoration/Forest_deadTree2.png delete mode 100644 Assets/image/environment/decoration/Forest_deadTree4.png delete mode 100644 Assets/image/environment/decoration/Forest_deadbush5.png delete mode 100644 Assets/image/environment/decoration/Forest_small_bush_01.png delete mode 100644 Assets/image/environment/decoration/Forest_small_bush_02.png delete mode 100644 Assets/image/environment/decoration/Forest_small_clover_01.png delete mode 100644 Assets/image/environment/decoration/Forest_small_clover_02.png delete mode 100644 Assets/image/environment/decoration/Forest_small_clover_03.png delete mode 100644 Assets/image/environment/decoration/Forest_small_fern_01.png delete mode 100644 Assets/image/environment/decoration/Forest_small_fern_02.png delete mode 100644 Assets/image/environment/decoration/Forest_small_flower_01.png delete mode 100644 Assets/image/environment/decoration/Forest_small_flower_02.png delete mode 100644 Assets/image/environment/decoration/Forest_small_flower_03.png delete mode 100644 Assets/image/environment/decoration/Forest_small_grass_01.png delete mode 100644 Assets/image/environment/decoration/Forest_small_grass_02.png delete mode 100644 Assets/image/environment/decoration/Forest_small_grass_03.png delete mode 100644 Assets/image/environment/decoration/Forest_small_grass_04.png delete mode 100644 Assets/image/environment/decoration/Forest_small_grass_05.png delete mode 100644 Assets/image/environment/decoration/Forest_small_grass_06.png delete mode 100644 Assets/image/environment/decoration/Forest_small_grass_07.png delete mode 100644 Assets/image/environment/decoration/Forest_small_grass_08.png delete mode 100644 Assets/image/environment/decoration/Forest_small_mushroom_01.png delete mode 100644 Assets/image/environment/decoration/Forest_small_mushroom_02.png delete mode 100644 Assets/image/environment/decoration/Forest_small_mushroom_03.png delete mode 100644 Assets/image/environment/decoration/Forest_small_mushroom_04.png delete mode 100644 Assets/image/environment/decoration/Forest_small_tree_log_01.png delete mode 100644 Assets/image/environment/decoration/Forest_small_tree_log_02.png delete mode 100644 Assets/image/environment/decoration/Forest_small_tree_log_03.png delete mode 100644 Assets/image/environment/decoration/Forest_small_tree_stump_01.png delete mode 100644 Assets/image/environment/decoration/Forest_small_tree_stump_02.png delete mode 100644 Assets/image/environment/decoration/Forest_small_tree_stump_03.png delete mode 100644 Assets/image/environment/decoration/bamboo1.png delete mode 100644 Assets/image/environment/decoration/bamboo2.png delete mode 100644 Assets/image/environment/decoration/bamboo3.png delete mode 100644 Assets/image/environment/decoration/bamboo4.png delete mode 100644 Assets/image/environment/decoration/bamboo5.png delete mode 100644 Assets/image/environment/decoration/bamboo6.png delete mode 100644 Assets/image/environment/decoration/bamboo7.png delete mode 100644 Assets/image/environment/decoration/bamboo8.png delete mode 100644 Assets/image/environment/decoration/campfire/0.png delete mode 100644 Assets/image/environment/decoration/campfire/1.png delete mode 100644 Assets/image/environment/decoration/campfire/10.png delete mode 100644 Assets/image/environment/decoration/campfire/2.png delete mode 100644 Assets/image/environment/decoration/campfire/3.png delete mode 100644 Assets/image/environment/decoration/campfire/4.png delete mode 100644 Assets/image/environment/decoration/campfire/5.png delete mode 100644 Assets/image/environment/decoration/campfire/6.png delete mode 100644 Assets/image/environment/decoration/campfire/7.png delete mode 100644 Assets/image/environment/decoration/campfire/8.png delete mode 100644 Assets/image/environment/decoration/campfire/9.png delete mode 100644 Assets/image/environment/decoration/chest.png delete mode 100644 Assets/image/environment/decoration/desert_skull_01.png delete mode 100644 Assets/image/environment/decoration/desert_skull_02.png delete mode 100644 Assets/image/environment/decoration/desert_skull_03.png delete mode 100644 Assets/image/environment/decoration/forest_berrybush.png delete mode 100644 Assets/image/environment/decoration/forest_bush4.png delete mode 100644 Assets/image/environment/decoration/forest_bush5.png delete mode 100644 Assets/image/environment/decoration/reed1.png delete mode 100644 Assets/image/environment/decoration/reed2.png delete mode 100644 Assets/image/environment/decoration/reed3.png delete mode 100644 Assets/image/environment/decoration/reed4.png delete mode 100644 Assets/image/environment/decoration/reed5.png delete mode 100644 Assets/image/environment/decoration/reed6.png delete mode 100644 Assets/image/environment/decoration/reed7.png delete mode 100644 Assets/image/environment/decoration/reed8.png delete mode 100644 Assets/image/environment/decoration/stone1.png delete mode 100644 Assets/image/environment/decoration/stone2.png delete mode 100644 Assets/image/environment/decoration/stone3.png delete mode 100644 Assets/image/environment/decoration/waterbuds.png delete mode 100644 Assets/image/environment/decoration/waterplant0.png delete mode 100644 Assets/image/environment/decoration/waterplant1.png delete mode 100644 Assets/image/environment/decoration/waterplant2.png delete mode 100644 Assets/image/environment/decoration/waterplant3.png delete mode 100644 Assets/image/environment/decoration/waterplant4.png delete mode 100644 Assets/image/environment/decoration/waterplant5.png delete mode 100644 Assets/image/environment/decoration/waterplant6.png delete mode 100644 Assets/image/environment/snow/snowflake1.png delete mode 100644 Assets/image/environment/snow/snowflake10.png delete mode 100644 Assets/image/environment/snow/snowflake11.png delete mode 100644 Assets/image/environment/snow/snowflake12.png delete mode 100644 Assets/image/environment/snow/snowflake13.png delete mode 100644 Assets/image/environment/snow/snowflake14.png delete mode 100644 Assets/image/environment/snow/snowflake15.png delete mode 100644 Assets/image/environment/snow/snowflake16.png delete mode 100644 Assets/image/environment/snow/snowflake2.png delete mode 100644 Assets/image/environment/snow/snowflake3.png delete mode 100644 Assets/image/environment/snow/snowflake4.png delete mode 100644 Assets/image/environment/snow/snowflake5.png delete mode 100644 Assets/image/environment/snow/snowflake6.png delete mode 100644 Assets/image/environment/snow/snowflake7.png delete mode 100644 Assets/image/environment/snow/snowflake8.png delete mode 100644 Assets/image/environment/snow/snowflake9.png diff --git a/Assets/image/environment/block/LowTileDirt01.png b/Assets/image/environment/block/LowTileDirt01.png deleted file mode 100644 index d9336c58..00000000 --- a/Assets/image/environment/block/LowTileDirt01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f350d486ea458d48c0954514afb782a22d9103c489b79ab5b219a1c0d2d8f90a -size 17640 diff --git a/Assets/image/environment/block/LowTileDirtToStoneTransition01.png b/Assets/image/environment/block/LowTileDirtToStoneTransition01.png deleted file mode 100644 index 2dd59956..00000000 --- a/Assets/image/environment/block/LowTileDirtToStoneTransition01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c0e4d77e96e60fc4daae80e764df92aa4b13013dbfee3c6d74d7c0b78d397464 -size 21914 diff --git a/Assets/image/environment/block/LowTileDirtToStoneTransition02.png b/Assets/image/environment/block/LowTileDirtToStoneTransition02.png deleted file mode 100644 index 7ab2e4c2..00000000 --- a/Assets/image/environment/block/LowTileDirtToStoneTransition02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:76528cbe21615e2e6a953a16003d82a6bab701d7328f4e66366155343aa2b2bb -size 20459 diff --git a/Assets/image/environment/block/LowTileRiverbed01.png b/Assets/image/environment/block/LowTileRiverbed01.png deleted file mode 100644 index a7aa13da..00000000 --- a/Assets/image/environment/block/LowTileRiverbed01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:352a36c64ed5274f8b189270161e35348a861f72407671284516597c2931ceca -size 26180 diff --git a/Assets/image/environment/block/LowTileRiverbed02.png b/Assets/image/environment/block/LowTileRiverbed02.png deleted file mode 100644 index f8dacd73..00000000 --- a/Assets/image/environment/block/LowTileRiverbed02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:785067dc1e80eca3609d9de4ef6564ee4cccc6196f0cf8b9076ef407112dc9d8 -size 25481 diff --git a/Assets/image/environment/block/LowTileRiverbed03.png b/Assets/image/environment/block/LowTileRiverbed03.png deleted file mode 100644 index f63990d0..00000000 --- a/Assets/image/environment/block/LowTileRiverbed03.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6ac67a44888c1ed7005b39fe07e566b5c1f1364b9c82c4bdbd448d015b6bb837 -size 24962 diff --git a/Assets/image/environment/block/LowTileRiverbed04.png b/Assets/image/environment/block/LowTileRiverbed04.png deleted file mode 100644 index c01f9960..00000000 --- a/Assets/image/environment/block/LowTileRiverbed04.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b9b1d708709304d4413dbde914c0ba032797c354c4ecc5ec9dd476e7d6ed8a14 -size 24781 diff --git a/Assets/image/environment/block/LowTileSand01.png b/Assets/image/environment/block/LowTileSand01.png deleted file mode 100644 index a9233c45..00000000 --- a/Assets/image/environment/block/LowTileSand01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f50068ba3cdc64d0bd8e9b36d258ce6a9b445e9875f4584a9d63a2848ae5214d -size 16608 diff --git a/Assets/image/environment/block/LowTileSand02.png b/Assets/image/environment/block/LowTileSand02.png deleted file mode 100644 index b024b698..00000000 --- a/Assets/image/environment/block/LowTileSand02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b7db42f6c5bacf142121f17c1a8016b9ec2dcbbaa094f419c447b5f9bc2a3f24 -size 16718 diff --git a/Assets/image/environment/block/LowTileSand03.png b/Assets/image/environment/block/LowTileSand03.png deleted file mode 100644 index 37e1839a..00000000 --- a/Assets/image/environment/block/LowTileSand03.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1819cfdef37779eda72c1413664f172640ae0d598c1297efe52e8d73bd9a710d -size 21168 diff --git a/Assets/image/environment/block/LowTileStone01.png b/Assets/image/environment/block/LowTileStone01.png deleted file mode 100644 index 133cbb3e..00000000 --- a/Assets/image/environment/block/LowTileStone01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aa9b4d43cc84f3fa51be8ab18f3f7a904f02ff307bdc8d94f45bf5e7eb0e9f7a -size 22062 diff --git a/Assets/image/environment/block/LowTileStone02.png b/Assets/image/environment/block/LowTileStone02.png deleted file mode 100644 index 5e1f3a03..00000000 --- a/Assets/image/environment/block/LowTileStone02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:964075a71b62685b74346f45a8726fdd8690fe4c99a174d5fa553fb9a53c306a -size 21696 diff --git a/Assets/image/environment/block/LowTileStone03.png b/Assets/image/environment/block/LowTileStone03.png deleted file mode 100644 index 3b8875c2..00000000 --- a/Assets/image/environment/block/LowTileStone03.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:06342dd9fc92123e8a41df52a097f3e730d74af76e8fded3775cfbd6fcd547c2 -size 23975 diff --git a/Assets/image/environment/block/OverlayCracks01.png b/Assets/image/environment/block/OverlayCracks01.png deleted file mode 100644 index db68704d..00000000 --- a/Assets/image/environment/block/OverlayCracks01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8a08e560c1706c85d0b5d981791324c130db052e5186ab58efa6f22ad84ccb36 -size 10315 diff --git a/Assets/image/environment/block/OverlayCracks02.png b/Assets/image/environment/block/OverlayCracks02.png deleted file mode 100644 index 0842e807..00000000 --- a/Assets/image/environment/block/OverlayCracks02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6d9667a66f62d292fb1a6ba5dbfc9eb4b6bdc4f12cc1602bcd638bada8e15de0 -size 6861 diff --git a/Assets/image/environment/block/OverlayGlow01.png b/Assets/image/environment/block/OverlayGlow01.png deleted file mode 100644 index beb1867f..00000000 --- a/Assets/image/environment/block/OverlayGlow01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5ecf8ad14871f6a28d78cfc43f37dcb613e4f60097d8b2f260d70ec7796d5387 -size 24373 diff --git a/Assets/image/environment/block/OverlayGlow02.png b/Assets/image/environment/block/OverlayGlow02.png deleted file mode 100644 index dfa8aa0e..00000000 --- a/Assets/image/environment/block/OverlayGlow02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f34d20e027601d993a2c97e955384a38a870d3071ecd126f806519e99faf02bc -size 3731 diff --git a/Assets/image/environment/block/OverlayGrass01.png b/Assets/image/environment/block/OverlayGrass01.png deleted file mode 100644 index e5378b66..00000000 --- a/Assets/image/environment/block/OverlayGrass01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:374773c381298dea099f97a5150a58f9cc6c91384b17e77c6588620582531543 -size 18504 diff --git a/Assets/image/environment/block/OverlayGrassHalfH01.png b/Assets/image/environment/block/OverlayGrassHalfH01.png deleted file mode 100644 index 12555746..00000000 --- a/Assets/image/environment/block/OverlayGrassHalfH01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:514e2cf0b4e2eefdfa4c63ea963757e20b59513bbe23e4d8b8c55fc06fd2e2b3 -size 14665 diff --git a/Assets/image/environment/block/OverlayGrassHalfH02.png b/Assets/image/environment/block/OverlayGrassHalfH02.png deleted file mode 100644 index 69976ac1..00000000 --- a/Assets/image/environment/block/OverlayGrassHalfH02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:36bb254e03d481ad20d272d6c10fa9787e44543b47f97186445624ccb75d3141 -size 16198 diff --git a/Assets/image/environment/block/OverlayGrassHalfV01.png b/Assets/image/environment/block/OverlayGrassHalfV01.png deleted file mode 100644 index 7b93eb4c..00000000 --- a/Assets/image/environment/block/OverlayGrassHalfV01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:98ea1270349c58f103a4c55cc6f333e9d046fe8720413fd0bbac132d7892b726 -size 17043 diff --git a/Assets/image/environment/block/OverlayGrassHalfV02Kopie.png b/Assets/image/environment/block/OverlayGrassHalfV02Kopie.png deleted file mode 100644 index 02d87db5..00000000 --- a/Assets/image/environment/block/OverlayGrassHalfV02Kopie.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:80b3c71cce1a151e911e73fd5878ee6b59c2b6a6aa4965acf72b8f91290221a5 -size 12540 diff --git a/Assets/image/environment/block/OverlayGrassPatch01.png b/Assets/image/environment/block/OverlayGrassPatch01.png deleted file mode 100644 index 4e7cb42c..00000000 --- a/Assets/image/environment/block/OverlayGrassPatch01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2b4454f70de56ab658f7ab914a148f2fb6ebb22b2c7a3cde13d5a510f981cd83 -size 16002 diff --git a/Assets/image/environment/block/OverlayGrassPatch02.png b/Assets/image/environment/block/OverlayGrassPatch02.png deleted file mode 100644 index 202b1ad8..00000000 --- a/Assets/image/environment/block/OverlayGrassPatch02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7fd80bb0cf12fa077c051121e718ae7a266300ae12e3f8131abca7639f69142f -size 28203 diff --git a/Assets/image/environment/block/OverlayGrassPatch02H01.png b/Assets/image/environment/block/OverlayGrassPatch02H01.png deleted file mode 100644 index ee4bf6aa..00000000 --- a/Assets/image/environment/block/OverlayGrassPatch02H01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f6ebf227202c84c9d876fe775076fb2afa11e5c28fb152f596c3b957dbfdf36d -size 15618 diff --git a/Assets/image/environment/block/OverlayGrassPatch02H02.png b/Assets/image/environment/block/OverlayGrassPatch02H02.png deleted file mode 100644 index 902c73a2..00000000 --- a/Assets/image/environment/block/OverlayGrassPatch02H02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:08313f61483afdeef707386ad2bab5b5fe7653b7f410d04530723016cb99ae37 -size 22845 diff --git a/Assets/image/environment/block/OverlayGrassPatch02V01.png b/Assets/image/environment/block/OverlayGrassPatch02V01.png deleted file mode 100644 index 280da51e..00000000 --- a/Assets/image/environment/block/OverlayGrassPatch02V01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2cb3b40948aee50974f17e55a51a4160a248068673927d7a571fbf08540b1239 -size 23685 diff --git a/Assets/image/environment/block/OverlayGrassPatch02V02.png b/Assets/image/environment/block/OverlayGrassPatch02V02.png deleted file mode 100644 index 9c4bc2b3..00000000 --- a/Assets/image/environment/block/OverlayGrassPatch02V02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:61caa04e6509826bcee1576f30edb6318cfe3041fdf7e1c3840a64f191993d29 -size 17516 diff --git a/Assets/image/environment/block/OverlayGrassPatch03.png b/Assets/image/environment/block/OverlayGrassPatch03.png deleted file mode 100644 index 20a0d038..00000000 --- a/Assets/image/environment/block/OverlayGrassPatch03.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9ccf1aeec5c6665ed66376fd86c24f5b915f1b73429326753e8b75fc76ec1e0d -size 17448 diff --git a/Assets/image/environment/block/OverlayGrassPatch03H01.png b/Assets/image/environment/block/OverlayGrassPatch03H01.png deleted file mode 100644 index b544719c..00000000 --- a/Assets/image/environment/block/OverlayGrassPatch03H01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:54769762861d6c68805c48d2360a30a36f7ad3cbabc3e3bae2ad0c69f578b0d4 -size 12761 diff --git a/Assets/image/environment/block/OverlayGrassPatch03H02.png b/Assets/image/environment/block/OverlayGrassPatch03H02.png deleted file mode 100644 index dc55bc2f..00000000 --- a/Assets/image/environment/block/OverlayGrassPatch03H02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0c0375efc1400fa9d84847da7b5ea2e22b271b6b4413c254d6eb0011cfe144d6 -size 11100 diff --git a/Assets/image/environment/block/OverlayGrassPatch03V01.png b/Assets/image/environment/block/OverlayGrassPatch03V01.png deleted file mode 100644 index 694b8657..00000000 --- a/Assets/image/environment/block/OverlayGrassPatch03V01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9c7d05a4a625e81732429050375457ba231032273fcc8fe09cfcc024f3e6a0a3 -size 15073 diff --git a/Assets/image/environment/block/OverlayGrassPatch03V02.png b/Assets/image/environment/block/OverlayGrassPatch03V02.png deleted file mode 100644 index 03bc7608..00000000 --- a/Assets/image/environment/block/OverlayGrassPatch03V02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:33866652d212ee11b39cafcac87a3d14d13c31149b9297da12b03a2200ed9954 -size 11132 diff --git a/Assets/image/environment/block/OverlayGrassPatchH01.png b/Assets/image/environment/block/OverlayGrassPatchH01.png deleted file mode 100644 index 912ae404..00000000 --- a/Assets/image/environment/block/OverlayGrassPatchH01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f0859a3afd0efc9ec992281d3909a004602bb0d27d8f6cf63250e66b0a01aa54 -size 9171 diff --git a/Assets/image/environment/block/OverlayGrassPatchH02.png b/Assets/image/environment/block/OverlayGrassPatchH02.png deleted file mode 100644 index 0fdbfdd7..00000000 --- a/Assets/image/environment/block/OverlayGrassPatchH02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a5e16e1a106ec3c7b9c56878a5b9af28f7837bbee7258a1c9d4eec203e595f79 -size 14626 diff --git a/Assets/image/environment/block/OverlayGrassPatchV01.png b/Assets/image/environment/block/OverlayGrassPatchV01.png deleted file mode 100644 index baf2b280..00000000 --- a/Assets/image/environment/block/OverlayGrassPatchV01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a9b8ebe3d65c8582b2f428dba2dcb56ff4a861d85f4f456abc13fa8e23b26813 -size 13278 diff --git a/Assets/image/environment/block/OverlayGrassPatchV02.png b/Assets/image/environment/block/OverlayGrassPatchV02.png deleted file mode 100644 index 5cb1eb2c..00000000 --- a/Assets/image/environment/block/OverlayGrassPatchV02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b4777ae80a296cc49b31c35044c899aadfd5dd3b5bac92f39d2204e4c627aa95 -size 10370 diff --git a/Assets/image/environment/block/OverlayPathCross.png b/Assets/image/environment/block/OverlayPathCross.png deleted file mode 100644 index 543f2555..00000000 --- a/Assets/image/environment/block/OverlayPathCross.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:524ae29c5cd1f0170b00776e3f353a507c07984c580d79dee56a2eb252ba0591 -size 16878 diff --git a/Assets/image/environment/block/OverlayPathCross301.png b/Assets/image/environment/block/OverlayPathCross301.png deleted file mode 100644 index 3fb651d3..00000000 --- a/Assets/image/environment/block/OverlayPathCross301.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e7a945b136063196b22304289adf25e91bbe30f2728a5baba34e77a59298acc0 -size 17545 diff --git a/Assets/image/environment/block/OverlayPathCross302.png b/Assets/image/environment/block/OverlayPathCross302.png deleted file mode 100644 index 722eb9cd..00000000 --- a/Assets/image/environment/block/OverlayPathCross302.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:831d4d59d97acd611fa94c57c3fecac2c730fabf75bc74aa7d3bbfd5d948b3c2 -size 17401 diff --git a/Assets/image/environment/block/OverlayPathCross303.png b/Assets/image/environment/block/OverlayPathCross303.png deleted file mode 100644 index 0ddf7dc8..00000000 --- a/Assets/image/environment/block/OverlayPathCross303.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:95e01bd2cdf99334bd093f9017761b34a110392389a74c7a590bace251c6b1c4 -size 17240 diff --git a/Assets/image/environment/block/OverlayPathCross304.png b/Assets/image/environment/block/OverlayPathCross304.png deleted file mode 100644 index 8e01f8b7..00000000 --- a/Assets/image/environment/block/OverlayPathCross304.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5f637b5a37371f955ac87c3fbde93e77af001be51871b9a7c196e992677e6c74 -size 17520 diff --git a/Assets/image/environment/block/OverlayPathCurve01.png b/Assets/image/environment/block/OverlayPathCurve01.png deleted file mode 100644 index 1a16af2a..00000000 --- a/Assets/image/environment/block/OverlayPathCurve01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8f5ac430368c3557fea4f824fed353f8a03f815a67adf7d166051d113d0ac3d5 -size 17906 diff --git a/Assets/image/environment/block/OverlayPathCurve02.png b/Assets/image/environment/block/OverlayPathCurve02.png deleted file mode 100644 index 58d1bc8f..00000000 --- a/Assets/image/environment/block/OverlayPathCurve02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:326bf8ad30102a13cc8bd145c1879c06b342f74e78303554a4bd532a21050cbf -size 18107 diff --git a/Assets/image/environment/block/OverlayPathCurve03.png b/Assets/image/environment/block/OverlayPathCurve03.png deleted file mode 100644 index baa9396a..00000000 --- a/Assets/image/environment/block/OverlayPathCurve03.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e49cfe30483247ae6de25793ba3e0a3add57f1fde80f97dab3a9eb12e974eaba -size 18045 diff --git a/Assets/image/environment/block/OverlayPathCurve04.png b/Assets/image/environment/block/OverlayPathCurve04.png deleted file mode 100644 index 079389d1..00000000 --- a/Assets/image/environment/block/OverlayPathCurve04.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:83b60183092a8ef4749114d2c7e9dc4d51397e935ac6a6899a0e232164169bae -size 18129 diff --git a/Assets/image/environment/block/OverlayPathEnd01.png b/Assets/image/environment/block/OverlayPathEnd01.png deleted file mode 100644 index a68621b4..00000000 --- a/Assets/image/environment/block/OverlayPathEnd01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b35b1c4a0799d6f909a031c44149a47f039a28a96a16f8c2ab25c4a2052fa296 -size 18352 diff --git a/Assets/image/environment/block/OverlayPathEnd02.png b/Assets/image/environment/block/OverlayPathEnd02.png deleted file mode 100644 index 0a8fa95d..00000000 --- a/Assets/image/environment/block/OverlayPathEnd02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b6344853e1a1032b32137162c86acc291a06733d930416ed53f75271f4f7cbbd -size 18223 diff --git a/Assets/image/environment/block/OverlayPathEnd03.png b/Assets/image/environment/block/OverlayPathEnd03.png deleted file mode 100644 index 7c56c690..00000000 --- a/Assets/image/environment/block/OverlayPathEnd03.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aafb7a1182010303ff2df129a3f6874f8c0e25be26e4f969d324431b2d6539cb -size 18271 diff --git a/Assets/image/environment/block/OverlayPathEnd04.png b/Assets/image/environment/block/OverlayPathEnd04.png deleted file mode 100644 index bf934441..00000000 --- a/Assets/image/environment/block/OverlayPathEnd04.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:76f2427eb6ec9e00df46f804beba0c95ea971b64b0145ce991ec2102bee50c39 -size 18378 diff --git a/Assets/image/environment/block/OverlayPathSingle.png b/Assets/image/environment/block/OverlayPathSingle.png deleted file mode 100644 index 31921db3..00000000 --- a/Assets/image/environment/block/OverlayPathSingle.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b323818706f32a2c67f9ccecc0b9fcd840b7f2c32f39e5eb158995f634e5109f -size 18715 diff --git a/Assets/image/environment/block/OverlayPathStraight01.png b/Assets/image/environment/block/OverlayPathStraight01.png deleted file mode 100644 index f829100c..00000000 --- a/Assets/image/environment/block/OverlayPathStraight01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:db9377cf1a210d106b6189b933cf603db7f4dd1944104506605b667308e4cf6f -size 17986 diff --git a/Assets/image/environment/block/OverlayPathStraight02.png b/Assets/image/environment/block/OverlayPathStraight02.png deleted file mode 100644 index 1bad4cd2..00000000 --- a/Assets/image/environment/block/OverlayPathStraight02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f9f51ddc407ea749f0d2929b20dca22cd60201036c0e322c245073e0ed0919d1 -size 17894 diff --git a/Assets/image/environment/block/OverlayRoofHay01.png b/Assets/image/environment/block/OverlayRoofHay01.png deleted file mode 100644 index 595629e6..00000000 --- a/Assets/image/environment/block/OverlayRoofHay01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a1d169f6fcb1337df79aaf0d09f2973cd908f487a11c40b76f32d597701dcfa8 -size 20351 diff --git a/Assets/image/environment/block/OverlayRoofHay02.png b/Assets/image/environment/block/OverlayRoofHay02.png deleted file mode 100644 index b17aacbd..00000000 --- a/Assets/image/environment/block/OverlayRoofHay02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:239958b6b98f0dd1f0e0c8dcb45f8ab7234df9fb22dcb52ddeb315534315f0d5 -size 19170 diff --git a/Assets/image/environment/block/OverlayRoofHay03.png b/Assets/image/environment/block/OverlayRoofHay03.png deleted file mode 100644 index 2cef1cfd..00000000 --- a/Assets/image/environment/block/OverlayRoofHay03.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f71b46a2782d0d371b4f97b086483906675ff2309b76ba2795efca7480a3a952 -size 8353 diff --git a/Assets/image/environment/block/OverlayRoofHay04.png b/Assets/image/environment/block/OverlayRoofHay04.png deleted file mode 100644 index cad878fe..00000000 --- a/Assets/image/environment/block/OverlayRoofHay04.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c4eebf752b70457571b4d2bd55e42ae1c3299156bca0fb527f665b6915e29a2e -size 6647 diff --git a/Assets/image/environment/block/OverlayRoofHay05.png b/Assets/image/environment/block/OverlayRoofHay05.png deleted file mode 100644 index 6973d1ad..00000000 --- a/Assets/image/environment/block/OverlayRoofHay05.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:62de74347a887ca83c996c8c0bbb0b36f88850701e4c6b55b967b0bad47424ab -size 22834 diff --git a/Assets/image/environment/block/OverlayRoofHay06.png b/Assets/image/environment/block/OverlayRoofHay06.png deleted file mode 100644 index b3cd7076..00000000 --- a/Assets/image/environment/block/OverlayRoofHay06.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1929b2de877d95b029538758b8be50715384c31040e9303a74c2c7c4621e9cd0 -size 6977 diff --git a/Assets/image/environment/block/OverlayRoofHay07.png b/Assets/image/environment/block/OverlayRoofHay07.png deleted file mode 100644 index aa8e14d9..00000000 --- a/Assets/image/environment/block/OverlayRoofHay07.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:06cfc9261a2338dd4ba528ae0493e768a54a392470f39e1d8789e244af1af545 -size 14212 diff --git a/Assets/image/environment/block/OverlayRoofHay08.png b/Assets/image/environment/block/OverlayRoofHay08.png deleted file mode 100644 index 6cba06d9..00000000 --- a/Assets/image/environment/block/OverlayRoofHay08.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0d3479b7bb37313c43408d47b324a5534717a0cdb238a7459a305ce1f0038b85 -size 12718 diff --git a/Assets/image/environment/block/OverlayRoofHay09.png b/Assets/image/environment/block/OverlayRoofHay09.png deleted file mode 100644 index 496ebfb4..00000000 --- a/Assets/image/environment/block/OverlayRoofHay09.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a997e72c16ef5bcda2722dfe079ab0f4c43c084ba1a1b6bfa48302b6904f2941 -size 17989 diff --git a/Assets/image/environment/block/OverlayRoofHay10.png b/Assets/image/environment/block/OverlayRoofHay10.png deleted file mode 100644 index eb0beea8..00000000 --- a/Assets/image/environment/block/OverlayRoofHay10.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:11e85d1062a0029988ea783740933d5e71a510bca133b2c4ac482ca244493d55 -size 20022 diff --git a/Assets/image/environment/block/OverlayRoofHay11.png b/Assets/image/environment/block/OverlayRoofHay11.png deleted file mode 100644 index dd02ce53..00000000 --- a/Assets/image/environment/block/OverlayRoofHay11.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4ddd8e40414afe6f8b95b5ec6bebaa88943b92842bf53f5e46e4fe8821a7f8d8 -size 13116 diff --git a/Assets/image/environment/block/OverlayRoofHay12.png b/Assets/image/environment/block/OverlayRoofHay12.png deleted file mode 100644 index f1508c83..00000000 --- a/Assets/image/environment/block/OverlayRoofHay12.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6cb82f45cbf74bdd5ef73b5d00ca1be5b2c7ecd05264d9a3fef77fd3bdb55588 -size 9077 diff --git a/Assets/image/environment/block/OverlayRoofHay13.png b/Assets/image/environment/block/OverlayRoofHay13.png deleted file mode 100644 index 48114501..00000000 --- a/Assets/image/environment/block/OverlayRoofHay13.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b4b1708e41afddb3ad38842ba6e44d026ca7d2f4c91f8337cdfee0b6d561fac6 -size 19195 diff --git a/Assets/image/environment/block/OverlayShoreCornerD.png b/Assets/image/environment/block/OverlayShoreCornerD.png deleted file mode 100644 index d6048e98..00000000 --- a/Assets/image/environment/block/OverlayShoreCornerD.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fe483e309c6a32ce12386f3ff231dd1f93b23c3dc4943fddc05f2bf9d444636d -size 1511 diff --git a/Assets/image/environment/block/OverlayShoreCornerL.png b/Assets/image/environment/block/OverlayShoreCornerL.png deleted file mode 100644 index 0c4f57a1..00000000 --- a/Assets/image/environment/block/OverlayShoreCornerL.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e6637ae6423ad4a9ee309405099a250e485be5fec8a57ca821494c2e7a7afff3 -size 1252 diff --git a/Assets/image/environment/block/OverlayShoreCornerR.png b/Assets/image/environment/block/OverlayShoreCornerR.png deleted file mode 100644 index 8339340c..00000000 --- a/Assets/image/environment/block/OverlayShoreCornerR.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aa6922172818757f3435235562337efa898a2656c1f14fe393a1264f2d8ff354 -size 1211 diff --git a/Assets/image/environment/block/OverlayShoreCornerRU.png b/Assets/image/environment/block/OverlayShoreCornerRU.png deleted file mode 100644 index 3f2b5c70..00000000 --- a/Assets/image/environment/block/OverlayShoreCornerRU.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fc170a69796a76e98749587ff441ce124cfcaca7e0bbbb8571b47026d6ee5443 -size 1214 diff --git a/Assets/image/environment/block/OverlayShoreCornerU.png b/Assets/image/environment/block/OverlayShoreCornerU.png deleted file mode 100644 index 3f2b5c70..00000000 --- a/Assets/image/environment/block/OverlayShoreCornerU.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fc170a69796a76e98749587ff441ce124cfcaca7e0bbbb8571b47026d6ee5443 -size 1214 diff --git a/Assets/image/environment/block/OverlayShoreStraightLD.png b/Assets/image/environment/block/OverlayShoreStraightLD.png deleted file mode 100644 index 497fb72e..00000000 --- a/Assets/image/environment/block/OverlayShoreStraightLD.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:288fc43d3244fd60be9dd7015a949daf51b2d0698f8c4db578fc4e94a3b6ff8b -size 2535 diff --git a/Assets/image/environment/block/OverlayShoreStraightLU.png b/Assets/image/environment/block/OverlayShoreStraightLU.png deleted file mode 100644 index f1533b0a..00000000 --- a/Assets/image/environment/block/OverlayShoreStraightLU.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:156d33162dc93b9f27dfb85f419156e4f58ca2ed2a1821cd1d1f23fe0cf45d92 -size 2561 diff --git a/Assets/image/environment/block/OverlayShoreStraightRD.png b/Assets/image/environment/block/OverlayShoreStraightRD.png deleted file mode 100644 index d9e5c561..00000000 --- a/Assets/image/environment/block/OverlayShoreStraightRD.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3a873f75397eab135216b5aa9ec3e1ca33cf09407bc7a8608301a49c8eb4b472 -size 2568 diff --git a/Assets/image/environment/block/OverlayShoreStraightRU.png b/Assets/image/environment/block/OverlayShoreStraightRU.png deleted file mode 100644 index 500e5962..00000000 --- a/Assets/image/environment/block/OverlayShoreStraightRU.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ea3f596ad53766b3d8c02ec58e21e1c7083d24b29a325102737358872ef08eb3 -size 2790 diff --git a/Assets/image/environment/block/OverlayStonePieces01.png b/Assets/image/environment/block/OverlayStonePieces01.png deleted file mode 100644 index 9eeec583..00000000 --- a/Assets/image/environment/block/OverlayStonePieces01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a68424c0c9d90477df87457b5dbaf3b50b45ef6726427e2b60b798bb3315405f -size 43113 diff --git a/Assets/image/environment/block/OverlayStonePieces01HalfH01.png b/Assets/image/environment/block/OverlayStonePieces01HalfH01.png deleted file mode 100644 index 2c03e296..00000000 --- a/Assets/image/environment/block/OverlayStonePieces01HalfH01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6b1eadaf0e9b085f93af2a4de9666e12df0f3ef606a065bb9d52b5f085b933a7 -size 41647 diff --git a/Assets/image/environment/block/OverlayStonePieces01HalfH02.png b/Assets/image/environment/block/OverlayStonePieces01HalfH02.png deleted file mode 100644 index e07af35b..00000000 --- a/Assets/image/environment/block/OverlayStonePieces01HalfH02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a77a79651411c2418fa813beaaedd99fa6b1f2b8b7218fc6b833ef341c683023 -size 9301 diff --git a/Assets/image/environment/block/OverlayStonePieces01HalfV01.png b/Assets/image/environment/block/OverlayStonePieces01HalfV01.png deleted file mode 100644 index 42424670..00000000 --- a/Assets/image/environment/block/OverlayStonePieces01HalfV01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7952268be215d877bbe1699d1c87d287ed4506a9c8036835f690de1e166ac8e8 -size 26020 diff --git a/Assets/image/environment/block/OverlayStonePieces01HalfV02.png b/Assets/image/environment/block/OverlayStonePieces01HalfV02.png deleted file mode 100644 index f85ee276..00000000 --- a/Assets/image/environment/block/OverlayStonePieces01HalfV02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:89fff95d2a8b5ea026cd379d3bcbf59dd11331cc930636324ab9f26cb6184fc3 -size 26152 diff --git a/Assets/image/environment/block/OverlayStonePieces02.png b/Assets/image/environment/block/OverlayStonePieces02.png deleted file mode 100644 index 6a6445d0..00000000 --- a/Assets/image/environment/block/OverlayStonePieces02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1a3d594f2e280a2c37dad6e436ca75e92ce2546c10c10876ccc4317ac7d814cd -size 26412 diff --git a/Assets/image/environment/block/OverlayStonePieces02HalfH01.png b/Assets/image/environment/block/OverlayStonePieces02HalfH01.png deleted file mode 100644 index 16d6814b..00000000 --- a/Assets/image/environment/block/OverlayStonePieces02HalfH01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:466507f96a9656ac4010607fe856e2587ab4348886fc10289d8395208bd3fb00 -size 25658 diff --git a/Assets/image/environment/block/OverlayStonePieces02HalfH02.png b/Assets/image/environment/block/OverlayStonePieces02HalfH02.png deleted file mode 100644 index 433800f3..00000000 --- a/Assets/image/environment/block/OverlayStonePieces02HalfH02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6adb98a2524010ff5faf6fc8daacbc0a8b4bd382ab4a35a00c959c3d3e8afb2f -size 9660 diff --git a/Assets/image/environment/block/OverlayStonePieces02HalfV01.png b/Assets/image/environment/block/OverlayStonePieces02HalfV01.png deleted file mode 100644 index 283edff5..00000000 --- a/Assets/image/environment/block/OverlayStonePieces02HalfV01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f12f923f7217159033b27e44931a7106b4ce21b63c379e70c0e9b4adaf5e8357 -size 15633 diff --git a/Assets/image/environment/block/OverlayStonePieces02HalfV02.png b/Assets/image/environment/block/OverlayStonePieces02HalfV02.png deleted file mode 100644 index 459d343c..00000000 --- a/Assets/image/environment/block/OverlayStonePieces02HalfV02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c550aabb88dc292d3ce43a6c450341ecae48d1ca582a1f3d654d88b638079cf3 -size 23682 diff --git a/Assets/image/environment/block/OverlayWater01.png b/Assets/image/environment/block/OverlayWater01.png deleted file mode 100644 index 229939ba..00000000 --- a/Assets/image/environment/block/OverlayWater01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0ad1a52b38854c56f2542542034d666fa3a4ef1c32672024a7488736b06a4838 -size 13986 diff --git a/Assets/image/environment/block/OverlayWater02.png b/Assets/image/environment/block/OverlayWater02.png deleted file mode 100644 index 0bfd751b..00000000 --- a/Assets/image/environment/block/OverlayWater02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0f964f36b2e8a5ff249840e76c03051e33f76a2f0ef6abdc053dfa427becfe86 -size 14062 diff --git a/Assets/image/environment/block/PropStairStone01.png b/Assets/image/environment/block/PropStairStone01.png deleted file mode 100644 index 3fa3ef0f..00000000 --- a/Assets/image/environment/block/PropStairStone01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:85599ee77c8a9a7f1150cf8c39bcfbd4097695cc49ccdca0fbe7f93602d11d54 -size 35103 diff --git a/Assets/image/environment/block/PropStairStone02.png b/Assets/image/environment/block/PropStairStone02.png deleted file mode 100644 index 6d61d2e0..00000000 --- a/Assets/image/environment/block/PropStairStone02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f7a14ee2f1f70478ec9cc006ca6bb078f60abe50a3f51e7c2d9a169d003bec4f -size 33235 diff --git a/Assets/image/environment/block/PropStairStone03.png b/Assets/image/environment/block/PropStairStone03.png deleted file mode 100644 index 7c3a1a22..00000000 --- a/Assets/image/environment/block/PropStairStone03.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:153ae707df52097e7a2cc348eb5e93f46818e4b89624b86e8bb29740f73d10e1 -size 33148 diff --git a/Assets/image/environment/block/PropStairStone04.png b/Assets/image/environment/block/PropStairStone04.png deleted file mode 100644 index 9027604f..00000000 --- a/Assets/image/environment/block/PropStairStone04.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c7252e2c4e8ae0fa07a830037fba837727a56411e75df92f65faaaece8becd6a -size 35739 diff --git a/Assets/image/environment/block/PropStairStone05.png b/Assets/image/environment/block/PropStairStone05.png deleted file mode 100644 index 074fb690..00000000 --- a/Assets/image/environment/block/PropStairStone05.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a7fcce08e1c811fc938abe15d572cd532fa6aa10d6bee2fa429b0148bf8e126e -size 41527 diff --git a/Assets/image/environment/block/PropStairStone06.png b/Assets/image/environment/block/PropStairStone06.png deleted file mode 100644 index 3a9e8609..00000000 --- a/Assets/image/environment/block/PropStairStone06.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1b452e09ff4d13d989fa061efcb41df567fca292e9e0bb4e79018f5ca2a45122 -size 39755 diff --git a/Assets/image/environment/block/PropStairStone07.png b/Assets/image/environment/block/PropStairStone07.png deleted file mode 100644 index 33094307..00000000 --- a/Assets/image/environment/block/PropStairStone07.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:03f8c1ba474a71dcf4e1393c4c8e16abe872b56a0103d6833c48ca81911002b0 -size 34704 diff --git a/Assets/image/environment/block/PropStairStone08.png b/Assets/image/environment/block/PropStairStone08.png deleted file mode 100644 index 87a948e3..00000000 --- a/Assets/image/environment/block/PropStairStone08.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:701da84e701a1e804eb1ec14dfdc6573e124e025547e5c2f84d0fd9c1190096f -size 37282 diff --git a/Assets/image/environment/block/PropStairStone09.png b/Assets/image/environment/block/PropStairStone09.png deleted file mode 100644 index 6a840f19..00000000 --- a/Assets/image/environment/block/PropStairStone09.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d24c22873409c5a49c7ecc9735d698b2e955253aa97873e0e843641cc97de2f5 -size 35845 diff --git a/Assets/image/environment/block/PropStairStone10.png b/Assets/image/environment/block/PropStairStone10.png deleted file mode 100644 index c8fa0dcb..00000000 --- a/Assets/image/environment/block/PropStairStone10.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:551a0f631a106ed1abe303316a0e114b363f44287a348cad521dc9fe6d2d3d24 -size 36324 diff --git a/Assets/image/environment/block/PropStairStone11.png b/Assets/image/environment/block/PropStairStone11.png deleted file mode 100644 index 6d8fa4e5..00000000 --- a/Assets/image/environment/block/PropStairStone11.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8dedf9092b720baff331deb7454ab45cc19e405da010a716b9e828f356dcc00c -size 36688 diff --git a/Assets/image/environment/block/PropStairStone12.png b/Assets/image/environment/block/PropStairStone12.png deleted file mode 100644 index 82f239da..00000000 --- a/Assets/image/environment/block/PropStairStone12.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:68a439b66b1acb32798a4d4739ea5f86f7fed47430be4b5f22d016cadbff494e -size 39965 diff --git a/Assets/image/environment/block/TileBrickBrick01.png b/Assets/image/environment/block/TileBrickBrick01.png deleted file mode 100644 index f479a107..00000000 --- a/Assets/image/environment/block/TileBrickBrick01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:36a904b78ad4b0a76cc296888e42f18a9c33a40f58081479cfbc4da24c60df3a -size 41479 diff --git a/Assets/image/environment/block/TileBrickBrick02.png b/Assets/image/environment/block/TileBrickBrick02.png deleted file mode 100644 index 10168421..00000000 --- a/Assets/image/environment/block/TileBrickBrick02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:63c7c10a266e11ae26e854e1fa9c9e3283afb241b837fe0b6ee730ee87d87eb7 -size 40556 diff --git a/Assets/image/environment/block/TileBrickBrick03.png b/Assets/image/environment/block/TileBrickBrick03.png deleted file mode 100644 index b658e138..00000000 --- a/Assets/image/environment/block/TileBrickBrick03.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bdf76cf0bea1abf7214338a0609a74c673cdeba227a3e6d3542282c64a7474ae -size 41046 diff --git a/Assets/image/environment/block/TileBrickBrick04.png b/Assets/image/environment/block/TileBrickBrick04.png deleted file mode 100644 index 3e9d516b..00000000 --- a/Assets/image/environment/block/TileBrickBrick04.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:066475c175daea7b31a4c6a6fa89fe946e05f0426e904aedf78d66c9d7d22bb7 -size 38048 diff --git a/Assets/image/environment/block/TileBrickSandStone01.png b/Assets/image/environment/block/TileBrickSandStone01.png deleted file mode 100644 index f06881de..00000000 --- a/Assets/image/environment/block/TileBrickSandStone01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d07c7fb2b7782daf1321ae68f528a7c1a95f827a0ddb754e3a3bf58311828147 -size 37882 diff --git a/Assets/image/environment/block/TileBrickSnow01.png b/Assets/image/environment/block/TileBrickSnow01.png deleted file mode 100644 index 1885f584..00000000 --- a/Assets/image/environment/block/TileBrickSnow01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7ccc744c26cf35678a1dfdff2a33b9b54d28d735e11210d87c3512f43b1537f7 -size 29781 diff --git a/Assets/image/environment/block/TileBrickStone01.png b/Assets/image/environment/block/TileBrickStone01.png deleted file mode 100644 index bbbd785d..00000000 --- a/Assets/image/environment/block/TileBrickStone01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9dbd04903e1bec5d7f63e42c04a990683b85b3dfab4cf504eaa93453eb4b8db8 -size 17142 diff --git a/Assets/image/environment/block/TileBrickStone0102.png b/Assets/image/environment/block/TileBrickStone0102.png deleted file mode 100644 index efb46622..00000000 --- a/Assets/image/environment/block/TileBrickStone0102.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:700c3593a90d5ff628c74f5db1ac7ad2e305b65a76646ff84cd67adc4ad77a2f -size 35667 diff --git a/Assets/image/environment/block/TileBrickStone0103.png b/Assets/image/environment/block/TileBrickStone0103.png deleted file mode 100644 index e2cfcffa..00000000 --- a/Assets/image/environment/block/TileBrickStone0103.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:78503772485874731c7167794abfa85acd7579efc44f02093ad44e4b8ec51fcd -size 31040 diff --git a/Assets/image/environment/block/TileBrickStone0104.png b/Assets/image/environment/block/TileBrickStone0104.png deleted file mode 100644 index 8cbcbfd7..00000000 --- a/Assets/image/environment/block/TileBrickStone0104.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:67936c486f8d11b1b51c6b6b7cacd5f0395c622f2a23492c4f9cf384d39eda8a -size 29889 diff --git a/Assets/image/environment/block/TileBrickStone0105.png b/Assets/image/environment/block/TileBrickStone0105.png deleted file mode 100644 index 77daad92..00000000 --- a/Assets/image/environment/block/TileBrickStone0105.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9e2bd17b8da715eee207b5410185ae53725aa2f352f59ac341eb32d992b33bf8 -size 17368 diff --git a/Assets/image/environment/block/TileBrickStone0201.png b/Assets/image/environment/block/TileBrickStone0201.png deleted file mode 100644 index fc947896..00000000 --- a/Assets/image/environment/block/TileBrickStone0201.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:babeb72809ca91a81362e5af0918c0ddca71ae3c6f8b60b14f2c96fb6aec5dc5 -size 38056 diff --git a/Assets/image/environment/block/TileDirt01.png b/Assets/image/environment/block/TileDirt01.png deleted file mode 100644 index f6de3adf..00000000 --- a/Assets/image/environment/block/TileDirt01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6dc756d0c8d48cc35c2ebf0d0973c94d04e1dec6bff36e308366eb50870cc53c -size 29194 diff --git a/Assets/image/environment/block/TileDirt01Grass01.png b/Assets/image/environment/block/TileDirt01Grass01.png deleted file mode 100644 index fdc5adc9..00000000 --- a/Assets/image/environment/block/TileDirt01Grass01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2d82b116bb01a8d68a2d550bedafcd359ff7b639c47a7e4a713150a728b91682 -size 34257 diff --git a/Assets/image/environment/block/TileDirt01GrassPatch01.png b/Assets/image/environment/block/TileDirt01GrassPatch01.png deleted file mode 100644 index a6d7e1ac..00000000 --- a/Assets/image/environment/block/TileDirt01GrassPatch01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3d28d0e3e615d5d84e2a9fa6c6c437b0a711a90f3f77ec94832edec29e3e49db -size 32939 diff --git a/Assets/image/environment/block/TileDirt01GrassPatch02.png b/Assets/image/environment/block/TileDirt01GrassPatch02.png deleted file mode 100644 index 4983f53d..00000000 --- a/Assets/image/environment/block/TileDirt01GrassPatch02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:40de6612cd08508994acb720ce902f01bd80145bec671d1611128970d64dee29 -size 38566 diff --git a/Assets/image/environment/block/TileDirt01GrassPatch03.png b/Assets/image/environment/block/TileDirt01GrassPatch03.png deleted file mode 100644 index fffc4d53..00000000 --- a/Assets/image/environment/block/TileDirt01GrassPatch03.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0663131bd62282f1d19c2e6df272fc9fdeac306972bcbd233e74ccb742604c85 -size 33764 diff --git a/Assets/image/environment/block/TileDirt01GrassPath3Cross01.png b/Assets/image/environment/block/TileDirt01GrassPath3Cross01.png deleted file mode 100644 index bc9c1993..00000000 --- a/Assets/image/environment/block/TileDirt01GrassPath3Cross01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:57827f17a4781c36dbe14e6b92a942e44f80da1730d9152183bbfc632674ef07 -size 33017 diff --git a/Assets/image/environment/block/TileDirt01GrassPath3Cross02.png b/Assets/image/environment/block/TileDirt01GrassPath3Cross02.png deleted file mode 100644 index 09cbd4df..00000000 --- a/Assets/image/environment/block/TileDirt01GrassPath3Cross02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:adb645ed88b67629446b91cac796ac1b820dd5d1ede9b765ac01b2314025ccd9 -size 32865 diff --git a/Assets/image/environment/block/TileDirt01GrassPath3Cross03.png b/Assets/image/environment/block/TileDirt01GrassPath3Cross03.png deleted file mode 100644 index 3b441e56..00000000 --- a/Assets/image/environment/block/TileDirt01GrassPath3Cross03.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:66d36521528166ce4c9e1d495f3990f036c6bacc0533eb0a46b1460b54f12e5e -size 32699 diff --git a/Assets/image/environment/block/TileDirt01GrassPath3Cross04.png b/Assets/image/environment/block/TileDirt01GrassPath3Cross04.png deleted file mode 100644 index 8dae1837..00000000 --- a/Assets/image/environment/block/TileDirt01GrassPath3Cross04.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:74400bd82a51236cfb45373ca984b3ce9626130e24cac6ace44c879fe3192c53 -size 32974 diff --git a/Assets/image/environment/block/TileDirt01GrassPath4Cross.png b/Assets/image/environment/block/TileDirt01GrassPath4Cross.png deleted file mode 100644 index 2fc0543c..00000000 --- a/Assets/image/environment/block/TileDirt01GrassPath4Cross.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f127b8fea8e468db0088348ecb1e759f175f2f3221f2a50de141e8f66ee4747e -size 32355 diff --git a/Assets/image/environment/block/TileDirt01GrassPathCurve01.png b/Assets/image/environment/block/TileDirt01GrassPathCurve01.png deleted file mode 100644 index abda5e5a..00000000 --- a/Assets/image/environment/block/TileDirt01GrassPathCurve01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a3140d5e63bf357d42635f777e056ce25e4c6e6f17e7338045bae14e9c884d62 -size 33556 diff --git a/Assets/image/environment/block/TileDirt01GrassPathCurve02.png b/Assets/image/environment/block/TileDirt01GrassPathCurve02.png deleted file mode 100644 index b8b66347..00000000 --- a/Assets/image/environment/block/TileDirt01GrassPathCurve02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6f315b91658d24b868991e031523840a417049d594601c8713d5c4f9826cc5d5 -size 33560 diff --git a/Assets/image/environment/block/TileDirt01GrassPathCurve03.png b/Assets/image/environment/block/TileDirt01GrassPathCurve03.png deleted file mode 100644 index ad6ae731..00000000 --- a/Assets/image/environment/block/TileDirt01GrassPathCurve03.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:388c2841bc37747482b359ef7b90f3b0ae12324cd79fb8aca995dc436de775b5 -size 33511 diff --git a/Assets/image/environment/block/TileDirt01GrassPathCurve04.png b/Assets/image/environment/block/TileDirt01GrassPathCurve04.png deleted file mode 100644 index f7201fc6..00000000 --- a/Assets/image/environment/block/TileDirt01GrassPathCurve04.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:28c288cf0924df9087747eb4df58d818826645b5aef5afe5070581804fbb9ba8 -size 33389 diff --git a/Assets/image/environment/block/TileDirt01GrassPathEnd01.png b/Assets/image/environment/block/TileDirt01GrassPathEnd01.png deleted file mode 100644 index 5a372ee1..00000000 --- a/Assets/image/environment/block/TileDirt01GrassPathEnd01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:994ac80299939dc128bae896d95d8f42e2f78caada24811269a7f55abdae8536 -size 33798 diff --git a/Assets/image/environment/block/TileDirt01GrassPathEnd02.png b/Assets/image/environment/block/TileDirt01GrassPathEnd02.png deleted file mode 100644 index 8b86e44b..00000000 --- a/Assets/image/environment/block/TileDirt01GrassPathEnd02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8446db8230be1fd262f4f436742b1f4d0b04e242e0e74daa3d6e5ac2786c6820 -size 33675 diff --git a/Assets/image/environment/block/TileDirt01GrassPathEnd03.png b/Assets/image/environment/block/TileDirt01GrassPathEnd03.png deleted file mode 100644 index 04796d3b..00000000 --- a/Assets/image/environment/block/TileDirt01GrassPathEnd03.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1348674bc47ec159f5877a7fca2bc7897725437f162796d0db2b2b389bda012d -size 33671 diff --git a/Assets/image/environment/block/TileDirt01GrassPathEnd04.png b/Assets/image/environment/block/TileDirt01GrassPathEnd04.png deleted file mode 100644 index c57115b7..00000000 --- a/Assets/image/environment/block/TileDirt01GrassPathEnd04.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e3d7d71053ab3ef2f4009025c86859480df58eb25958b48e520c8a32d84c1648 -size 33823 diff --git a/Assets/image/environment/block/TileDirt01GrassPathSingle.png b/Assets/image/environment/block/TileDirt01GrassPathSingle.png deleted file mode 100644 index d3ddd113..00000000 --- a/Assets/image/environment/block/TileDirt01GrassPathSingle.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d43803c565b9116c9ec40a0a31315623e8494f573608ce65a0cc13240cb9a153 -size 34094 diff --git a/Assets/image/environment/block/TileDirt01GrassPathStraight01.png b/Assets/image/environment/block/TileDirt01GrassPathStraight01.png deleted file mode 100644 index fac97321..00000000 --- a/Assets/image/environment/block/TileDirt01GrassPathStraight01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:06fee094b30eafff910e1b0eb7c5c75018cd5f98f3914d40ef88b3afb372c2e5 -size 33357 diff --git a/Assets/image/environment/block/TileDirt01GrassPathStraight02.png b/Assets/image/environment/block/TileDirt01GrassPathStraight02.png deleted file mode 100644 index e705984e..00000000 --- a/Assets/image/environment/block/TileDirt01GrassPathStraight02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ff8fed8bb38a5bdc619feb84779843d92693d747c2f648d7ad804d38a8c26ec7 -size 33366 diff --git a/Assets/image/environment/block/TileDirt01ToSnow01.png b/Assets/image/environment/block/TileDirt01ToSnow01.png deleted file mode 100644 index 7492b70f..00000000 --- a/Assets/image/environment/block/TileDirt01ToSnow01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f93cfc51d8a9c42d95fb073519122c1d0ae9f02682831bff8a4d94eabbf2ce4a -size 39283 diff --git a/Assets/image/environment/block/TileDirt01ToSnow02.png b/Assets/image/environment/block/TileDirt01ToSnow02.png deleted file mode 100644 index 61efe6ea..00000000 --- a/Assets/image/environment/block/TileDirt01ToSnow02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e8b52e1a09d55fd529b4e4e841115eb83178082e52f2b98b3857c6ef99e437f5 -size 41302 diff --git a/Assets/image/environment/block/TileDirt01ToStone01.png b/Assets/image/environment/block/TileDirt01ToStone01.png deleted file mode 100644 index 6d611f57..00000000 --- a/Assets/image/environment/block/TileDirt01ToStone01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ba3ae7b852a8b59c93908ca4b32357ddfb83a4cd8d313111a0cabf6fb4432a2e -size 35902 diff --git a/Assets/image/environment/block/TileDirt01ToStone02.png b/Assets/image/environment/block/TileDirt01ToStone02.png deleted file mode 100644 index 13929f2b..00000000 --- a/Assets/image/environment/block/TileDirt01ToStone02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:98652eea4dcd07731c51d7e32805fbaec19254a9dc5b0c90195e36f2b81e1b9d -size 38904 diff --git a/Assets/image/environment/block/TileDirt02.png b/Assets/image/environment/block/TileDirt02.png deleted file mode 100644 index ab85c5d9..00000000 --- a/Assets/image/environment/block/TileDirt02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2940f9131fecc51df9f5bcd7e26f3d5f7bf2a2319de98d02d6f5c50d130fd051 -size 23230 diff --git a/Assets/image/environment/block/TileDirt02ToStone01.png b/Assets/image/environment/block/TileDirt02ToStone01.png deleted file mode 100644 index d7bc52a8..00000000 --- a/Assets/image/environment/block/TileDirt02ToStone01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:989ae97b86f6920ee59a3dfac7b209a74f1e17332354b1f800f63086fd156926 -size 38336 diff --git a/Assets/image/environment/block/TileDirt02ToStone02.png b/Assets/image/environment/block/TileDirt02ToStone02.png deleted file mode 100644 index defe5749..00000000 --- a/Assets/image/environment/block/TileDirt02ToStone02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0d5831597e5d2541199c5184a7796ebd45aa1894aa3da5f170214f8dd81c8774 -size 33010 diff --git a/Assets/image/environment/block/TileLava01.png b/Assets/image/environment/block/TileLava01.png deleted file mode 100644 index a9a54321..00000000 --- a/Assets/image/environment/block/TileLava01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2df73302b0c30128ea4f17ff6dd02db6074a608ec66159a42a5894b43d1efa5f -size 24905 diff --git a/Assets/image/environment/block/TileLava02.png b/Assets/image/environment/block/TileLava02.png deleted file mode 100644 index 3df71884..00000000 --- a/Assets/image/environment/block/TileLava02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fd7f351234eb880112df88b302c8b78d5e4613a06dff79f94ac43a4efba0616e -size 36224 diff --git a/Assets/image/environment/block/TileLavaCracks01.png b/Assets/image/environment/block/TileLavaCracks01.png deleted file mode 100644 index 333f4fc3..00000000 --- a/Assets/image/environment/block/TileLavaCracks01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b8d3acb4b2f61c368d37b9dd39cb9f843b7983e8cdd959c500d73bdcc018bcb4 -size 36212 diff --git a/Assets/image/environment/block/TileLavaStone01.png b/Assets/image/environment/block/TileLavaStone01.png deleted file mode 100644 index 5dd0f568..00000000 --- a/Assets/image/environment/block/TileLavaStone01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ea6f479009b2c190e11d21e3318e230fff63cfcce5e1e8894d3c2dbc6ed66dd6 -size 25409 diff --git a/Assets/image/environment/block/TileRiverbed01.png b/Assets/image/environment/block/TileRiverbed01.png deleted file mode 100644 index 75b5cfe6..00000000 --- a/Assets/image/environment/block/TileRiverbed01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:181e54dc37694a0e736bcde87ece20b9f7720d94f421112d7fe7d195cf02aa04 -size 37303 diff --git a/Assets/image/environment/block/TileRiverbed02.png b/Assets/image/environment/block/TileRiverbed02.png deleted file mode 100644 index 4545c663..00000000 --- a/Assets/image/environment/block/TileRiverbed02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c6c8b7b39ed17acbb480719fd822707906c2eb9cae0f5fa7436de652cde1c366 -size 35751 diff --git a/Assets/image/environment/block/TileRiverbed03.png b/Assets/image/environment/block/TileRiverbed03.png deleted file mode 100644 index 0c2c4766..00000000 --- a/Assets/image/environment/block/TileRiverbed03.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:889c5eec0b4273c4955904870c2c794a229990ee861d8629fb239e9ff58048ea -size 39395 diff --git a/Assets/image/environment/block/TileRiverbed04.png b/Assets/image/environment/block/TileRiverbed04.png deleted file mode 100644 index 8838722a..00000000 --- a/Assets/image/environment/block/TileRiverbed04.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9eb40fb124440d1e71e67ae9f7b70cacdc77489601597a276c8d5d0fe267c697 -size 38361 diff --git a/Assets/image/environment/block/TileSand01.png b/Assets/image/environment/block/TileSand01.png deleted file mode 100644 index 90c65139..00000000 --- a/Assets/image/environment/block/TileSand01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5b1985914e59f1b4a3cc9d80be4efa3af712415b90f157a873c9bd3833ad96fc -size 28351 diff --git a/Assets/image/environment/block/TileSand01ToStone01.png b/Assets/image/environment/block/TileSand01ToStone01.png deleted file mode 100644 index 1ee34a46..00000000 --- a/Assets/image/environment/block/TileSand01ToStone01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b66187ac8f1f22a36e875dc13b6bef39e1f014cb16770256003d00d08844c3a0 -size 42459 diff --git a/Assets/image/environment/block/TileSand01ToStone02.png b/Assets/image/environment/block/TileSand01ToStone02.png deleted file mode 100644 index 4597e43c..00000000 --- a/Assets/image/environment/block/TileSand01ToStone02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3d15a42c50610aa2669f77e37432a493055c72c9040b329babaae7ae267d32ac -size 37936 diff --git a/Assets/image/environment/block/TileSand02.png b/Assets/image/environment/block/TileSand02.png deleted file mode 100644 index 5655b75c..00000000 --- a/Assets/image/environment/block/TileSand02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:395c6f42abb959c9dd2a54335a94ac1e44eb5ea62f73111c7f9fe1cd54496e7b -size 27489 diff --git a/Assets/image/environment/block/TileSand02ToStone01.png b/Assets/image/environment/block/TileSand02ToStone01.png deleted file mode 100644 index d44ffbfd..00000000 --- a/Assets/image/environment/block/TileSand02ToStone01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:323ff5ac66b498827f9fbc684787a00c433a81a4bdddbd7da15d090ac006d4cc -size 40118 diff --git a/Assets/image/environment/block/TileSand02ToStone02.png b/Assets/image/environment/block/TileSand02ToStone02.png deleted file mode 100644 index fdc7942f..00000000 --- a/Assets/image/environment/block/TileSand02ToStone02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c2ad644076df2fd71b89aa77a8e096cec66f55b63de5cdebcbaaa40544216712 -size 35950 diff --git a/Assets/image/environment/block/TileSand03.png b/Assets/image/environment/block/TileSand03.png deleted file mode 100644 index 879244c1..00000000 --- a/Assets/image/environment/block/TileSand03.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:209f3b5bbcd9623352dcb652d36f67b04f8e25f492ccc3d41804782345ddbb96 -size 25958 diff --git a/Assets/image/environment/block/TileSand03ToStone01.png b/Assets/image/environment/block/TileSand03ToStone01.png deleted file mode 100644 index 4719220d..00000000 --- a/Assets/image/environment/block/TileSand03ToStone01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6154955fb4904de3e6a98348874a3a90cd21e3a93ef399db13addd555066d761 -size 39195 diff --git a/Assets/image/environment/block/TileSand03ToStone02.png b/Assets/image/environment/block/TileSand03ToStone02.png deleted file mode 100644 index d8e05100..00000000 --- a/Assets/image/environment/block/TileSand03ToStone02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ee2711d5fe007e665aaa9393fb84a10137fc6e03d21ee3e2e6b55317e5e7b8a0 -size 34538 diff --git a/Assets/image/environment/block/TileSand04.png b/Assets/image/environment/block/TileSand04.png deleted file mode 100644 index dfd93239..00000000 --- a/Assets/image/environment/block/TileSand04.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f58438c06d13bc7723c1f961d5123438a0d9a0f10d292e18f8cb900e74d05f33 -size 35226 diff --git a/Assets/image/environment/block/TileSnow01.png b/Assets/image/environment/block/TileSnow01.png deleted file mode 100644 index 812ec324..00000000 --- a/Assets/image/environment/block/TileSnow01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3a7474e1abd2444d305e6ac79d9d75cb1eb28b5588a45712fbca808c0ea11ffa -size 21031 diff --git a/Assets/image/environment/block/TileSnow01ToStone01.png b/Assets/image/environment/block/TileSnow01ToStone01.png deleted file mode 100644 index 4e593ef8..00000000 --- a/Assets/image/environment/block/TileSnow01ToStone01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:657f83d04d23cdac5a48429db63b735ce15ddda7d6b0148d2f5701ebdd7429d3 -size 44752 diff --git a/Assets/image/environment/block/TileSnow01ToStone02.png b/Assets/image/environment/block/TileSnow01ToStone02.png deleted file mode 100644 index 9e5062e3..00000000 --- a/Assets/image/environment/block/TileSnow01ToStone02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bdc72fe0ad7f98c299c5fedaf42d36489aa2f9d8b69629135cf85876c4db1863 -size 37347 diff --git a/Assets/image/environment/block/TileSnow02.png b/Assets/image/environment/block/TileSnow02.png deleted file mode 100644 index 4c2e9a3b..00000000 --- a/Assets/image/environment/block/TileSnow02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2703b6b9c6db7185ce2a100bd44cea49da7999580a73f3d80b73d4e45cc7beca -size 27367 diff --git a/Assets/image/environment/block/TileSnow02ToStone01.png b/Assets/image/environment/block/TileSnow02ToStone01.png deleted file mode 100644 index 5996230c..00000000 --- a/Assets/image/environment/block/TileSnow02ToStone01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d103b1f0ac1de22e8f47067610efcf37d897a222148532b9814c52548e119d5d -size 44482 diff --git a/Assets/image/environment/block/TileSnow02ToStone02.png b/Assets/image/environment/block/TileSnow02ToStone02.png deleted file mode 100644 index adc1dfd3..00000000 --- a/Assets/image/environment/block/TileSnow02ToStone02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1a9aee7b843456dfa14a2518b3fdc9e3391cf321a2ed31c923593d180030dd8f -size 39984 diff --git a/Assets/image/environment/block/TileStone01.png b/Assets/image/environment/block/TileStone01.png deleted file mode 100644 index f3280517..00000000 --- a/Assets/image/environment/block/TileStone01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4c3710e49fdfeba08cc06f20d6f16bb5681d7b03ef8212c599a1a660afb14882 -size 39278 diff --git a/Assets/image/environment/block/TileStone02.png b/Assets/image/environment/block/TileStone02.png deleted file mode 100644 index cd20332e..00000000 --- a/Assets/image/environment/block/TileStone02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2cfb165142c8f92e2992c08621fa54674ce16d8d74368d9cc537c0cabde9f975 -size 34106 diff --git a/Assets/image/environment/block/TileStone03.png b/Assets/image/environment/block/TileStone03.png deleted file mode 100644 index 0be79903..00000000 --- a/Assets/image/environment/block/TileStone03.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8c12a59e55b82779e8685fb49f407416c2ada40d53744b7219400d60e3192abb -size 37484 diff --git a/Assets/image/environment/block/TileTemplate01.png b/Assets/image/environment/block/TileTemplate01.png deleted file mode 100644 index fd4cbae5..00000000 --- a/Assets/image/environment/block/TileTemplate01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e001b6ac723bc6cc84c89b9d0123ac890cf1528a7649136988db0be71f321db0 -size 1564 diff --git a/Assets/image/environment/block/TileWater01.png b/Assets/image/environment/block/TileWater01.png deleted file mode 100644 index 30dec8a1..00000000 --- a/Assets/image/environment/block/TileWater01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8459b37b8577ba3042d65bfb9ddd260d2da1a2b3574da379b7bdebf1af161102 -size 13479 diff --git a/Assets/image/environment/block/TileWaterBlock.png b/Assets/image/environment/block/TileWaterBlock.png deleted file mode 100644 index 30dec8a1..00000000 --- a/Assets/image/environment/block/TileWaterBlock.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8459b37b8577ba3042d65bfb9ddd260d2da1a2b3574da379b7bdebf1af161102 -size 13479 diff --git a/Assets/image/environment/block/TileWaterShore1C01.png b/Assets/image/environment/block/TileWaterShore1C01.png deleted file mode 100644 index 3581ba57..00000000 --- a/Assets/image/environment/block/TileWaterShore1C01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6f8d0fe791f4a0a1e8fe7379430aeeb2ef4a7cbaf7a7f013ee6cc5f41f358ea3 -size 13654 diff --git a/Assets/image/environment/block/TileWaterShore1C02.png b/Assets/image/environment/block/TileWaterShore1C02.png deleted file mode 100644 index 2c098f78..00000000 --- a/Assets/image/environment/block/TileWaterShore1C02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f67cca01d2b36b5db932faace814f9fc8429e0a3bace5f33d887f8a1cf9184a9 -size 13565 diff --git a/Assets/image/environment/block/TileWaterShore1C03.png b/Assets/image/environment/block/TileWaterShore1C03.png deleted file mode 100644 index 44db85fe..00000000 --- a/Assets/image/environment/block/TileWaterShore1C03.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:786d7e0b2b937775f60d29b7f4cf12e0eaeedd2e1307b8aea98a50ee9712b699 -size 13599 diff --git a/Assets/image/environment/block/TileWaterShore1C04.png b/Assets/image/environment/block/TileWaterShore1C04.png deleted file mode 100644 index 68f48ff3..00000000 --- a/Assets/image/environment/block/TileWaterShore1C04.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:80c3fcbfd99a497c55d5c3d6eb54c2ee1f78e2956b05ea895b8d86611594ae0c -size 13523 diff --git a/Assets/image/environment/block/TileWaterShore1S01.png b/Assets/image/environment/block/TileWaterShore1S01.png deleted file mode 100644 index 7b52d8cc..00000000 --- a/Assets/image/environment/block/TileWaterShore1S01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:045f52d7a94912e65d52a72c869d836829a4e14261e842e3c043c6eef2e00804 -size 13852 diff --git a/Assets/image/environment/block/TileWaterShore1S02.png b/Assets/image/environment/block/TileWaterShore1S02.png deleted file mode 100644 index fe78412b..00000000 --- a/Assets/image/environment/block/TileWaterShore1S02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a1eed4e55f7294ed88b94360355e2c434bf8e557378df72c326e13a7ac1e902e -size 13657 diff --git a/Assets/image/environment/block/TileWaterShore1S03.png b/Assets/image/environment/block/TileWaterShore1S03.png deleted file mode 100644 index f9059090..00000000 --- a/Assets/image/environment/block/TileWaterShore1S03.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:06b60e4d8c64aca6b1f4cc20dd985c7e5c6be0d61c1b2751ccf85d388110d765 -size 13759 diff --git a/Assets/image/environment/block/TileWaterShore1S04.png b/Assets/image/environment/block/TileWaterShore1S04.png deleted file mode 100644 index 29324ac0..00000000 --- a/Assets/image/environment/block/TileWaterShore1S04.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e6eacedc65af0ac26cfaa73ad61cc86f62c4ce74b6a360c2328c1c53b95bc69a -size 13938 diff --git a/Assets/image/environment/block/TileWaterShore1S1C01.png b/Assets/image/environment/block/TileWaterShore1S1C01.png deleted file mode 100644 index ea0d2005..00000000 --- a/Assets/image/environment/block/TileWaterShore1S1C01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6e710a0c8883938ab350ff16335f50380c12fd8e48d91085f3ffca99a2086dbc -size 13599 diff --git a/Assets/image/environment/block/TileWaterShore1S1C02.png b/Assets/image/environment/block/TileWaterShore1S1C02.png deleted file mode 100644 index 9ee25f22..00000000 --- a/Assets/image/environment/block/TileWaterShore1S1C02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eac4fd3c97b129eb5293d356e8c094b5ccc8523b2905eacd955fa5a8849e3296 -size 13788 diff --git a/Assets/image/environment/block/TileWaterShore1S1C03.png b/Assets/image/environment/block/TileWaterShore1S1C03.png deleted file mode 100644 index 0df3ac81..00000000 --- a/Assets/image/environment/block/TileWaterShore1S1C03.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:86709ded8267836b77d235e829e9e634677f9544052f81e742cb24a040c7c7ad -size 13967 diff --git a/Assets/image/environment/block/TileWaterShore1S1C04.png b/Assets/image/environment/block/TileWaterShore1S1C04.png deleted file mode 100644 index e29c1f2d..00000000 --- a/Assets/image/environment/block/TileWaterShore1S1C04.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:454e1cab28be8148d4f4adef1f0d5929714e4823453f327915c6ea168dbe19b7 -size 13885 diff --git a/Assets/image/environment/block/TileWaterShore1S1C05.png b/Assets/image/environment/block/TileWaterShore1S1C05.png deleted file mode 100644 index a7a5e978..00000000 --- a/Assets/image/environment/block/TileWaterShore1S1C05.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:af73a31efc7e897c3c4ece92b3bcf8ab6cb6994aba6b9385ad8db37d26ddc544 -size 13766 diff --git a/Assets/image/environment/block/TileWaterShore1S1C06.png b/Assets/image/environment/block/TileWaterShore1S1C06.png deleted file mode 100644 index f85aad0b..00000000 --- a/Assets/image/environment/block/TileWaterShore1S1C06.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:455a1702a5f9333035c3bac38e91cc7d815e9b38f603ec1842c8e0a3865cc7e3 -size 13878 diff --git a/Assets/image/environment/block/TileWaterShore1S1C07.png b/Assets/image/environment/block/TileWaterShore1S1C07.png deleted file mode 100644 index 0a9a42ef..00000000 --- a/Assets/image/environment/block/TileWaterShore1S1C07.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fce7610ec201f886f69026eb447908d3342f38b96fee462071497cfc2bf1a119 -size 13949 diff --git a/Assets/image/environment/block/TileWaterShore1S1C08.png b/Assets/image/environment/block/TileWaterShore1S1C08.png deleted file mode 100644 index c4df6382..00000000 --- a/Assets/image/environment/block/TileWaterShore1S1C08.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f30b5b079bdb6a5e9060925578c5705bc29d8dd63b2ec212ceb94473842e49cc -size 13956 diff --git a/Assets/image/environment/block/TileWaterShore1S2C01.png b/Assets/image/environment/block/TileWaterShore1S2C01.png deleted file mode 100644 index bad07a81..00000000 --- a/Assets/image/environment/block/TileWaterShore1S2C01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:491cc96f41fb846505f3fb4677c6700641494e9b8c94f2b4d4339e7cae2fedc6 -size 13721 diff --git a/Assets/image/environment/block/TileWaterShore1S2C02.png b/Assets/image/environment/block/TileWaterShore1S2C02.png deleted file mode 100644 index 40d04407..00000000 --- a/Assets/image/environment/block/TileWaterShore1S2C02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:49f09a977326f8e0b97af26e3f14a6755f49a52b6bf4f3430f91263ad1be0fda -size 13988 diff --git a/Assets/image/environment/block/TileWaterShore1S2C03.png b/Assets/image/environment/block/TileWaterShore1S2C03.png deleted file mode 100644 index 21307e95..00000000 --- a/Assets/image/environment/block/TileWaterShore1S2C03.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4c5ba42c6af4c63702f011833e0195fabd900cc841035d15e5dcc4e401f96c83 -size 13902 diff --git a/Assets/image/environment/block/TileWaterShore1S2C04.png b/Assets/image/environment/block/TileWaterShore1S2C04.png deleted file mode 100644 index 2e21148b..00000000 --- a/Assets/image/environment/block/TileWaterShore1S2C04.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3b81e31f78de97a466cf0683178497c6a7bdb6c7e8406ec27039e53a52db2ab1 -size 13965 diff --git a/Assets/image/environment/block/TileWaterShore2C01.png b/Assets/image/environment/block/TileWaterShore2C01.png deleted file mode 100644 index 1f69f8c1..00000000 --- a/Assets/image/environment/block/TileWaterShore2C01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7963474ad62c7faaa8c00e64befb1265fbfa8545396acdc0abdaec4c33878205 -size 13751 diff --git a/Assets/image/environment/block/TileWaterShore2C02.png b/Assets/image/environment/block/TileWaterShore2C02.png deleted file mode 100644 index 44c135ef..00000000 --- a/Assets/image/environment/block/TileWaterShore2C02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:81811c1a245c7354d38de5c7e27d314035eb56b62493a535fd0c72f153b62981 -size 13611 diff --git a/Assets/image/environment/block/TileWaterShore2C03.png b/Assets/image/environment/block/TileWaterShore2C03.png deleted file mode 100644 index c9cceea7..00000000 --- a/Assets/image/environment/block/TileWaterShore2C03.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:138209b75332c77ead21da13b2157d6de451865753085d2ccdd512e600997e8e -size 13696 diff --git a/Assets/image/environment/block/TileWaterShore2C04.png b/Assets/image/environment/block/TileWaterShore2C04.png deleted file mode 100644 index 05a8e662..00000000 --- a/Assets/image/environment/block/TileWaterShore2C04.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:11b52fa8afc0202e15e18b06419866a07e94892b78a17db0beef2bff96062637 -size 13632 diff --git a/Assets/image/environment/block/TileWaterShore2C05.png b/Assets/image/environment/block/TileWaterShore2C05.png deleted file mode 100644 index 4bb9da0d..00000000 --- a/Assets/image/environment/block/TileWaterShore2C05.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4e99d615a7ec88e2946537b567aa8827756759ff121bc95a23b8f57a38662ec9 -size 13631 diff --git a/Assets/image/environment/block/TileWaterShore2C06.png b/Assets/image/environment/block/TileWaterShore2C06.png deleted file mode 100644 index fb0729ef..00000000 --- a/Assets/image/environment/block/TileWaterShore2C06.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:413ead8ceeaaa0d4785f855b8252beb5655c603fa25b2b0b80dda5966acea319 -size 13727 diff --git a/Assets/image/environment/block/TileWaterShore2S01.png b/Assets/image/environment/block/TileWaterShore2S01.png deleted file mode 100644 index 1adb217e..00000000 --- a/Assets/image/environment/block/TileWaterShore2S01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3d0f2bb83754dbff464dc0788dc8a60d1c23658f8631d0db978d8c804d95290c -size 13926 diff --git a/Assets/image/environment/block/TileWaterShore2S02.png b/Assets/image/environment/block/TileWaterShore2S02.png deleted file mode 100644 index b54deede..00000000 --- a/Assets/image/environment/block/TileWaterShore2S02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f66ac49302709a42d3bb7fc66adf967e9d84d5a7e07f216b9a574b28083f76d9 -size 13998 diff --git a/Assets/image/environment/block/TileWaterShore2S03.png b/Assets/image/environment/block/TileWaterShore2S03.png deleted file mode 100644 index 6f39cbb2..00000000 --- a/Assets/image/environment/block/TileWaterShore2S03.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:07e847c49950eda4c4553fd8a1c2e97d77aa81e5f64a510a978dd831f8f5f79a -size 13936 diff --git a/Assets/image/environment/block/TileWaterShore2S04.png b/Assets/image/environment/block/TileWaterShore2S04.png deleted file mode 100644 index 2b85b193..00000000 --- a/Assets/image/environment/block/TileWaterShore2S04.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2238ede60f401236dcdfb2e80c89323d63f29c4470c0870847d590b5062a828f -size 13475 diff --git a/Assets/image/environment/block/TileWaterShore2S05.png b/Assets/image/environment/block/TileWaterShore2S05.png deleted file mode 100644 index 890315fc..00000000 --- a/Assets/image/environment/block/TileWaterShore2S05.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:840f1049e6c0bb3dc2c0a7cecddb4b6b81ab3652b43b375863fb2f5ae8cd829c -size 13724 diff --git a/Assets/image/environment/block/TileWaterShore2S06.png b/Assets/image/environment/block/TileWaterShore2S06.png deleted file mode 100644 index 5d131ab7..00000000 --- a/Assets/image/environment/block/TileWaterShore2S06.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:67f615e2f1eae24f5e9ab5701f83fcd39c97125bb2f7bd87047e109c58b230aa -size 13980 diff --git a/Assets/image/environment/block/TileWaterShore2S1C01.png b/Assets/image/environment/block/TileWaterShore2S1C01.png deleted file mode 100644 index 76b89f8b..00000000 --- a/Assets/image/environment/block/TileWaterShore2S1C01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:00cc8c598bea35f0802416d8b85be7af21a0bf8646a77211be79bb6865bd61e6 -size 14011 diff --git a/Assets/image/environment/block/TileWaterShore2S1C02.png b/Assets/image/environment/block/TileWaterShore2S1C02.png deleted file mode 100644 index edb9be7c..00000000 --- a/Assets/image/environment/block/TileWaterShore2S1C02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8c9482e4b176f9d41b7ab87d0ffb6fecdfe6714a65d896e1b46ca6e34c39a8f3 -size 13980 diff --git a/Assets/image/environment/block/TileWaterShore2S1C03.png b/Assets/image/environment/block/TileWaterShore2S1C03.png deleted file mode 100644 index a503e6e5..00000000 --- a/Assets/image/environment/block/TileWaterShore2S1C03.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c305d5a8a735ae76358aef615f12cb5001b04935799b260555a27e9823066917 -size 13603 diff --git a/Assets/image/environment/block/TileWaterShore2S1C04.png b/Assets/image/environment/block/TileWaterShore2S1C04.png deleted file mode 100644 index 49dbbe96..00000000 --- a/Assets/image/environment/block/TileWaterShore2S1C04.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0bb2ea5b6b61d631d8a97de14f67a7502b6b5eb2dcd2768de7e1bab330855807 -size 13876 diff --git a/Assets/image/environment/block/TileWaterShore3C01.png b/Assets/image/environment/block/TileWaterShore3C01.png deleted file mode 100644 index b68382a3..00000000 --- a/Assets/image/environment/block/TileWaterShore3C01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ac1f633a82ea903d62ea3df5a45a3a08d6e6f242af1a08de6d233ecad5b2e2df -size 13779 diff --git a/Assets/image/environment/block/TileWaterShore3C02.png b/Assets/image/environment/block/TileWaterShore3C02.png deleted file mode 100644 index e5679d7b..00000000 --- a/Assets/image/environment/block/TileWaterShore3C02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5a15ba3e0ddc46a809049450bc1aadc53f8e03c2df866f617fc7779ff9a0489e -size 13770 diff --git a/Assets/image/environment/block/TileWaterShore3C03.png b/Assets/image/environment/block/TileWaterShore3C03.png deleted file mode 100644 index 6385d6ee..00000000 --- a/Assets/image/environment/block/TileWaterShore3C03.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:945cdd6e3fd84ce702146a61f1e1651171a8df82908d20f372259135014218dc -size 13784 diff --git a/Assets/image/environment/block/TileWaterShore3C04.png b/Assets/image/environment/block/TileWaterShore3C04.png deleted file mode 100644 index a06c0d79..00000000 --- a/Assets/image/environment/block/TileWaterShore3C04.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ad196c27e50c10bd3390d29cecc30c8ddd042ae7e0ca41b7a1dcc340a4ce04d8 -size 13671 diff --git a/Assets/image/environment/block/TileWaterShore3S01.png b/Assets/image/environment/block/TileWaterShore3S01.png deleted file mode 100644 index f41f9ff8..00000000 --- a/Assets/image/environment/block/TileWaterShore3S01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e0bb5740433fe6796ba1d0fd5599ee19cdd9ba2611919673293b5a090ca14554 -size 14049 diff --git a/Assets/image/environment/block/TileWaterShore3S02.png b/Assets/image/environment/block/TileWaterShore3S02.png deleted file mode 100644 index 978ca420..00000000 --- a/Assets/image/environment/block/TileWaterShore3S02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b87c65e06a709d1de73a4fe82ebce85a4088a838801975d12fd8e2db7af927c5 -size 13763 diff --git a/Assets/image/environment/block/TileWaterShore3S03.png b/Assets/image/environment/block/TileWaterShore3S03.png deleted file mode 100644 index 9da7f858..00000000 --- a/Assets/image/environment/block/TileWaterShore3S03.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3d091a9939c4cfa12b1e0f64b3f38ecaa672f59c3d6b6acca1c7f5bb7442256c -size 13916 diff --git a/Assets/image/environment/block/TileWaterShore3S04.png b/Assets/image/environment/block/TileWaterShore3S04.png deleted file mode 100644 index 6fe46f18..00000000 --- a/Assets/image/environment/block/TileWaterShore3S04.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8f31778f21eeb4f36b41e694b8ed803b55ee30065780631c97126c3c9d0cc3cb -size 13627 diff --git a/Assets/image/environment/block/TileWaterShore4C01.png b/Assets/image/environment/block/TileWaterShore4C01.png deleted file mode 100644 index c895815a..00000000 --- a/Assets/image/environment/block/TileWaterShore4C01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:68aa7c80243aa209dcf6e879217dd85cff968921327ed9b7123d365a94676952 -size 13814 diff --git a/Assets/image/environment/block/TileWaterShore4S04.png b/Assets/image/environment/block/TileWaterShore4S04.png deleted file mode 100644 index c63adda1..00000000 --- a/Assets/image/environment/block/TileWaterShore4S04.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:73617ae9abd3453123e06697be909fb730430836a6e93d25fdee07aa5e1d2175 -size 13816 diff --git a/Assets/image/environment/block/TileWood01.png b/Assets/image/environment/block/TileWood01.png deleted file mode 100644 index e8e91475..00000000 --- a/Assets/image/environment/block/TileWood01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7e58e7894b1fc1d27ee3e0d2531660017c45f2053897a4ac2c5b448663bd2741 -size 33326 diff --git a/Assets/image/environment/block/TileWood02.png b/Assets/image/environment/block/TileWood02.png deleted file mode 100644 index 2cd65de8..00000000 --- a/Assets/image/environment/block/TileWood02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c8968672d51ac849f08401f1e4a958128e43956ab4c9c5385811ec94db724c3a -size 31031 diff --git a/Assets/image/environment/block/TileWood03.png b/Assets/image/environment/block/TileWood03.png deleted file mode 100644 index e77844ee..00000000 --- a/Assets/image/environment/block/TileWood03.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:30ad9d51b3856a83fe0fe70a7ad23b77c34a16598dd91270e46e18cb8c2bc5fa -size 32915 diff --git a/Assets/image/environment/block/TileWood04.png b/Assets/image/environment/block/TileWood04.png deleted file mode 100644 index 4967c5d6..00000000 --- a/Assets/image/environment/block/TileWood04.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d12c2f069f273ad5b25f09a6e25f226e51c5ebda341b87729ad7660e876d6f7f -size 26865 diff --git a/Assets/image/environment/decoration/Desert_big_cactus_02.png b/Assets/image/environment/decoration/Desert_big_cactus_02.png deleted file mode 100644 index 2a079cd3..00000000 --- a/Assets/image/environment/decoration/Desert_big_cactus_02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d497912d65fbffacd18d01a1b7709e67360a942f2e8fbc662a78c7f0a5b646c8 -size 23431 diff --git a/Assets/image/environment/decoration/Desert_big_cactus_03.png b/Assets/image/environment/decoration/Desert_big_cactus_03.png deleted file mode 100644 index 06a36ee0..00000000 --- a/Assets/image/environment/decoration/Desert_big_cactus_03.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4db6accbe4b655a6b0177ce42d5295e4bfb0c35f554b040467e85e183c05e69e -size 27868 diff --git a/Assets/image/environment/decoration/Desert_big_cactus_04.png b/Assets/image/environment/decoration/Desert_big_cactus_04.png deleted file mode 100644 index 5597426d..00000000 --- a/Assets/image/environment/decoration/Desert_big_cactus_04.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:43e7c47114ee212919509b3394deb4a3807c7c35883c4fb54e80b42f2bbc14d6 -size 32149 diff --git a/Assets/image/environment/decoration/Desert_big_flower_01.png b/Assets/image/environment/decoration/Desert_big_flower_01.png deleted file mode 100644 index b3a7da82..00000000 --- a/Assets/image/environment/decoration/Desert_big_flower_01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5db1f0b89cc081dcfc129571da33c9881a421ca787786723e0c75470fab91d84 -size 28300 diff --git a/Assets/image/environment/decoration/Desert_small_Agave_Cactus_01.png b/Assets/image/environment/decoration/Desert_small_Agave_Cactus_01.png deleted file mode 100644 index 1fa0aa64..00000000 --- a/Assets/image/environment/decoration/Desert_small_Agave_Cactus_01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b1e02ac13187607a9a4e8e84a5131910bf22cc62fb43efe89a81e4c1f6a46180 -size 17480 diff --git a/Assets/image/environment/decoration/Desert_small_Agave_Cactus_02.png b/Assets/image/environment/decoration/Desert_small_Agave_Cactus_02.png deleted file mode 100644 index d59bdb66..00000000 --- a/Assets/image/environment/decoration/Desert_small_Agave_Cactus_02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:77305d6e0158374775f436be934278ad444985160a3e75f8db8c2bae92e7ca9a -size 19898 diff --git a/Assets/image/environment/decoration/Desert_small_Agave_Cactus_03.png b/Assets/image/environment/decoration/Desert_small_Agave_Cactus_03.png deleted file mode 100644 index 13ca9aff..00000000 --- a/Assets/image/environment/decoration/Desert_small_Agave_Cactus_03.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fcbef623e1511b12c383a948dfe6d5f7ae02ef9eaf9c6297e725252afe0170e6 -size 20627 diff --git a/Assets/image/environment/decoration/Desert_small_Agave_Cactus_04.png b/Assets/image/environment/decoration/Desert_small_Agave_Cactus_04.png deleted file mode 100644 index 604e58bf..00000000 --- a/Assets/image/environment/decoration/Desert_small_Agave_Cactus_04.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:859ea5e87a95526e037e62257fa5bda7100a1988f1f9059fc8bd860a5daa94ac -size 22127 diff --git a/Assets/image/environment/decoration/Desert_small_Bush_01.png b/Assets/image/environment/decoration/Desert_small_Bush_01.png deleted file mode 100644 index e8268c74..00000000 --- a/Assets/image/environment/decoration/Desert_small_Bush_01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0a6a4d7fe70d7c5dab4824d2bd498aadda650db9a17fb708d08460294bef1961 -size 24080 diff --git a/Assets/image/environment/decoration/Desert_small_Bush_02.png b/Assets/image/environment/decoration/Desert_small_Bush_02.png deleted file mode 100644 index 2a3f4cf0..00000000 --- a/Assets/image/environment/decoration/Desert_small_Bush_02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d330da07e8b709428be09bb5d5a07c647e02b4c2a39630e2d7a52494190f6e19 -size 19977 diff --git a/Assets/image/environment/decoration/Desert_small_Cactus_02.png b/Assets/image/environment/decoration/Desert_small_Cactus_02.png deleted file mode 100644 index d5a99dd9..00000000 --- a/Assets/image/environment/decoration/Desert_small_Cactus_02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aa37e1024ebbc05a6487485e449f1260a11a19ec9fafb29533128fe19729a030 -size 14168 diff --git a/Assets/image/environment/decoration/Desert_small_Cactus_03.png b/Assets/image/environment/decoration/Desert_small_Cactus_03.png deleted file mode 100644 index d841f1d3..00000000 --- a/Assets/image/environment/decoration/Desert_small_Cactus_03.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:029d29978fc72137a88963d84ade2bc9755884f707cd00fc03675d15781336c4 -size 15626 diff --git a/Assets/image/environment/decoration/Desert_small_Cactus_04.png b/Assets/image/environment/decoration/Desert_small_Cactus_04.png deleted file mode 100644 index c253dc82..00000000 --- a/Assets/image/environment/decoration/Desert_small_Cactus_04.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f6fc6915b0006f74db766125d02a621a90a524856111f66c8cfca360d0bba4cd -size 12075 diff --git a/Assets/image/environment/decoration/Desert_small_Cactus_05.png b/Assets/image/environment/decoration/Desert_small_Cactus_05.png deleted file mode 100644 index 87cf675c..00000000 --- a/Assets/image/environment/decoration/Desert_small_Cactus_05.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d618f7ee610f9004c593af1c2ed97c74e8f7752ef7257067dd2645d5a3ba4875 -size 8551 diff --git a/Assets/image/environment/decoration/Desert_small_Cactus_06.png b/Assets/image/environment/decoration/Desert_small_Cactus_06.png deleted file mode 100644 index 969ab296..00000000 --- a/Assets/image/environment/decoration/Desert_small_Cactus_06.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f59b33dd6cc55eccc9c754243365521a6b54c92059fef08867f87d27825fdc64 -size 20780 diff --git a/Assets/image/environment/decoration/Desert_small_Cactus_07.png b/Assets/image/environment/decoration/Desert_small_Cactus_07.png deleted file mode 100644 index 2c1ee65e..00000000 --- a/Assets/image/environment/decoration/Desert_small_Cactus_07.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a4af48d8b042345d4a6e959ebc7ef1c3f8c995d27bea4257189a6847712f8232 -size 9393 diff --git a/Assets/image/environment/decoration/Desert_small_Cactus_09.png b/Assets/image/environment/decoration/Desert_small_Cactus_09.png deleted file mode 100644 index aa0b8ffc..00000000 --- a/Assets/image/environment/decoration/Desert_small_Cactus_09.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dfaf364f7e971ca9fd42c4f9b42efbfe3bfc52174705cd016ae9cfa691414cf7 -size 22528 diff --git a/Assets/image/environment/decoration/Desert_small_Cactus_10.png b/Assets/image/environment/decoration/Desert_small_Cactus_10.png deleted file mode 100644 index 2c52d9a2..00000000 --- a/Assets/image/environment/decoration/Desert_small_Cactus_10.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1b2c839f7b26849d9fc3de1796fef68c0c3b35890e471325e21020aa96f1af3d -size 18472 diff --git a/Assets/image/environment/decoration/Desert_small_Cactus_11.png b/Assets/image/environment/decoration/Desert_small_Cactus_11.png deleted file mode 100644 index ac618a82..00000000 --- a/Assets/image/environment/decoration/Desert_small_Cactus_11.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ebbf620c4520e868ff7cb326acfdcaf460c4c40e236d1b8633d3bb91cb4c19e2 -size 16037 diff --git a/Assets/image/environment/decoration/Desert_small_Cactus_12.png b/Assets/image/environment/decoration/Desert_small_Cactus_12.png deleted file mode 100644 index 12733536..00000000 --- a/Assets/image/environment/decoration/Desert_small_Cactus_12.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:85cebffbafebf0069e1af60755b5aae15e501a0daa7b1258f3bc199ec0c467eb -size 17609 diff --git a/Assets/image/environment/decoration/Desert_small_Cactus_13.png b/Assets/image/environment/decoration/Desert_small_Cactus_13.png deleted file mode 100644 index defcb53f..00000000 --- a/Assets/image/environment/decoration/Desert_small_Cactus_13.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7ea33dc03057032e08cf651e58e0d13857a860a82ef4a32763398322f7ded4f5 -size 14027 diff --git a/Assets/image/environment/decoration/Desert_small_Cactus_14.png b/Assets/image/environment/decoration/Desert_small_Cactus_14.png deleted file mode 100644 index 6b82f017..00000000 --- a/Assets/image/environment/decoration/Desert_small_Cactus_14.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0ccdea8089d8960a252132395229d2570f6c94e3a01cd5182bc9c9ecc5f82aba -size 20515 diff --git a/Assets/image/environment/decoration/Desert_small_Cactus_15.png b/Assets/image/environment/decoration/Desert_small_Cactus_15.png deleted file mode 100644 index f8fd58c0..00000000 --- a/Assets/image/environment/decoration/Desert_small_Cactus_15.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c83fe5d069d4e8a8e9fe139614db93be293bfd716148b1070bc93594893f7277 -size 15543 diff --git a/Assets/image/environment/decoration/Desert_small_Flower_01.png b/Assets/image/environment/decoration/Desert_small_Flower_01.png deleted file mode 100644 index 65bc2f1f..00000000 --- a/Assets/image/environment/decoration/Desert_small_Flower_01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c1dcb263f0f227b88a5612b2e65c198760c236fba12664cc251cd938be479ce9 -size 9873 diff --git a/Assets/image/environment/decoration/Desert_small_Flower_02.png b/Assets/image/environment/decoration/Desert_small_Flower_02.png deleted file mode 100644 index 307d62f2..00000000 --- a/Assets/image/environment/decoration/Desert_small_Flower_02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6ef01572efc8bbc7f242c465ae2e0690a2393c0cff24fd5eb1235986cafca436 -size 9494 diff --git a/Assets/image/environment/decoration/Desert_small_Flower_03.png b/Assets/image/environment/decoration/Desert_small_Flower_03.png deleted file mode 100644 index 6836b9aa..00000000 --- a/Assets/image/environment/decoration/Desert_small_Flower_03.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d85f790f57a4a0f0c995fbe7e949c2e405bd7c85653240d551ea7b85dfb43b4c -size 7703 diff --git a/Assets/image/environment/decoration/Desert_small_Flower_04.png b/Assets/image/environment/decoration/Desert_small_Flower_04.png deleted file mode 100644 index ca0195ef..00000000 --- a/Assets/image/environment/decoration/Desert_small_Flower_04.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e644201c04ce7cdfff94514aafc5567a2d4e322ab07c3ba4f88985b36ce8e9f0 -size 3510 diff --git a/Assets/image/environment/decoration/Forest_big_cypress_01.png b/Assets/image/environment/decoration/Forest_big_cypress_01.png deleted file mode 100644 index 23ca7673..00000000 --- a/Assets/image/environment/decoration/Forest_big_cypress_01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0572471cc28f0a3db8a0d85f86d6db62ffe90c34a05525aa1482507d2c51ac64 -size 88128 diff --git a/Assets/image/environment/decoration/Forest_big_cypress_02.png b/Assets/image/environment/decoration/Forest_big_cypress_02.png deleted file mode 100644 index e9b878ea..00000000 --- a/Assets/image/environment/decoration/Forest_big_cypress_02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:13907808c35d097851fb2c200f7c4fdf59562b49274af1c7d330a9f5743c742a -size 133921 diff --git a/Assets/image/environment/decoration/Forest_big_cypress_03.png b/Assets/image/environment/decoration/Forest_big_cypress_03.png deleted file mode 100644 index ee7e7848..00000000 --- a/Assets/image/environment/decoration/Forest_big_cypress_03.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c82f3cf4c5cab9ab687499a072f17bff393ba32d5f39061e38319255eb2c29ff -size 91938 diff --git a/Assets/image/environment/decoration/Forest_big_stone_01.png b/Assets/image/environment/decoration/Forest_big_stone_01.png deleted file mode 100644 index 5393981b..00000000 --- a/Assets/image/environment/decoration/Forest_big_stone_01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:df685e799d7818dc77ee8eec77518cacd052dc71a41134a02546972e871b5c23 -size 70805 diff --git a/Assets/image/environment/decoration/Forest_big_stone_02.png b/Assets/image/environment/decoration/Forest_big_stone_02.png deleted file mode 100644 index 079fde29..00000000 --- a/Assets/image/environment/decoration/Forest_big_stone_02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b0661a249d882f6a4007d245fe4010468449c1f9784b52f1d309d462fc7f338a -size 101300 diff --git a/Assets/image/environment/decoration/Forest_big_tree_leaf_01.png b/Assets/image/environment/decoration/Forest_big_tree_leaf_01.png deleted file mode 100644 index 90d33d7f..00000000 --- a/Assets/image/environment/decoration/Forest_big_tree_leaf_01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:670e83d7fdc71aad74a88ef200a6905f80ed00affcd4ea93fd4da2636271ac25 -size 291794 diff --git a/Assets/image/environment/decoration/Forest_big_tree_needle_03.png b/Assets/image/environment/decoration/Forest_big_tree_needle_03.png deleted file mode 100644 index b630d393..00000000 --- a/Assets/image/environment/decoration/Forest_big_tree_needle_03.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aeef2500af5b728787d1105a6fe713d209fb942e4ee7d627564ea1edcc86daaa -size 226441 diff --git a/Assets/image/environment/decoration/Forest_big_tree_needle_04.png b/Assets/image/environment/decoration/Forest_big_tree_needle_04.png deleted file mode 100644 index 20632959..00000000 --- a/Assets/image/environment/decoration/Forest_big_tree_needle_04.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5cb0a4de592980b6a5dca643363df1ef59423c187911409445db884fa0769ff2 -size 185550 diff --git a/Assets/image/environment/decoration/Forest_deadBush3.png b/Assets/image/environment/decoration/Forest_deadBush3.png deleted file mode 100644 index bebbf841..00000000 --- a/Assets/image/environment/decoration/Forest_deadBush3.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6551bc4b8a41be8f7a3ba8072a75cee362fd72fa0b57a53a6236ed71f8a3782e -size 22773 diff --git a/Assets/image/environment/decoration/Forest_deadTree1.png b/Assets/image/environment/decoration/Forest_deadTree1.png deleted file mode 100644 index 7cdeca60..00000000 --- a/Assets/image/environment/decoration/Forest_deadTree1.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ea1e59504a9ec23b2af553c6de9808fb0118554a3cb123ca8989cfaaac9f8e2e -size 85674 diff --git a/Assets/image/environment/decoration/Forest_deadTree2.png b/Assets/image/environment/decoration/Forest_deadTree2.png deleted file mode 100644 index af78e769..00000000 --- a/Assets/image/environment/decoration/Forest_deadTree2.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cbe0146ab7b66cec169b13a58d63177624bf927bc691aa364744b0faa6d5891d -size 130309 diff --git a/Assets/image/environment/decoration/Forest_deadTree4.png b/Assets/image/environment/decoration/Forest_deadTree4.png deleted file mode 100644 index 30c9e3a4..00000000 --- a/Assets/image/environment/decoration/Forest_deadTree4.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:279aad0d19ec426b951d50517325112ae87d63b083daef577bdb3d397f881560 -size 37274 diff --git a/Assets/image/environment/decoration/Forest_deadbush5.png b/Assets/image/environment/decoration/Forest_deadbush5.png deleted file mode 100644 index 536b24e5..00000000 --- a/Assets/image/environment/decoration/Forest_deadbush5.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7201b8f23369863fc0b14c552a740ad5770ef46e3349187359a2ed4b39cdbb1f -size 10278 diff --git a/Assets/image/environment/decoration/Forest_small_bush_01.png b/Assets/image/environment/decoration/Forest_small_bush_01.png deleted file mode 100644 index 41cec7f8..00000000 --- a/Assets/image/environment/decoration/Forest_small_bush_01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2679102bd29890a5dd80a7937c01ca0af0e3ca6c04542d19db8504f39ac6481a -size 40238 diff --git a/Assets/image/environment/decoration/Forest_small_bush_02.png b/Assets/image/environment/decoration/Forest_small_bush_02.png deleted file mode 100644 index 5bfd9e8b..00000000 --- a/Assets/image/environment/decoration/Forest_small_bush_02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f6415eacbe4bae07b27f0615ccd4b304570362101d7dd3cfb6eb84a197e4cf07 -size 17810 diff --git a/Assets/image/environment/decoration/Forest_small_clover_01.png b/Assets/image/environment/decoration/Forest_small_clover_01.png deleted file mode 100644 index 6db37b76..00000000 --- a/Assets/image/environment/decoration/Forest_small_clover_01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:997b0701ffeb8c2a219687e19f1c9613659653cd7c90ae2559cbacbdacd474ff -size 16243 diff --git a/Assets/image/environment/decoration/Forest_small_clover_02.png b/Assets/image/environment/decoration/Forest_small_clover_02.png deleted file mode 100644 index 3778b7e5..00000000 --- a/Assets/image/environment/decoration/Forest_small_clover_02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2d5110d2e3dc1558b12327f741f720e58628c1ccbdc26ba7a77cbf49e08c7abb -size 9139 diff --git a/Assets/image/environment/decoration/Forest_small_clover_03.png b/Assets/image/environment/decoration/Forest_small_clover_03.png deleted file mode 100644 index 8ca06ea1..00000000 --- a/Assets/image/environment/decoration/Forest_small_clover_03.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6639a8b9a9dfd80bb5569b5a69a312a0ba04105146ccddf40a3a99456e7365da -size 24976 diff --git a/Assets/image/environment/decoration/Forest_small_fern_01.png b/Assets/image/environment/decoration/Forest_small_fern_01.png deleted file mode 100644 index 7e246b71..00000000 --- a/Assets/image/environment/decoration/Forest_small_fern_01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2345d6f89a8634e9d5ce5f4c38388e2059e72dd5304bf29ecf78e53c694fe5e5 -size 40445 diff --git a/Assets/image/environment/decoration/Forest_small_fern_02.png b/Assets/image/environment/decoration/Forest_small_fern_02.png deleted file mode 100644 index ee62fd3a..00000000 --- a/Assets/image/environment/decoration/Forest_small_fern_02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b5fcc435f999ab9bee991ee472afcbe63a70d8b9d943b70ad674a8f9ef9510b6 -size 43788 diff --git a/Assets/image/environment/decoration/Forest_small_flower_01.png b/Assets/image/environment/decoration/Forest_small_flower_01.png deleted file mode 100644 index 8a1d7af8..00000000 --- a/Assets/image/environment/decoration/Forest_small_flower_01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4366cf2e5eb3c919515009f92107cf2b940810138c10fc36c5d12bf02998e2d0 -size 44181 diff --git a/Assets/image/environment/decoration/Forest_small_flower_02.png b/Assets/image/environment/decoration/Forest_small_flower_02.png deleted file mode 100644 index 0b30c1c3..00000000 --- a/Assets/image/environment/decoration/Forest_small_flower_02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2e58bce3326606933d622641ce93a041906269f2054f7ffc0c357d3c6dd15105 -size 42607 diff --git a/Assets/image/environment/decoration/Forest_small_flower_03.png b/Assets/image/environment/decoration/Forest_small_flower_03.png deleted file mode 100644 index fd1496d4..00000000 --- a/Assets/image/environment/decoration/Forest_small_flower_03.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8210fcfbc71062cd3bac2f0b90d30d4383c0a1237a795f5b9ca82c2548c708cb -size 10994 diff --git a/Assets/image/environment/decoration/Forest_small_grass_01.png b/Assets/image/environment/decoration/Forest_small_grass_01.png deleted file mode 100644 index f4ebf978..00000000 --- a/Assets/image/environment/decoration/Forest_small_grass_01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6d3b28a1393770e7ae32007e35dbce506ccd80bb1e4803bcc93d4e070effb362 -size 43019 diff --git a/Assets/image/environment/decoration/Forest_small_grass_02.png b/Assets/image/environment/decoration/Forest_small_grass_02.png deleted file mode 100644 index 5c716f29..00000000 --- a/Assets/image/environment/decoration/Forest_small_grass_02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f0ec9ca9dd5a0a52f21ce5321dc9bc5fb706c0866feb3a4c52115f1ce20d8443 -size 56619 diff --git a/Assets/image/environment/decoration/Forest_small_grass_03.png b/Assets/image/environment/decoration/Forest_small_grass_03.png deleted file mode 100644 index 52ef10c4..00000000 --- a/Assets/image/environment/decoration/Forest_small_grass_03.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e747f79a4ceaba3be3a7ac635148294f869e388462f98a07dfc49aab38b22470 -size 41241 diff --git a/Assets/image/environment/decoration/Forest_small_grass_04.png b/Assets/image/environment/decoration/Forest_small_grass_04.png deleted file mode 100644 index 72a6b191..00000000 --- a/Assets/image/environment/decoration/Forest_small_grass_04.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:561ac8ac646d59607dede43c33702caa0e5504eb5d70ce3a2203c6cbc4fbc3b8 -size 42794 diff --git a/Assets/image/environment/decoration/Forest_small_grass_05.png b/Assets/image/environment/decoration/Forest_small_grass_05.png deleted file mode 100644 index 78ad48e6..00000000 --- a/Assets/image/environment/decoration/Forest_small_grass_05.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4a3ad4c91bff9092fc4c72df304acd497b1f9eb4e383c8602421f94c62b0b652 -size 24436 diff --git a/Assets/image/environment/decoration/Forest_small_grass_06.png b/Assets/image/environment/decoration/Forest_small_grass_06.png deleted file mode 100644 index 41faa6b3..00000000 --- a/Assets/image/environment/decoration/Forest_small_grass_06.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:87b8eec637efa11dd92e6a96acd9118a015d79ac499988ec1c526669648032f5 -size 47842 diff --git a/Assets/image/environment/decoration/Forest_small_grass_07.png b/Assets/image/environment/decoration/Forest_small_grass_07.png deleted file mode 100644 index a5a67d7d..00000000 --- a/Assets/image/environment/decoration/Forest_small_grass_07.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:87014dd304efc2a769b4cf0d8a4027fbd426abc3008065ee2a1160618a30f8f4 -size 29893 diff --git a/Assets/image/environment/decoration/Forest_small_grass_08.png b/Assets/image/environment/decoration/Forest_small_grass_08.png deleted file mode 100644 index 5b78ad62..00000000 --- a/Assets/image/environment/decoration/Forest_small_grass_08.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1b46bd6a5c685a51a03278aa0f0492dbd132ea27e379e1e63008d8ce5e36a12e -size 32857 diff --git a/Assets/image/environment/decoration/Forest_small_mushroom_01.png b/Assets/image/environment/decoration/Forest_small_mushroom_01.png deleted file mode 100644 index 9cb9e6ec..00000000 --- a/Assets/image/environment/decoration/Forest_small_mushroom_01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:94b511b4686c62b7097c9b7cff6e4d5bf2a4e9f7eaafd0c28cb780e588591d43 -size 2818 diff --git a/Assets/image/environment/decoration/Forest_small_mushroom_02.png b/Assets/image/environment/decoration/Forest_small_mushroom_02.png deleted file mode 100644 index 1cb655df..00000000 --- a/Assets/image/environment/decoration/Forest_small_mushroom_02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6249580f9407d9af4a8f176979c2d904534fe295dfe7eb87478479a9f593961b -size 6373 diff --git a/Assets/image/environment/decoration/Forest_small_mushroom_03.png b/Assets/image/environment/decoration/Forest_small_mushroom_03.png deleted file mode 100644 index 41a839cd..00000000 --- a/Assets/image/environment/decoration/Forest_small_mushroom_03.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:91893af32d28f465451ec16d224ad3a8d76100106e266e0f4413c4e904397562 -size 8512 diff --git a/Assets/image/environment/decoration/Forest_small_mushroom_04.png b/Assets/image/environment/decoration/Forest_small_mushroom_04.png deleted file mode 100644 index 2c2a7621..00000000 --- a/Assets/image/environment/decoration/Forest_small_mushroom_04.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7944e53a78d107a554f0aafdef77ce224c6a2399bf5415b0cf887445827f58d6 -size 3577 diff --git a/Assets/image/environment/decoration/Forest_small_tree_log_01.png b/Assets/image/environment/decoration/Forest_small_tree_log_01.png deleted file mode 100644 index 063f6f56..00000000 --- a/Assets/image/environment/decoration/Forest_small_tree_log_01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9180862f979467c195376b87ad9e92317c07885807113c88b35f487bdbf794df -size 36564 diff --git a/Assets/image/environment/decoration/Forest_small_tree_log_02.png b/Assets/image/environment/decoration/Forest_small_tree_log_02.png deleted file mode 100644 index bd164fb6..00000000 --- a/Assets/image/environment/decoration/Forest_small_tree_log_02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:11a23776e9219b3984dc51ff97d35698195f23ebe31072ab26d91bcbdfb06a1e -size 19113 diff --git a/Assets/image/environment/decoration/Forest_small_tree_log_03.png b/Assets/image/environment/decoration/Forest_small_tree_log_03.png deleted file mode 100644 index 3ea90035..00000000 --- a/Assets/image/environment/decoration/Forest_small_tree_log_03.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:147de273a56b7dde843f6ec9e3b1c360d7e72c68192d6e59f37a2e3b56766a93 -size 19688 diff --git a/Assets/image/environment/decoration/Forest_small_tree_stump_01.png b/Assets/image/environment/decoration/Forest_small_tree_stump_01.png deleted file mode 100644 index e433e7d5..00000000 --- a/Assets/image/environment/decoration/Forest_small_tree_stump_01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6f1138a87245edc6a904cdb2731db28ec50cf9b3968e4f1ca81e9ba9aeb4c075 -size 39414 diff --git a/Assets/image/environment/decoration/Forest_small_tree_stump_02.png b/Assets/image/environment/decoration/Forest_small_tree_stump_02.png deleted file mode 100644 index 9c6d0e09..00000000 --- a/Assets/image/environment/decoration/Forest_small_tree_stump_02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:294c76af38246a17cd048064d390d385dc3a2eda5f747575e21a20caee0e72eb -size 39175 diff --git a/Assets/image/environment/decoration/Forest_small_tree_stump_03.png b/Assets/image/environment/decoration/Forest_small_tree_stump_03.png deleted file mode 100644 index 302f4969..00000000 --- a/Assets/image/environment/decoration/Forest_small_tree_stump_03.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3e3f5bc1f17c7732deae3fa49531d0f5c188d6e6926481aa849bcbab1a088179 -size 41047 diff --git a/Assets/image/environment/decoration/bamboo1.png b/Assets/image/environment/decoration/bamboo1.png deleted file mode 100644 index 1f040331..00000000 --- a/Assets/image/environment/decoration/bamboo1.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4c1ce42081db95c74934835bcccc50ef054135e727e485bc2d014f1fd52ad20b -size 31909 diff --git a/Assets/image/environment/decoration/bamboo2.png b/Assets/image/environment/decoration/bamboo2.png deleted file mode 100644 index f36d3921..00000000 --- a/Assets/image/environment/decoration/bamboo2.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f92ef37d51d52996ad5726810360d3f4fc77a0f4d65d9327d4ecc4c83a45d857 -size 9711 diff --git a/Assets/image/environment/decoration/bamboo3.png b/Assets/image/environment/decoration/bamboo3.png deleted file mode 100644 index c3b6c437..00000000 --- a/Assets/image/environment/decoration/bamboo3.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:afeb608d2cb899a3f2a54514ca3d8828022e0c44c32d0bc6945897f7a70b4d2f -size 20418 diff --git a/Assets/image/environment/decoration/bamboo4.png b/Assets/image/environment/decoration/bamboo4.png deleted file mode 100644 index 72355d82..00000000 --- a/Assets/image/environment/decoration/bamboo4.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6ff79c48b957738b1e12883e59f67fe926c1ad44fd26fc2bf8654755fe6758de -size 43381 diff --git a/Assets/image/environment/decoration/bamboo5.png b/Assets/image/environment/decoration/bamboo5.png deleted file mode 100644 index 1777ae44..00000000 --- a/Assets/image/environment/decoration/bamboo5.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:207507947f91487a3087fbf418cdf2f54ff32101b9e7624cdbb910f35d43a07e -size 11793 diff --git a/Assets/image/environment/decoration/bamboo6.png b/Assets/image/environment/decoration/bamboo6.png deleted file mode 100644 index f389bc95..00000000 --- a/Assets/image/environment/decoration/bamboo6.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c00012c9570eff212bf3a19b5ba3271980f1130487e54ca3b712c81680e908ff -size 13990 diff --git a/Assets/image/environment/decoration/bamboo7.png b/Assets/image/environment/decoration/bamboo7.png deleted file mode 100644 index c0f884c6..00000000 --- a/Assets/image/environment/decoration/bamboo7.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3326bf92f2e67cb8ff602057aafed5aa527d39076a53a164c4afab788d51ef51 -size 39544 diff --git a/Assets/image/environment/decoration/bamboo8.png b/Assets/image/environment/decoration/bamboo8.png deleted file mode 100644 index c0f884c6..00000000 --- a/Assets/image/environment/decoration/bamboo8.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3326bf92f2e67cb8ff602057aafed5aa527d39076a53a164c4afab788d51ef51 -size 39544 diff --git a/Assets/image/environment/decoration/campfire/0.png b/Assets/image/environment/decoration/campfire/0.png deleted file mode 100644 index 4f687aa8..00000000 --- a/Assets/image/environment/decoration/campfire/0.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:15ab865d69e74f4e4b36dfd28745c9ed1b1df82066778e071a06dca9120f7907 -size 143712 diff --git a/Assets/image/environment/decoration/campfire/1.png b/Assets/image/environment/decoration/campfire/1.png deleted file mode 100644 index 8de4461f..00000000 --- a/Assets/image/environment/decoration/campfire/1.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:45aa6f8f0d3d3075d22d50cdc23afef1ab399f303322767b10fb0f260de596fd -size 152785 diff --git a/Assets/image/environment/decoration/campfire/10.png b/Assets/image/environment/decoration/campfire/10.png deleted file mode 100644 index d71e29f8..00000000 --- a/Assets/image/environment/decoration/campfire/10.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e8023ea93083d68368027a1f99975a5b9763724104ba0be801b8bef0fa11330b -size 115955 diff --git a/Assets/image/environment/decoration/campfire/2.png b/Assets/image/environment/decoration/campfire/2.png deleted file mode 100644 index 4cc6c00e..00000000 --- a/Assets/image/environment/decoration/campfire/2.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:604c79a0104190562a53bbf3853c496a20b7598b4f85d3da20c082e9bd815e48 -size 137398 diff --git a/Assets/image/environment/decoration/campfire/3.png b/Assets/image/environment/decoration/campfire/3.png deleted file mode 100644 index 5e2f47af..00000000 --- a/Assets/image/environment/decoration/campfire/3.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a17ab19d406a1a6b462ba370eb14f15abaff90c8f1902adb9809501265a77192 -size 140780 diff --git a/Assets/image/environment/decoration/campfire/4.png b/Assets/image/environment/decoration/campfire/4.png deleted file mode 100644 index 038601c5..00000000 --- a/Assets/image/environment/decoration/campfire/4.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:be7a8cc0331a8dfe78d597e093a4ba4a7b7df54af043278fde5a416e5a3d606b -size 140839 diff --git a/Assets/image/environment/decoration/campfire/5.png b/Assets/image/environment/decoration/campfire/5.png deleted file mode 100644 index b5dd0d21..00000000 --- a/Assets/image/environment/decoration/campfire/5.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0deff8dc13d7f94a85b9f82e802532cba287440b31b4538212590e2c5a792a96 -size 140486 diff --git a/Assets/image/environment/decoration/campfire/6.png b/Assets/image/environment/decoration/campfire/6.png deleted file mode 100644 index 466f8d1e..00000000 --- a/Assets/image/environment/decoration/campfire/6.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6809641748976d47f80a69dcdf54f8997429dfa8f75348d64c57af93b2a2529a -size 137900 diff --git a/Assets/image/environment/decoration/campfire/7.png b/Assets/image/environment/decoration/campfire/7.png deleted file mode 100644 index 4bdff687..00000000 --- a/Assets/image/environment/decoration/campfire/7.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ea4bc7f52123cff248b2b8028c94b816651b2b8f99ca8481f4d1c852ba93870b -size 139015 diff --git a/Assets/image/environment/decoration/campfire/8.png b/Assets/image/environment/decoration/campfire/8.png deleted file mode 100644 index 8de4461f..00000000 --- a/Assets/image/environment/decoration/campfire/8.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:45aa6f8f0d3d3075d22d50cdc23afef1ab399f303322767b10fb0f260de596fd -size 152785 diff --git a/Assets/image/environment/decoration/campfire/9.png b/Assets/image/environment/decoration/campfire/9.png deleted file mode 100644 index 40e3592f..00000000 --- a/Assets/image/environment/decoration/campfire/9.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8b8f722b4cb4d71b36d5d6240b5e4e8a0e58ed3772cb4e3171d02c893cd9ffe3 -size 138895 diff --git a/Assets/image/environment/decoration/chest.png b/Assets/image/environment/decoration/chest.png deleted file mode 100644 index 0e79a28c..00000000 --- a/Assets/image/environment/decoration/chest.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ebfabf36b16f2723cf94457b63160b8530cabfb33bb50df6cb6cae5813ea711c -size 122243 diff --git a/Assets/image/environment/decoration/desert_skull_01.png b/Assets/image/environment/decoration/desert_skull_01.png deleted file mode 100644 index e76ca249..00000000 --- a/Assets/image/environment/decoration/desert_skull_01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8c94d0ad2c7838e21e6a10feb2d680016f02aaa3fc5288023135c63d9269ec22 -size 9036 diff --git a/Assets/image/environment/decoration/desert_skull_02.png b/Assets/image/environment/decoration/desert_skull_02.png deleted file mode 100644 index 6d620d55..00000000 --- a/Assets/image/environment/decoration/desert_skull_02.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cc2a440b640b3075093ef97195e1983aa42b645496a91b83d34394acec62a725 -size 23367 diff --git a/Assets/image/environment/decoration/desert_skull_03.png b/Assets/image/environment/decoration/desert_skull_03.png deleted file mode 100644 index 6123aede..00000000 --- a/Assets/image/environment/decoration/desert_skull_03.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:65e2ea766008bca07cca774f1269d533f3d6f43e1fd618b24f168a31bd7c5865 -size 12673 diff --git a/Assets/image/environment/decoration/forest_berrybush.png b/Assets/image/environment/decoration/forest_berrybush.png deleted file mode 100644 index aa37b7b4..00000000 --- a/Assets/image/environment/decoration/forest_berrybush.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a0603b158e041eeedaae3c2e122caa5288f3d8395b319bfd36fe54631340f236 -size 25915 diff --git a/Assets/image/environment/decoration/forest_bush4.png b/Assets/image/environment/decoration/forest_bush4.png deleted file mode 100644 index 2ed9929a..00000000 --- a/Assets/image/environment/decoration/forest_bush4.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ad9fd40cc7cfb923006e9f4530ff4d28dd54d098b24ff6c9234cb71f88b6228c -size 20800 diff --git a/Assets/image/environment/decoration/forest_bush5.png b/Assets/image/environment/decoration/forest_bush5.png deleted file mode 100644 index 79687b15..00000000 --- a/Assets/image/environment/decoration/forest_bush5.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ccdc4c7def89987cb58d147b72fb5de6a62727d441f4faa42bead29f8998cf63 -size 24496 diff --git a/Assets/image/environment/decoration/reed1.png b/Assets/image/environment/decoration/reed1.png deleted file mode 100644 index b967b5c1..00000000 --- a/Assets/image/environment/decoration/reed1.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e5b8c1420e5042239090eec8ddec1ecf191601bb436e5610efdce9ea82621c53 -size 18584 diff --git a/Assets/image/environment/decoration/reed2.png b/Assets/image/environment/decoration/reed2.png deleted file mode 100644 index ee9f0ac7..00000000 --- a/Assets/image/environment/decoration/reed2.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:05cd0ecf65bb92ad05880692da03eaae9898da5be1127bb2558574bf83541f48 -size 11675 diff --git a/Assets/image/environment/decoration/reed3.png b/Assets/image/environment/decoration/reed3.png deleted file mode 100644 index baa327e2..00000000 --- a/Assets/image/environment/decoration/reed3.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:57a48f6e7e67f4f205a0c92268be8e437ef28811fdd6d45951b9fc71a49e6af3 -size 26890 diff --git a/Assets/image/environment/decoration/reed4.png b/Assets/image/environment/decoration/reed4.png deleted file mode 100644 index 02dbe163..00000000 --- a/Assets/image/environment/decoration/reed4.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5b65a5af755d74f34066aac71d71499e3bd31619d43f088c140e18a801b770bb -size 9581 diff --git a/Assets/image/environment/decoration/reed5.png b/Assets/image/environment/decoration/reed5.png deleted file mode 100644 index 540fa48e..00000000 --- a/Assets/image/environment/decoration/reed5.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2bccce2c5b95d069ff7e4ec21ebfca22d26c66e496e562b9cf30d02630ca0b01 -size 7202 diff --git a/Assets/image/environment/decoration/reed6.png b/Assets/image/environment/decoration/reed6.png deleted file mode 100644 index dd6c62b0..00000000 --- a/Assets/image/environment/decoration/reed6.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cfbb54814c7ce3bd9f11f431b2ec473e158ce0f6004b0881e017f3bfcba35c6a -size 17705 diff --git a/Assets/image/environment/decoration/reed7.png b/Assets/image/environment/decoration/reed7.png deleted file mode 100644 index 54e6286a..00000000 --- a/Assets/image/environment/decoration/reed7.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:84fdf60612fd09303605728b8bd9fdd0814683ec79d5d829ae21fb95b7d17996 -size 27479 diff --git a/Assets/image/environment/decoration/reed8.png b/Assets/image/environment/decoration/reed8.png deleted file mode 100644 index 07379dc1..00000000 --- a/Assets/image/environment/decoration/reed8.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9cbea4317682a3c284e72474178ef093149093a306400b5574757c2863196a3c -size 16259 diff --git a/Assets/image/environment/decoration/stone1.png b/Assets/image/environment/decoration/stone1.png deleted file mode 100644 index 2aeb9877..00000000 --- a/Assets/image/environment/decoration/stone1.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:275d4163a20d4664132545be7157ef980653e7c6ec0e11f0c1b304abc950514d -size 28168 diff --git a/Assets/image/environment/decoration/stone2.png b/Assets/image/environment/decoration/stone2.png deleted file mode 100644 index 0f9b55ff..00000000 --- a/Assets/image/environment/decoration/stone2.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aa29624ba64a79cc6b31a4846e695a1c1fbe1a308c94291ed2ed0584667bc69e -size 3878 diff --git a/Assets/image/environment/decoration/stone3.png b/Assets/image/environment/decoration/stone3.png deleted file mode 100644 index 7d6bcd3a..00000000 --- a/Assets/image/environment/decoration/stone3.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e23b22e6d2ef5dbd0c02226561b979ef766edb9bee0b24ab6c5e14284ba6201e -size 7443 diff --git a/Assets/image/environment/decoration/waterbuds.png b/Assets/image/environment/decoration/waterbuds.png deleted file mode 100644 index fea2fa59..00000000 --- a/Assets/image/environment/decoration/waterbuds.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:07a0fd2d9946f26839e0d0d04237e652c674fa720914f76310649689b8473aa1 -size 22587 diff --git a/Assets/image/environment/decoration/waterplant0.png b/Assets/image/environment/decoration/waterplant0.png deleted file mode 100644 index 8872e807..00000000 --- a/Assets/image/environment/decoration/waterplant0.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dbef9c02ac0e1712551c50ebf8789999ea54e507aff35bb210070dc521a3ab57 -size 7808 diff --git a/Assets/image/environment/decoration/waterplant1.png b/Assets/image/environment/decoration/waterplant1.png deleted file mode 100644 index 52268295..00000000 --- a/Assets/image/environment/decoration/waterplant1.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:94c057c92575297cc03fc1546c0eab8f79a78881494caae4970befcc90fd5820 -size 4010 diff --git a/Assets/image/environment/decoration/waterplant2.png b/Assets/image/environment/decoration/waterplant2.png deleted file mode 100644 index 3ab370e0..00000000 --- a/Assets/image/environment/decoration/waterplant2.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5fdf018589d0518e546171ee1e0cefe51ea8bb019bd339866ca6708e40aeebe3 -size 3871 diff --git a/Assets/image/environment/decoration/waterplant3.png b/Assets/image/environment/decoration/waterplant3.png deleted file mode 100644 index 4bbd590e..00000000 --- a/Assets/image/environment/decoration/waterplant3.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3c9067d17ea25f3e31afc81007e4e4f622694b06b59ca860c1e044f81ce53155 -size 13429 diff --git a/Assets/image/environment/decoration/waterplant4.png b/Assets/image/environment/decoration/waterplant4.png deleted file mode 100644 index 2df6a9e8..00000000 --- a/Assets/image/environment/decoration/waterplant4.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5eda20d989570fb1af07740464719a7380f112b677d1f17de294f75266073c81 -size 34592 diff --git a/Assets/image/environment/decoration/waterplant5.png b/Assets/image/environment/decoration/waterplant5.png deleted file mode 100644 index 9e9675f0..00000000 --- a/Assets/image/environment/decoration/waterplant5.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:54a3dabf19647a2026836f6d05bee897c437348e098fdf03734c4c147c1c6c2f -size 21496 diff --git a/Assets/image/environment/decoration/waterplant6.png b/Assets/image/environment/decoration/waterplant6.png deleted file mode 100644 index 198337ee..00000000 --- a/Assets/image/environment/decoration/waterplant6.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cbce8dade170f7e911623c10a649125ab8ff00ea85e50ce5a68a90dfb1c4ac95 -size 2360 diff --git a/Assets/image/environment/snow/snowflake1.png b/Assets/image/environment/snow/snowflake1.png deleted file mode 100644 index 1de82f92..00000000 --- a/Assets/image/environment/snow/snowflake1.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:60ad8a92f481c85e34cd0db3f295a9ad7709462b5fdd671c58715b9f3e5471c6 -size 821 diff --git a/Assets/image/environment/snow/snowflake10.png b/Assets/image/environment/snow/snowflake10.png deleted file mode 100644 index 18cddf3a..00000000 --- a/Assets/image/environment/snow/snowflake10.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:955de166fc07a0e882b19daa29326a698cbfca62d9a63316f1cb9910cc1a6101 -size 1020 diff --git a/Assets/image/environment/snow/snowflake11.png b/Assets/image/environment/snow/snowflake11.png deleted file mode 100644 index 982f84b6..00000000 --- a/Assets/image/environment/snow/snowflake11.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:00b93a0e22e0fb13e288238486d037dcb85e73559d1ae1d65946499b8422200a -size 1016 diff --git a/Assets/image/environment/snow/snowflake12.png b/Assets/image/environment/snow/snowflake12.png deleted file mode 100644 index 76c4c963..00000000 --- a/Assets/image/environment/snow/snowflake12.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3a3dac45a4ef000bb027af59c8aadb85b7a4bce92ef55922ba956af0fa8cdc7e -size 888 diff --git a/Assets/image/environment/snow/snowflake13.png b/Assets/image/environment/snow/snowflake13.png deleted file mode 100644 index 511a8904..00000000 --- a/Assets/image/environment/snow/snowflake13.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:acdd6e3eda0685baffa04ebd3c79728727777efe34505ca853a8b9c1b0e28dff -size 958 diff --git a/Assets/image/environment/snow/snowflake14.png b/Assets/image/environment/snow/snowflake14.png deleted file mode 100644 index b21b99cf..00000000 --- a/Assets/image/environment/snow/snowflake14.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8471a0b3eb741765c59c1e99b2d3f6de91fcc9773b96a3d9080691cc795463d6 -size 824 diff --git a/Assets/image/environment/snow/snowflake15.png b/Assets/image/environment/snow/snowflake15.png deleted file mode 100644 index 3100057b..00000000 --- a/Assets/image/environment/snow/snowflake15.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ced14b413d07e9fb3d0c6313369c16a233d955b9737fa7cef11f8c7d9200c29f -size 944 diff --git a/Assets/image/environment/snow/snowflake16.png b/Assets/image/environment/snow/snowflake16.png deleted file mode 100644 index 80586345..00000000 --- a/Assets/image/environment/snow/snowflake16.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:22197f70b23a04e0ffaecec5134c49342b425f7cd647404ef5e0af2a86d7ccc2 -size 873 diff --git a/Assets/image/environment/snow/snowflake2.png b/Assets/image/environment/snow/snowflake2.png deleted file mode 100644 index c2f7b300..00000000 --- a/Assets/image/environment/snow/snowflake2.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cd9e34cf881cf40aabc3b9c8bd5c305f98818f33cbf796a36cfd613449fa491e -size 788 diff --git a/Assets/image/environment/snow/snowflake3.png b/Assets/image/environment/snow/snowflake3.png deleted file mode 100644 index 77b754aa..00000000 --- a/Assets/image/environment/snow/snowflake3.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6238b3905578c264688aeeb5a74732509b056a58cd97208a443cad846f2f0364 -size 996 diff --git a/Assets/image/environment/snow/snowflake4.png b/Assets/image/environment/snow/snowflake4.png deleted file mode 100644 index ab96f09c..00000000 --- a/Assets/image/environment/snow/snowflake4.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a49e4dfa000a1fad7869e6d00b67bed09d5f249314111ab672b50e2433a15622 -size 928 diff --git a/Assets/image/environment/snow/snowflake5.png b/Assets/image/environment/snow/snowflake5.png deleted file mode 100644 index 0cb10fc9..00000000 --- a/Assets/image/environment/snow/snowflake5.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9b5fac6f6022e9ea68d373b473563ddcec79d8c41fdccf067d313f0d08344516 -size 898 diff --git a/Assets/image/environment/snow/snowflake6.png b/Assets/image/environment/snow/snowflake6.png deleted file mode 100644 index 9e3bedc4..00000000 --- a/Assets/image/environment/snow/snowflake6.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:89adc146e36121af7b8a4eb302a5fb8a13642b1845a825048e9675f8f58c6e96 -size 812 diff --git a/Assets/image/environment/snow/snowflake7.png b/Assets/image/environment/snow/snowflake7.png deleted file mode 100644 index fe0bc67b..00000000 --- a/Assets/image/environment/snow/snowflake7.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:827951484ed12b7cf263a50d617d4d6239225a2ac86e65df6eeed105b69bd54b -size 880 diff --git a/Assets/image/environment/snow/snowflake8.png b/Assets/image/environment/snow/snowflake8.png deleted file mode 100644 index b2f735f5..00000000 --- a/Assets/image/environment/snow/snowflake8.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:247d0d32048f52acf644b8f1a4938f6ed0f15ccc6aeed5fe57def995c65d9a37 -size 1030 diff --git a/Assets/image/environment/snow/snowflake9.png b/Assets/image/environment/snow/snowflake9.png deleted file mode 100644 index 1b17b764..00000000 --- a/Assets/image/environment/snow/snowflake9.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e1874b98728639f7c237ea2832056cb0cdd347f6b287d5241913bafbbca19a09 -size 1093 diff --git a/Data/main_chapter/chapter1_map.yaml b/Data/main_chapter/chapter1_map.yaml index e24baa19..61b4ff20 100644 --- a/Data/main_chapter/chapter1_map.yaml +++ b/Data/main_chapter/chapter1_map.yaml @@ -1,4 +1,4 @@ -atNight: false +atNight: true background_image: snowfield.jpg background_music: Combat_02_RemnantFantasyPackage_Synari.ogg character: diff --git a/Source/base.py b/Source/base.py index acba63f5..b33fa39d 100644 --- a/Source/base.py +++ b/Source/base.py @@ -3,6 +3,7 @@ if os.path.exists("dev.key"): from linpgdev import linpg + linpg.setting.set_developer_mode(True) else: import linpg diff --git a/Source/core/editor.py b/Source/core/editor.py index 5639b262..c62b9d86 100644 --- a/Source/core/editor.py +++ b/Source/core/editor.py @@ -116,7 +116,7 @@ def load( int(screen.get_height() * 0.85), "vertical", ) - for imgPath in glob(r"Assets/image/environment/block/*.png"): + for imgPath in glob(os.path.join(linpg.ASSET.get_internal_environment_image_path("block"), "*.png")): self.__envImgContainer.set( os.path.basename(imgPath).replace(".png", ""), linpg.load.img(imgPath, (self.MAP.block_width / 3, None)), @@ -134,7 +134,7 @@ def load( int(screen.get_height() * 0.85), "vertical", ) - for imgPath in glob(r"Assets/image/environment/decoration/*.png"): + for imgPath in glob(os.path.join(linpg.ASSET.get_internal_environment_image_path("decoration"), "*.png")): self.__decorationsImgContainer.set( os.path.basename(imgPath).replace(".png", ""), linpg.load.img(imgPath, (self.MAP.block_width / 3, None)), From 0b83e1c8160b353749b9ced2412dd39c36c2ca8b Mon Sep 17 00:00:00 2001 From: yudonglin Date: Fri, 17 Sep 2021 21:49:29 -0700 Subject: [PATCH 04/11] adopt some changes that were made in linpg battle system --- Data/database.yaml | 542 -------------------------------------- Data/lyric/Connexion.yaml | 35 --- Source/core/tbs.py | 8 +- 3 files changed, 1 insertion(+), 584 deletions(-) delete mode 100644 Data/lyric/Connexion.yaml diff --git a/Data/database.yaml b/Data/database.yaml index 5135804a..728c6de3 100644 --- a/Data/database.yaml +++ b/Data/database.yaml @@ -1,550 +1,8 @@ -Blocks: - LowTileDirt01: - canPassThrough: true - LowTileDirtToStoneTransition01: - canPassThrough: true - LowTileDirtToStoneTransition02: - canPassThrough: true - LowTileRiverbed01: - canPassThrough: true - LowTileRiverbed02: - canPassThrough: true - LowTileRiverbed03: - canPassThrough: true - LowTileRiverbed04: - canPassThrough: true - LowTileSand01: - canPassThrough: true - LowTileSand02: - canPassThrough: true - LowTileSand03: - canPassThrough: true - LowTileStone01: - canPassThrough: true - LowTileStone02: - canPassThrough: true - LowTileStone03: - canPassThrough: true - OverlayCracks01: - canPassThrough: true - OverlayCracks02: - canPassThrough: true - OverlayGlow01: - canPassThrough: true - OverlayGlow02: - canPassThrough: true - OverlayGrass01: - canPassThrough: true - OverlayGrassHalfH01: - canPassThrough: true - OverlayGrassHalfH02: - canPassThrough: true - OverlayGrassHalfV01: - canPassThrough: true - OverlayGrassHalfV02Kopie: - canPassThrough: true - OverlayGrassPatch01: - canPassThrough: true - OverlayGrassPatch02: - canPassThrough: true - OverlayGrassPatch02H01: - canPassThrough: true - OverlayGrassPatch02H02: - canPassThrough: true - OverlayGrassPatch02V01: - canPassThrough: true - OverlayGrassPatch02V02: - canPassThrough: true - OverlayGrassPatch03: - canPassThrough: true - OverlayGrassPatch03H01: - canPassThrough: true - OverlayGrassPatch03H02: - canPassThrough: true - OverlayGrassPatch03V01: - canPassThrough: true - OverlayGrassPatch03V02: - canPassThrough: true - OverlayGrassPatchH01: - canPassThrough: true - OverlayGrassPatchH02: - canPassThrough: true - OverlayGrassPatchV01: - canPassThrough: true - OverlayGrassPatchV02: - canPassThrough: true - OverlayPathCross: - canPassThrough: true - OverlayPathCross301: - canPassThrough: true - OverlayPathCross302: - canPassThrough: true - OverlayPathCross303: - canPassThrough: true - OverlayPathCross304: - canPassThrough: true - OverlayPathCurve01: - canPassThrough: true - OverlayPathCurve02: - canPassThrough: true - OverlayPathCurve03: - canPassThrough: true - OverlayPathCurve04: - canPassThrough: true - OverlayPathEnd01: - canPassThrough: true - OverlayPathEnd02: - canPassThrough: true - OverlayPathEnd03: - canPassThrough: true - OverlayPathEnd04: - canPassThrough: true - OverlayPathSingle: - canPassThrough: true - OverlayPathStraight01: - canPassThrough: true - OverlayPathStraight02: - canPassThrough: true - OverlayRoofHay01: - canPassThrough: true - OverlayRoofHay02: - canPassThrough: true - OverlayRoofHay03: - canPassThrough: true - OverlayRoofHay04: - canPassThrough: true - OverlayRoofHay05: - canPassThrough: true - OverlayRoofHay06: - canPassThrough: true - OverlayRoofHay07: - canPassThrough: true - OverlayRoofHay08: - canPassThrough: true - OverlayRoofHay09: - canPassThrough: true - OverlayRoofHay10: - canPassThrough: true - OverlayRoofHay11: - canPassThrough: true - OverlayRoofHay12: - canPassThrough: true - OverlayRoofHay13: - canPassThrough: true - OverlayShoreCornerD: - canPassThrough: true - OverlayShoreCornerL: - canPassThrough: true - OverlayShoreCornerR: - canPassThrough: true - OverlayShoreCornerRU: - canPassThrough: true - OverlayShoreCornerU: - canPassThrough: true - OverlayShoreStraightLD: - canPassThrough: true - OverlayShoreStraightLU: - canPassThrough: true - OverlayShoreStraightRD: - canPassThrough: true - OverlayShoreStraightRU: - canPassThrough: true - OverlayStonePieces01: - canPassThrough: true - OverlayStonePieces01HalfH01: - canPassThrough: true - OverlayStonePieces01HalfH02: - canPassThrough: true - OverlayStonePieces01HalfV01: - canPassThrough: true - OverlayStonePieces01HalfV02: - canPassThrough: true - OverlayStonePieces02: - canPassThrough: true - OverlayStonePieces02HalfH01: - canPassThrough: true - OverlayStonePieces02HalfH02: - canPassThrough: true - OverlayStonePieces02HalfV01: - canPassThrough: true - OverlayStonePieces02HalfV02: - canPassThrough: true - OverlayWater01: - canPassThrough: true - OverlayWater02: - canPassThrough: true - PropStairStone01: - canPassThrough: true - PropStairStone02: - canPassThrough: true - PropStairStone03: - canPassThrough: true - PropStairStone04: - canPassThrough: true - PropStairStone05: - canPassThrough: true - PropStairStone06: - canPassThrough: true - PropStairStone07: - canPassThrough: true - PropStairStone08: - canPassThrough: true - PropStairStone09: - canPassThrough: true - PropStairStone10: - canPassThrough: true - PropStairStone11: - canPassThrough: true - PropStairStone12: - canPassThrough: true - TileBrickBrick01: - canPassThrough: true - TileBrickBrick02: - canPassThrough: true - TileBrickBrick03: - canPassThrough: true - TileBrickBrick04: - canPassThrough: true - TileBrickSandStone01: - canPassThrough: true - TileBrickSnow01: - canPassThrough: true - TileBrickStone01: - canPassThrough: true - TileBrickStone0102: - canPassThrough: true - TileBrickStone0103: - canPassThrough: true - TileBrickStone0104: - canPassThrough: true - TileBrickStone0105: - canPassThrough: true - TileBrickStone0201: - canPassThrough: true - TileDirt01: - canPassThrough: true - TileDirt01Grass01: - canPassThrough: true - TileDirt01GrassPatch01: - canPassThrough: true - TileDirt01GrassPatch02: - canPassThrough: true - TileDirt01GrassPatch03: - canPassThrough: true - TileDirt01GrassPath3Cross01: - canPassThrough: true - TileDirt01GrassPath3Cross02: - canPassThrough: true - TileDirt01GrassPath3Cross03: - canPassThrough: true - TileDirt01GrassPath3Cross04: - canPassThrough: true - TileDirt01GrassPath4Cross: - canPassThrough: true - TileDirt01GrassPathCurve01: - canPassThrough: true - TileDirt01GrassPathCurve02: - canPassThrough: true - TileDirt01GrassPathCurve03: - canPassThrough: true - TileDirt01GrassPathCurve04: - canPassThrough: true - TileDirt01GrassPathEnd01: - canPassThrough: true - TileDirt01GrassPathEnd02: - canPassThrough: true - TileDirt01GrassPathEnd03: - canPassThrough: true - TileDirt01GrassPathEnd04: - canPassThrough: true - TileDirt01GrassPathSingle: - canPassThrough: true - TileDirt01GrassPathStraight01: - canPassThrough: true - TileDirt01GrassPathStraight02: - canPassThrough: true - TileDirt01ToSnow01: - canPassThrough: true - TileDirt01ToSnow02: - canPassThrough: true - TileDirt01ToStone01: - canPassThrough: true - TileDirt01ToStone02: - canPassThrough: true - TileDirt02: - canPassThrough: true - TileDirt02ToStone01: - canPassThrough: true - TileDirt02ToStone02: - canPassThrough: true - TileLava01: - canPassThrough: true - TileLava02: - canPassThrough: true - TileLavaCracks01: - canPassThrough: true - TileLavaStone01: - canPassThrough: true - TileRiverbed01: - canPassThrough: true - TileRiverbed02: - canPassThrough: true - TileRiverbed03: - canPassThrough: true - TileRiverbed04: - canPassThrough: true - TileSand01: - canPassThrough: true - TileSand01ToStone01: - canPassThrough: true - TileSand01ToStone02: - canPassThrough: true - TileSand02: - canPassThrough: true - TileSand02ToStone01: - canPassThrough: true - TileSand02ToStone02: - canPassThrough: true - TileSand03: - canPassThrough: true - TileSand03ToStone01: - canPassThrough: true - TileSand03ToStone02: - canPassThrough: true - TileSand04: - canPassThrough: true - TileSnow01: - canPassThrough: true - TileSnow01ToStone01: - canPassThrough: true - TileSnow01ToStone02: - canPassThrough: true - TileSnow02: - canPassThrough: true - TileSnow02ToStone01: - canPassThrough: true - TileSnow02ToStone02: - canPassThrough: true - TileStone01: - canPassThrough: true - TileStone02: - canPassThrough: true - TileStone03: - canPassThrough: true - TileTemplate01: - canPassThrough: true - TileWater01: - canPassThrough: true - TileWaterBlock: - canPassThrough: true - TileWaterShore1C01: - canPassThrough: true - TileWaterShore1C02: - canPassThrough: true - TileWaterShore1C03: - canPassThrough: true - TileWaterShore1C04: - canPassThrough: true - TileWaterShore1S01: - canPassThrough: true - TileWaterShore1S02: - canPassThrough: true - TileWaterShore1S03: - canPassThrough: true - TileWaterShore1S04: - canPassThrough: true - TileWaterShore1S1C01: - canPassThrough: true - TileWaterShore1S1C02: - canPassThrough: true - TileWaterShore1S1C03: - canPassThrough: true - TileWaterShore1S1C04: - canPassThrough: true - TileWaterShore1S1C05: - canPassThrough: true - TileWaterShore1S1C06: - canPassThrough: true - TileWaterShore1S1C07: - canPassThrough: true - TileWaterShore1S1C08: - canPassThrough: true - TileWaterShore1S2C01: - canPassThrough: true - TileWaterShore1S2C02: - canPassThrough: true - TileWaterShore1S2C03: - canPassThrough: true - TileWaterShore1S2C04: - canPassThrough: true - TileWaterShore2C01: - canPassThrough: true - TileWaterShore2C02: - canPassThrough: true - TileWaterShore2C03: - canPassThrough: true - TileWaterShore2C04: - canPassThrough: true - TileWaterShore2C05: - canPassThrough: true - TileWaterShore2C06: - canPassThrough: true - TileWaterShore2S01: - canPassThrough: true - TileWaterShore2S02: - canPassThrough: true - TileWaterShore2S03: - canPassThrough: true - TileWaterShore2S04: - canPassThrough: true - TileWaterShore2S05: - canPassThrough: true - TileWaterShore2S06: - canPassThrough: true - TileWaterShore2S1C01: - canPassThrough: true - TileWaterShore2S1C02: - canPassThrough: true - TileWaterShore2S1C03: - canPassThrough: true - TileWaterShore2S1C04: - canPassThrough: true - TileWaterShore3C01: - canPassThrough: true - TileWaterShore3C02: - canPassThrough: true - TileWaterShore3C03: - canPassThrough: true - TileWaterShore3C04: - canPassThrough: true - TileWaterShore3S01: - canPassThrough: true - TileWaterShore3S02: - canPassThrough: true - TileWaterShore3S03: - canPassThrough: true - TileWaterShore3S04: - canPassThrough: true - TileWaterShore4C01: - canPassThrough: true - TileWaterShore4S04: - canPassThrough: true - TileWood01: - canPassThrough: true - TileWood02: - canPassThrough: true - TileWood03: - canPassThrough: true - TileWood04: - canPassThrough: true Contributors: mainMenu: - DIZZYs WALLPAPERS sound: - 影之光 -Decorations: - Desert_big_cactus_02: obstacle - Desert_big_cactus_03: obstacle - Desert_big_cactus_04: obstacle - Desert_big_flower_01: other - Desert_small_Agave_Cactus_01: other - Desert_small_Agave_Cactus_02: other - Desert_small_Agave_Cactus_03: other - Desert_small_Agave_Cactus_04: other - Desert_small_Bush_01: tree - Desert_small_Bush_02: tree - Desert_small_Cactus_02: obstacle - Desert_small_Cactus_03: obstacle - Desert_small_Cactus_04: obstacle - Desert_small_Cactus_05: obstacle - Desert_small_Cactus_06: obstacle - Desert_small_Cactus_07: obstacle - Desert_small_Cactus_09: obstacle - Desert_small_Cactus_10: obstacle - Desert_small_Cactus_11: obstacle - Desert_small_Cactus_12: obstacle - Desert_small_Cactus_13: obstacle - Desert_small_Cactus_14: obstacle - Desert_small_Cactus_15: obstacle - Desert_small_Flower_01: other - Desert_small_Flower_02: other - Desert_small_Flower_03: other - Desert_small_Flower_04: other - Forest_big_cypress_01: tree - Forest_big_cypress_02: tree - Forest_big_cypress_03: tree - Forest_big_stone_01: obstacle - Forest_big_stone_02: obstacle - Forest_big_tree_leaf_01: tree - Forest_big_tree_needle_03: tree - Forest_big_tree_needle_04: tree - Forest_deadBush3: other - Forest_deadTree1: other - Forest_deadTree2: other - Forest_deadTree4: other - Forest_deadbush5: other - Forest_small_bush_01: tree - Forest_small_bush_02: tree - Forest_small_clover_01: other - Forest_small_clover_02: other - Forest_small_clover_03: other - Forest_small_fern_01: other - Forest_small_fern_02: other - Forest_small_flower_01: other - Forest_small_flower_02: other - Forest_small_flower_03: other - Forest_small_grass_01: other - Forest_small_grass_02: other - Forest_small_grass_03: other - Forest_small_grass_04: other - Forest_small_grass_05: other - Forest_small_grass_06: other - Forest_small_grass_07: other - Forest_small_grass_08: other - Forest_small_mushroom_01: other - Forest_small_mushroom_02: other - Forest_small_mushroom_03: other - Forest_small_mushroom_04: other - Forest_small_tree_log_01: obstacle - Forest_small_tree_log_02: obstacle - Forest_small_tree_log_03: obstacle - Forest_small_tree_stump_01: obstacle - Forest_small_tree_stump_02: obstacle - Forest_small_tree_stump_03: obstacle - bamboo1: tree - bamboo2: tree - bamboo3: tree - bamboo4: tree - bamboo5: tree - bamboo6: tree - bamboo7: tree - bamboo8: tree - chest: chest - desert_skull_01: obstacle - desert_skull_02: obstacle - desert_skull_03: obstacle - forest_berrybush: tree - forest_bush4: other - forest_bush5: other - reed1: other - reed2: other - reed3: other - reed4: other - reed5: other - reed6: other - reed7: other - reed8: other - stone1: obstacle - stone2: obstacle - stone3: obstacle - waterbuds: other - waterplant0: other - waterplant1: other - waterplant2: other - waterplant3: other - waterplant4: other - waterplant5: other - waterplant6: other Npc: aa12: - aa12.png diff --git a/Data/lyric/Connexion.yaml b/Data/lyric/Connexion.yaml deleted file mode 100644 index 69fc0d40..00000000 --- a/Data/lyric/Connexion.yaml +++ /dev/null @@ -1,35 +0,0 @@ -lyric: - 00:34.38: The layer of dust, is telling the story - 00:42.25: Together with pride, lying on the cold ground - 00:50.27: Remembered the day you sighed when the last leaf - 00:58.35: of the dying tree, falling on the new green - 01:05.63: If I divine your meaning, would you stay here - 01:13.65: Instead of leaving and breaking this connection - 01:25.88: Do you see, how things change, you used to be my flame - 01:33.92: Just too faint to stay, in the darkness and rain - 01:41.83: You flee from me, to somewhere I cannot reach - 01:49.63: And made a wall, a hedge between - 02:00.18: I pray every night for that tree to blossom - 02:08.13: And day after day, keep breathing the silence - 02:16.11: You know loneliness, has almost devoured me - 02:24.29: I’m longing for a thud, wake me up in a sudden - 02:31.72: If I can make it happen, would you come back? - 02:39.63: And give me the chance to fix this connection? - 02:51.74: Do you see how we change - 02:55.93: There is no need to blame - 02:59.95: Who can set my heart free? - 03:03.90: Everything has its trail - 03:07.69: But deep inside, I’m still waiting for you - 03:15.60: To be the light, lead me to realize...... - 03:40.87: I tell myself a lie, no way to win the fight - 03:44.93: I even never try, just set the fear high - 03:48.95: Holding my pride tide, until your tears dry - 03:52.88: Without you in my life, my sky is never bright - 03:55.98: Do you see how things changed, you used to be my flame? - 04:04.01: Just too faint to stay, in the darkness and rain - 04:11.84: You flee from me to somewhere I can not reach - 04:19.55: And made a wall, a hedge between - 04:27.81: Do you see... - 04:34.48: To be my flame... - 04:42.62: Darkness and rain... - 04:50.45: I cannot reach \ No newline at end of file diff --git a/Source/core/tbs.py b/Source/core/tbs.py index 01b9d1a2..516f5e74 100644 --- a/Source/core/tbs.py +++ b/Source/core/tbs.py @@ -1213,11 +1213,7 @@ def __play_battle(self, screen: linpg.ImageSurface) -> None: # 检测是不是站在补给上 decoration = self.MAP.find_decoration_on(self.characterInControl.get_pos()) if decoration is not None and decoration.type == "chest": - if ( - decoration.whitelist is None - or self.characterGetClick == decoration.whitelist - or self.characterGetClick in decoration.whitelist - ): + if self.characterGetClick in decoration.whitelist: # 清空储存列表 self.supply_board.items.clear() # 将物品按照类型放入列表 @@ -1249,8 +1245,6 @@ def __play_battle(self, screen: linpg.ImageSurface) -> None: dialog_to_check = self._dialog_dictionary["move"][name_from_by_pos] if ( "whitelist" not in dialog_to_check - or dialog_to_check["whitelist"] is None - or self.characterGetClick == dialog_to_check["whitelist"] or self.characterGetClick in dialog_to_check["whitelist"] ): self.dialog_key = dialog_to_check["dialog_key"] From 6d8f2c4f5d7b97d3b094fe9df2fc484a0001e370 Mon Sep 17 00:00:00 2001 From: yudonglin Date: Fri, 17 Sep 2021 22:14:09 -0700 Subject: [PATCH 05/11] remove restriction After thorough consideration, I decided to lift the restriction for both GirlsFrontLine-LastWish and A-story-of-us. The people who just want to enjoy the game should not be punished. The restriction for the usage of Linpg Engine will remain untouched. --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 7b8d4ccd..9590ad13 100644 --- a/README.md +++ b/README.md @@ -138,6 +138,4 @@ https://github.com/TigeiaWorkshop/GirlsFrontLine-LastWish This game's codes are distributed under the **[GPL-3.0 License](https://github.com/TigeiaWorkshop/GirlsFrontLine-LastWish/blob/master/LICENSE)**, which means you can use our codes for commercial purposes as long as you are following the **[GPL-3.0 License](https://github.com/TigeiaWorkshop/GirlsFrontLine-LastWish/blob/master/LICENSE)**. However, all images and music used in this game are from third parties, and secondary distribution or commercialization without the authorization of the corresponding creators is strictly prohibited. Also, Tigeia Workshop (the developer of this game and Linpg engine) is not responsible for any disputes and damages caused by neither this game nor Linpg Engine. -**Note:** To fight back UW Bothell's controversial admission system for the CSSE program, any CSSE students and professors from the UW Bothell campus are prohibited from using anything from this repository without permission from the Tigeia Workshop development team. If you are a student or professor from UW Bothell and would like to know more about this requirement, feel free to reach out to the Tigeia Workshop development team by sending an email. This requirement does not apply to students and professors from Tacoma and Seattle campuses, as well as Non-CSSE students and professors from UW Bothell. - 本游戏的代码将采用 [GPL-3.0 License](https://github.com/TigeiaWorkshop/GirlsFrontLine-LastWish/blob/master/LICENSE) 进行分发，这意味着你可以商用我们的代码。然而，需要注意的是，本游戏用到的所有图片和音乐素材均来自第三方，严禁在没有对应创作者授权的情况下进行二次发布或者商用。同时，因使用该游戏或者linpg导致的任何形式的冲突（比如但不仅限法律冲突，经济冲突等）与缇吉娅工坊（本游戏和Linpg引擎的开发者）无关。 \ No newline at end of file From 02e378c34ae43b4e4b452ea6452662354af4c770 Mon Sep 17 00:00:00 2001 From: yudonglin Date: Fri, 24 Sep 2021 18:17:29 -0700 Subject: [PATCH 06/11] improve building tool using the latest version of linpgtoolkit --- Source/core/tbs.py | 5 +---- builder.py | 26 +++++++++++++++----------- compiler.py | 44 -------------------------------------------- 3 files changed, 16 insertions(+), 59 deletions(-) delete mode 100644 compiler.py diff --git a/Source/core/tbs.py b/Source/core/tbs.py index 516f5e74..5a440bf5 100644 --- a/Source/core/tbs.py +++ b/Source/core/tbs.py @@ -1243,10 +1243,7 @@ def __play_battle(self, screen: linpg.ImageSurface) -> None: name_from_by_pos = str(self.characterInControl.x) + "-" + str(self.characterInControl.y) if "move" in self._dialog_dictionary and name_from_by_pos in self._dialog_dictionary["move"]: dialog_to_check = self._dialog_dictionary["move"][name_from_by_pos] - if ( - "whitelist" not in dialog_to_check - or self.characterGetClick in dialog_to_check["whitelist"] - ): + if "whitelist" not in dialog_to_check or self.characterGetClick in dialog_to_check["whitelist"]: self.dialog_key = dialog_to_check["dialog_key"] self.__is_battle_mode = False # 如果对话不重复，则删除（默认不重复） diff --git a/builder.py b/builder.py index fa0ba8b1..7a03c664 100644 --- a/builder.py +++ b/builder.py @@ -1,31 +1,35 @@ -import os -import shutil +from shutil import move as MOVE +from subprocess import check_call +from linpgtoolkit import Builder -# 先编译游戏本体的py文件 -os.system("python compiler.py build_ext --inplace") +# 编译游戏本体 +Builder.delete_file_if_exist(r"Source_pyd") +Builder.delete_file_if_exist(r"src/Source/experimental") +Builder.compile("Source", ignore_key_words=("experimental",)) +Builder.delete_file_if_exist(r"src/Source/__init__.py") +MOVE(r"src/Source", r"Source_pyd") +Builder.delete_file_if_exist(r"src") # 确认是否想要打包 if input("Do you want to generate a package for the game(Y/n):") == "Y": # 检测pyinstaller是否需要升级 - os.system("python -m pip install --upgrade pyinstaller") + check_call(["python", "-m", "pip", "install", "--upgrade", "pyinstaller"]) # 更新所有第三方库 # os.system("pip list --outdated --format=freeze | grep -v '^\-e' | cut -d = -f 1 | xargs -n1 pip install -U") # 删除dist文件夹 - if os.path.exists("dist"): - shutil.rmtree("dist") + Builder.delete_file_if_exist("dist") # 打包main文件 dev_mode = input("If for dev purpose:") if dev_mode.lower() == "y": - os.system("pyinstaller main.spec") + check_call(["pyinstaller", "main.spec"]) else: - os.system("pyinstaller --noconsole main.spec") + check_call(["pyinstaller", "--noconsole", "main.spec"]) # 移除移除的缓存文件 folders_need_remove: tuple[str] = ("build", "logs", "__pycache__", "Source_pyd") for folder_p in folders_need_remove: - if os.path.exists(folder_p): - shutil.rmtree(folder_p) + Builder.delete_file_if_exist(folder_p) diff --git a/compiler.py b/compiler.py deleted file mode 100644 index 13f2012b..00000000 --- a/compiler.py +++ /dev/null @@ -1,44 +0,0 @@ -import os -import shutil -from distutils.core import setup -from glob import glob -from Cython.Build import cythonize - -# 参数 -debug_c: bool = False -folder_contain_source: str = "Source" -folder_for_build: str = "Source_pyd" - -# 生成用于存放pyd文件的文件夹 -if os.path.exists(folder_for_build): - shutil.rmtree(folder_for_build) -os.makedirs(folder_for_build) - -# 将所有即将需要编译的py文件复制过去 -for path in glob(os.path.join(folder_contain_source, "*")): - if os.path.isdir(path) and "experimental" not in path and "pycache" not in path: - shutil.copytree(path, os.path.join(folder_for_build, os.path.basename(path))) - elif path.endswith(".py"): - shutil.copy(path, folder_for_build) - -# 生成游戏本体源代码的c和pyd文件 -for path in glob(os.path.join(folder_for_build, "*")): - if os.path.isdir(path): - for file_path in glob(os.path.join(path, "*.py")): - setup(ext_modules=cythonize(file_path, language_level="3")) - # 删除py文件 - os.remove(file_path) - # 删除.c文件 - if not debug_c: - os.remove(file_path.replace(".py", ".c")) - elif path.endswith(".py"): - setup(ext_modules=cythonize(path, language_level="3")) - # 删除py文件 - os.remove(path) - # 删除.c文件 - if not debug_c: - os.remove(path.replace(".py", ".c")) - -# 删除build文件夹 -if os.path.exists("build"): - shutil.rmtree("build") From 005855924bb756084098fbf660ab609d85563b68 Mon Sep 17 00:00:00 2001 From: yudonglin Date: Thu, 30 Sep 2021 22:58:13 -0700 Subject: [PATCH 07/11] adding linpg version check and applying new text functions --- Data/version.yaml | 4 +++- Lang/English.yaml | 7 +++++++ Lang/SimplifiedChinese.yaml | 5 +++++ Source/base.py | 22 +++++++++++++++------- Source/core/__init__.py | 10 +++++----- Source/core/tbs.py | 6 +++--- Source/core/ui.py | 6 +++--- Source/mainMenu.py | 32 +++++++++++++++----------------- 8 files changed, 56 insertions(+), 36 deletions(-) diff --git a/Data/version.yaml b/Data/version.yaml index 67193f5a..59c69464 100644 --- a/Data/version.yaml +++ b/Data/version.yaml @@ -1,3 +1,5 @@ -patch: 5 +patch: 6 +recommended_linpg_patch: 4 +recommended_linpg_revision: 1 revision: 0 version: 0 diff --git a/Lang/English.yaml b/Lang/English.yaml index 0463b5fa..b97fe879 100644 --- a/Lang/English.yaml +++ b/Lang/English.yaml @@ -18,6 +18,13 @@ General: map_editor: Map Editor sangvis_ferri: Sangvis Ferri workshop: Workshop +LinpgVersionIncorrect: + continue_button: Continue, I know what I am doing + exit_button: No, I want to exit + message: The recommended version of Linpg for this building is {0}. However, Linpg + {1} is detected. Using an incompatible version of Linpg may result in crashing + and file damage, even when using a newer version of Linpg than the recommended + one. Do you want to continue? LoadingTxt: now_loading: Loading... now_loading_characters: Loading characters' data... diff --git a/Lang/SimplifiedChinese.yaml b/Lang/SimplifiedChinese.yaml index 2021847a..73647555 100644 --- a/Lang/SimplifiedChinese.yaml +++ b/Lang/SimplifiedChinese.yaml @@ -23,6 +23,11 @@ HealthyGamingAdvice: - 注意自我保护，谨防受骗上当。 - 适度游戏益脑，沉迷游戏伤身。 - 合理安排时间，享受健康生活。 +LinpgVersionIncorrect: + continue_button: 继续，我知道我在做什么 + exit_button: 不，我想退出 + message: 该构建的推荐Linpg引擎版本为{0}. 然而，检测到的Linpg版本为{1}. 使用不兼容的Linpg版本可能导致游戏崩溃或者存档损坏, 即使你使用的是比推荐版本更新的Linpg构建. + 你确定要继续运行游戏吗? LoadingTxt: now_loading: 正在加载 now_loading_characters: 正在加载角色信息... diff --git a/Source/base.py b/Source/base.py index b33fa39d..86b856a7 100644 --- a/Source/base.py +++ b/Source/base.py @@ -8,6 +8,21 @@ else: import linpg +# 加载版本信息 +version_info: dict = linpg.config.load("Data/version.yaml") + +if not linpg.info.ensure_linpg_version("==", version_info["recommended_linpg_revision"], version_info["recommended_linpg_patch"]): + warn_y = linpg.Message( + linpg.lang.get_text("Global", "warning"), + linpg.lang.get_text("LinpgVersionIncorrect", "message").format("3.{0}.{1}".format(version_info["recommended_linpg_revision"], version_info["recommended_linpg_patch"]),linpg.info.current_version), + (linpg.lang.get_text("LinpgVersionIncorrect", "exit_button"), linpg.lang.get_text("LinpgVersionIncorrect", "continue_button")), + error=True, + return_button=0, + escape_button=0 + ) + if warn_y.show() == 0: + linpg.display.quit() + __all__ = ["linpg", "os", "glob", "RPC", "ALPHA_BUILD_WARNING", "LARGE_IMAGE"] # 本游戏的客户端ID @@ -32,13 +47,6 @@ except Exception: RPC = None -# 加载版本信息 -version_info: dict = linpg.config.load("Data/version.yaml") -VERSION: int = version_info["version"] -REVISION: int = version_info["revision"] -PATCH: int = version_info["patch"] -del version_info - # 设置引擎的标准文字大小 linpg.font.set_global_font("medium", int(linpg.display.get_width() / 40)) diff --git a/Source/core/__init__.py b/Source/core/__init__.py index 68935887..d753bed4 100644 --- a/Source/core/__init__.py +++ b/Source/core/__init__.py @@ -9,7 +9,7 @@ def __init__(self) -> None: # 储存闸门动画的图片素材 self.__GateImgAbove: linpg.ImageSurface = None self.__GateImgBelow: linpg.ImageSurface = None - self.VEDIO_BACKGROUND = None + self.VIDEO_BACKGROUND = None # 画出加载ui def draw_loading_chapter_ui(self, screen: linpg.ImageSurface, percent: int) -> None: @@ -36,7 +36,7 @@ def dialog( # 开始加载-闸门关闭的效果 for i in range(101): self.draw_loading_chapter_ui(screen, i) - self.VEDIO_BACKGROUND.stop() + self.VIDEO_BACKGROUND.stop() # 卸载音乐 linpg.media.unload() # 初始化对话系统模块 @@ -60,7 +60,7 @@ def dialog( def dialogEditor( self, screen: linpg.ImageSurface, chapterType: str, chapterId: int, part: str, projectName: str = None ) -> None: - self.VEDIO_BACKGROUND.stop() + self.VIDEO_BACKGROUND.stop() # 卸载音乐 linpg.media.unload() # 改变标题 @@ -88,7 +88,7 @@ def dialogEditor( # 战斗系统 def battle(self, screen: linpg.ImageSurface, chapterType: str, chapterId: int, projectName: str = None) -> dict: - self.VEDIO_BACKGROUND.stop() + self.VIDEO_BACKGROUND.stop() # 卸载音乐 linpg.media.unload() BATTLE: object = TurnBasedBattleSystem() @@ -107,7 +107,7 @@ def battle(self, screen: linpg.ImageSurface, chapterType: str, chapterId: int, p # 地图编辑器 def mapEditor(self, screen: linpg.ImageSurface, chapterType: str, chapterId: int, projectName: str = None) -> None: - self.VEDIO_BACKGROUND.stop() + self.VIDEO_BACKGROUND.stop() # 卸载音乐 linpg.media.unload() MAP_EDITOR = MapEditor() diff --git a/Source/core/tbs.py b/Source/core/tbs.py index 5a440bf5..c0bd383e 100644 --- a/Source/core/tbs.py +++ b/Source/core/tbs.py @@ -137,9 +137,9 @@ def __process_data(self, screen: linpg.ImageSurface) -> None: self.FONT = linpg.font.create(self.window_x / 76) # 加载按钮的文字 self.selectMenuUI = SelectMenu() - self.battleModeUiTxt = linpg.lang.get_text("Battle_UI") + self.battleModeUiTxt = linpg.lang.get_texts("Battle_UI") self.warnings_to_display = WarningSystem(int(screen.get_height() * 0.03)) - loading_info = linpg.lang.get_text("LoadingTxt") + loading_info = linpg.lang.get_texts("LoadingTxt") # 加载剧情 DataTmp = linpg.config.load(self._DIALOG.get_dialog_file_location()) # 如果暂时没有翻译 @@ -410,7 +410,7 @@ def updated_language(self, screen: linpg.ImageSurface) -> None: super().updated_language() self._initialize_pause_menu() self.selectMenuUI = SelectMenu() - self.battleModeUiTxt = linpg.lang.get_text("Battle_UI") + self.battleModeUiTxt = linpg.lang.get_texts("Battle_UI") self.RoundSwitchUI = RoundSwitch(self.window_x, self.window_y, self.battleModeUiTxt) self.end_round_txt = self.FONT.render(linpg.lang.get_text("Battle_UI", "endRound"), linpg.color.WHITE) self.end_round_button = linpg.load.static_image( diff --git a/Source/core/ui.py b/Source/core/ui.py index 3824bbe2..5af5b21a 100644 --- a/Source/core/ui.py +++ b/Source/core/ui.py @@ -132,7 +132,7 @@ def draw(self, screen: linpg.ImageSurface, whose_round: str, total_rounds: int) class WarningSystem: def __init__(self, font_size: int = 30): self.__all_warnings: deque = deque() - self.__warnings_msg: dict = linpg.lang.get_text("Warnings") + self.__warnings_msg: dict = linpg.lang.get_texts("Warnings") self.font_size: int = font_size # 新增一个讯息 @@ -169,7 +169,7 @@ def draw(self, screen: linpg.ImageSurface) -> None: # 角色行动选项菜单 class SelectMenu: def __init__(self): - selectMenuTxtDic: dict = linpg.lang.get_text("SelectMenu") + selectMenuTxtDic: dict = linpg.lang.get_texts("SelectMenu") self.selectButtonImg = linpg.load.img("button.png") # 攻击 self.attackAP = linpg.AP_IS_NEEDED_TO_ATTACK @@ -415,7 +415,7 @@ def draw(self, screen: linpg.ImageSurface, theCharacterData: object) -> None: # 计分板 class ResultBoard: def __init__(self, finalResult: dict, font_size: int, is_win: bool = True): - resultTxt: dict = linpg.lang.get_text("ResultBoard") + resultTxt: dict = linpg.lang.get_texts("ResultBoard") self.x = int(font_size * 10) self.y = int(font_size * 10) self.txt_x = int(font_size * 12) diff --git a/Source/mainMenu.py b/Source/mainMenu.py index c101c7c5..b5d4e2c5 100644 --- a/Source/mainMenu.py +++ b/Source/mainMenu.py @@ -15,12 +15,10 @@ def __init__(self, screen: linpg.ImageSurface): self.loading_screen: linpg.ImageSurface = linpg.new_surface(screen.get_size()).convert() self.loading_screen.fill(linpg.color.BLACK) # 获取健康游戏忠告 - HealthyGamingAdvice = linpg.lang.try_to_get_text("HealthyGamingAdvice") - if HealthyGamingAdvice == "HealthyGamingAdvice": - HealthyGamingAdvice = [] - else: - for index in range(len(HealthyGamingAdvice)): - HealthyGamingAdvice[index] = linpg.font.render(HealthyGamingAdvice[index], "white", font_size) + HealthyGamingAdvice = [] + if linpg.lang.has_key("HealthyGamingAdvice"): + for text_t in linpg.lang.get_texts("HealthyGamingAdvice"): + HealthyGamingAdvice.append(linpg.font.render(text_t, "white", font_size)) # 其他载入页面需要的数据 text1 = linpg.font.render(linpg.lang.get_text("title1"), "white", font_size) text2 = linpg.font.render(linpg.lang.get_text("title2"), "white", font_size) @@ -76,8 +74,8 @@ def __init__(self, screen: linpg.ImageSurface): self.hover_sound_play_on = None self.last_hover_sound_play_on = None # 加载主菜单背景 - gamemode.VEDIO_BACKGROUND = linpg.VedioSurface(r"Assets/movie/SquadAR.mp4", True, True, (935, 3105)) - gamemode.VEDIO_BACKGROUND.set_volume(linpg.media.volume.background_music / 100.0) + gamemode.VIDEO_BACKGROUND = linpg.VideoSurface(r"Assets/movie/SquadAR.mp4", True, True, (935, 3105)) + gamemode.VIDEO_BACKGROUND.set_volume(linpg.media.volume.background_music / 100.0) # 初始化返回菜单判定参数 linpg.global_value.set("BackToMainMenu", False) # 设置Discord状态 @@ -339,7 +337,7 @@ def __continue_scene(self, screen: linpg.ImageSurface) -> None: # 重置背景 def __restart_background(self) -> None: - gamemode.VEDIO_BACKGROUND.restart() + gamemode.VIDEO_BACKGROUND.restart() self.updated_volume() # 更新主菜单的部分元素 @@ -348,7 +346,7 @@ def __reset_menu(self) -> None: # 是否可以继续游戏了（save文件是否被创建） if os.path.exists("Save/save.yaml") and not self.continueButtonIsOn: self.main_menu_txt["menu_main"]["0_continue"] = linpg.load.dynamic_text( - linpg.lang.get_text("MainMenu", "menu_main")["0_continue"], + linpg.lang.get_text("MainMenu", "menu_main", "0_continue"), linpg.color.WHITE, self.main_menu_txt["menu_main"]["0_continue"].get_pos(), linpg.font.get_global_font_size("medium"), @@ -356,7 +354,7 @@ def __reset_menu(self) -> None: self.continueButtonIsOn = True elif not os.path.exists("Save/save.yaml") and self.continueButtonIsOn is True: self.main_menu_txt["menu_main"]["0_continue"] = linpg.load.dynamic_text( - linpg.lang.get_text("MainMenu", "menu_main")["0_continue"], + linpg.lang.get_text("MainMenu", "menu_main", "0_continue"), linpg.color.GRAY, self.main_menu_txt["menu_main"]["0_continue"].get_pos(), linpg.font.get_global_font_size("medium"), @@ -365,7 +363,7 @@ def __reset_menu(self) -> None: # 重新加载主菜单文字 def __reset_menu_text(self, screen_size: tuple) -> None: - self.main_menu_txt = linpg.lang.get_text("MainMenu") + self.main_menu_txt = linpg.lang.get_texts("MainMenu") # 当前不可用的菜单选项 disabled_option = ["6_developer_team", "2_dlc", "4_collection"] if not os.path.exists("Save/save.yaml"): @@ -394,11 +392,11 @@ def __reset_menu_text(self, screen_size: tuple) -> None: ) txt_y += font_size # 加载退出确认消息框 - self.exit_confirm_menu = linpg.Message( + self.exit_confirm_menu: linpg.Message = linpg.Message( linpg.lang.get_text("Global", "tip"), linpg.lang.get_text("LeavingWithoutSavingWarning", "exit_confirm"), (linpg.lang.get_text("Global", "yes"), linpg.lang.get_text("Global", "no")), - True, + info=True, return_button=1, escape_button=1, ) @@ -417,7 +415,7 @@ def updated_language(self, screen: linpg.ImageSurface) -> None: def updated_volume(self) -> None: self.click_button_sound.set_volume(linpg.media.volume.effects / 100.0) self.hover_on_button_sound.set_volume(linpg.media.volume.effects / 100.0) - gamemode.VEDIO_BACKGROUND.set_volume(linpg.media.volume.background_music / 100.0) + gamemode.VIDEO_BACKGROUND.set_volume(linpg.media.volume.background_music / 100.0) # 画出背景 def __draw_background(self, screen: linpg.ImageSurface) -> None: @@ -444,7 +442,7 @@ def __draw_background(self, screen: linpg.ImageSurface) -> None: self.__cover_img_surface = None # 背景视频 if self.__cover_img_surface is None or self.__cover_img_surface.get_alpha() < 255: - gamemode.VEDIO_BACKGROUND.draw(screen) + gamemode.VIDEO_BACKGROUND.draw(screen) # 封面 if self.__cover_img_surface is not None: self.__cover_img_surface.draw(screen) @@ -495,7 +493,7 @@ def draw(self, screen: linpg.ImageSurface) -> None: pass # 退出 elif linpg.is_hover(self.main_menu_txt["menu_main"]["7_exit"]) and self.exit_confirm_menu.show() == 0: - gamemode.VEDIO_BACKGROUND.stop() + gamemode.VIDEO_BACKGROUND.stop() self.stop() if RPC is not None: RPC.close() From 89a877426633aa86e5ccda180d728a3ef0380be9 Mon Sep 17 00:00:00 2001 From: AnyLeftovers <37920527+yudonglin@users.noreply.github.com> Date: Wed, 13 Oct 2021 13:32:03 -0700 Subject: [PATCH 08/11] fix several small issues caused by the new linpg api changes --- .vscode/settings.json | 27 +++++++++++++++------------ Source/base.py | 16 ++++++++++++---- Source/core/editor.py | 15 ++++----------- Source/core/tbs.py | 6 +++--- Source/core/ui.py | 2 +- Source/mainMenu.py | 2 +- builder.py | 8 ++++++-- 7 files changed, 42 insertions(+), 34 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 245c947b..b1bc4071 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,19 +1,9 @@ { "cSpell.words": [ - "DOUBLEBUF", - "Ferri", - "Ferri's", - "JOYBUTTONUP", - "KEYUP", - "LCTRL", - "MOUSEBUTTONDOWN", - "MOUSEBUTTONUP", - "RGBA", - "SRCALPHA", - "Synari", - "Tigeia", "asval", "berrybush", + "blit", + "blits", "centerx", "chara", "cimport", @@ -25,8 +15,11 @@ "dinergate", "dizzys", "dont", + "DOUBLEBUF", "dtype", "elif", + "Ferri", + "Ferri's", "fname", "fnfnc", "fpath", @@ -35,13 +28,19 @@ "isin", "isinstance", "jiaose", + "JOYBUTTONUP", "kalina", + "KEYUP", + "Kryuger", + "LCTRL", "linpg", "linpgdev", "linpgtoolkit", "makedirs", "manticore", "maxsize", + "MOUSEBUTTONDOWN", + "MOUSEBUTTONUP", "moviepy", "ndarray", "nemeum", @@ -53,13 +52,17 @@ "pypresence", "qsize", "rbga", + "RGBA", "sangvis", "sfpsp", "simhei", + "SRCALPHA", "strftime", "surfarray", "swapaxes", + "Synari", "tcgc", + "Tigeia", "victoryloop", "waterbuds", "waterplant", diff --git a/Source/base.py b/Source/base.py index 86b856a7..c27428f2 100644 --- a/Source/base.py +++ b/Source/base.py @@ -11,14 +11,22 @@ # 加载版本信息 version_info: dict = linpg.config.load("Data/version.yaml") -if not linpg.info.ensure_linpg_version("==", version_info["recommended_linpg_revision"], version_info["recommended_linpg_patch"]): +if not linpg.info.ensure_linpg_version( + "==", version_info["recommended_linpg_revision"], version_info["recommended_linpg_patch"] +): warn_y = linpg.Message( linpg.lang.get_text("Global", "warning"), - linpg.lang.get_text("LinpgVersionIncorrect", "message").format("3.{0}.{1}".format(version_info["recommended_linpg_revision"], version_info["recommended_linpg_patch"]),linpg.info.current_version), - (linpg.lang.get_text("LinpgVersionIncorrect", "exit_button"), linpg.lang.get_text("LinpgVersionIncorrect", "continue_button")), + linpg.lang.get_text("LinpgVersionIncorrect", "message").format( + "3.{0}.{1}".format(version_info["recommended_linpg_revision"], version_info["recommended_linpg_patch"]), + linpg.info.current_version, + ), + ( + linpg.lang.get_text("LinpgVersionIncorrect", "exit_button"), + linpg.lang.get_text("LinpgVersionIncorrect", "continue_button"), + ), error=True, return_button=0, - escape_button=0 + escape_button=0, ) if warn_y.show() == 0: linpg.display.quit() diff --git a/Source/core/editor.py b/Source/core/editor.py index c62b9d86..d2fee81b 100644 --- a/Source/core/editor.py +++ b/Source/core/editor.py @@ -18,16 +18,9 @@ def __load_characters_data(self, mapFileData: dict) -> None: pass # 初始化 - def load( - self, - screen: linpg.ImageSurface, - chapterType: str, - chapterId: int, - projectName: str = None, - ) -> None: + def load(self, screen: linpg.ImageSurface, chapterType: str, chapterId: int, projectName: str = None) -> None: self._initialize(chapterType, chapterId, projectName) self.folder_for_save_file, self.name_for_save_file = os.path.split(self.get_map_file_location()) - self.decorations_setting = linpg.config.load("Data/database.yaml", "decorations") # 载入地图数据 mapFileData: dict = linpg.config.load(self.get_map_file_location()) # 初始化角色信息 @@ -303,10 +296,10 @@ def draw(self, screen: linpg.ImageSurface) -> None: # 上下滚轮-放大和缩小地图 if self.__UIContainerButtonRight.is_hover(): self.__UIContainerButtonRight.switch() - self.__UIContainerButtonRight.flip() + self.__UIContainerButtonRight.flip(True) elif self.__UIContainerButtonBottom.is_hover(): self.__UIContainerButtonBottom.switch() - self.__UIContainerButtonBottom.flip() + self.__UIContainerButtonBottom.flip(False, True) elif self.deleteMode is True and block_get_click is not None: # 查看当前位置是否有装饰物 decoration = self.MAP.find_decoration_on((block_get_click["x"], block_get_click["y"])) @@ -378,7 +371,7 @@ def draw(self, screen: linpg.ImageSurface) -> None: # 如果发现有冲突的装饰物 if decoration is not None: self.MAP.remove_decoration(decoration) - decorationType = self.decorations_setting[self.object_to_put_down["id"]] + decorationType = linpg.DataBase.get("Decorations")[self.object_to_put_down["id"]] if decorationType not in self.originalData["decoration"]: self.originalData["decoration"][decorationType] = {} the_id = 0 diff --git a/Source/core/tbs.py b/Source/core/tbs.py index c0bd383e..c2a51ff9 100644 --- a/Source/core/tbs.py +++ b/Source/core/tbs.py @@ -252,11 +252,11 @@ def __process_data(self, screen: linpg.ImageSurface) -> None: "orange": linpg.load.static_image(r"Assets/image/UI/range/orange.png", (0, 0)), } for key in self.range_ui_images: - self.range_ui_images[key].set_width_with_size_locked(self.MAP.block_width * 0.8) + self.range_ui_images[key].set_width_with_original_image_size_locked(self.MAP.block_width * 0.8) # 角色信息UI管理 self.characterInfoBoardUI = CharacterInfoBoard(self.window_x, self.window_y) # 加载用于渲染电影效果的上下黑色帘幕 - black_curtain = linpg.new_surface((self.window_x, self.window_y * 0.15)).convert() + black_curtain = linpg.new_surface((self.window_x, self.window_y * 0.15)) black_curtain.fill(linpg.color.BLACK) self.__up_black_curtain = linpg.MovableImage( black_curtain, @@ -1583,7 +1583,7 @@ def draw(self, screen: linpg.ImageSurface) -> None: ) # 根据block尺寸重新加载对应尺寸的UI for key in self.range_ui_images: - self.range_ui_images[key].set_width_with_size_locked(self.MAP.block_width * 0.8) + self.range_ui_images[key].set_width_with_original_image_size_locked(self.MAP.block_width * 0.8) self.selectMenuUI.allButton = None # 画出地图 self._display_map(screen) diff --git a/Source/core/ui.py b/Source/core/ui.py index 5af5b21a..dcf61ed7 100644 --- a/Source/core/ui.py +++ b/Source/core/ui.py @@ -459,7 +459,7 @@ def __init__( self, window_x: int, window_y: int, numChapter_txt: str, chapterId: int, chapterTitle_txt: str, chapterDesc_txt: str ): # 黑色Void帘幕 - black_surface_t = linpg.new_surface(linpg.display.get_size()).convert() + black_surface_t = linpg.new_surface(linpg.display.get_size()) black_surface_t.fill(linpg.color.BLACK) self.black_bg = linpg.StaticImage(black_surface_t, 0, 0, black_surface_t.get_width(), black_surface_t.get_height()) title_chapterNum = linpg.font.render(numChapter_txt.format(chapterId), "white", window_x / 38) diff --git a/Source/mainMenu.py b/Source/mainMenu.py index b5d4e2c5..da27e5b7 100644 --- a/Source/mainMenu.py +++ b/Source/mainMenu.py @@ -12,7 +12,7 @@ def __init__(self, screen: linpg.ImageSurface): """生成加载页面""" index: int = 0 font_size: int = int(screen.get_width() / 64) - self.loading_screen: linpg.ImageSurface = linpg.new_surface(screen.get_size()).convert() + self.loading_screen: linpg.ImageSurface = linpg.new_surface(screen.get_size()) self.loading_screen.fill(linpg.color.BLACK) # 获取健康游戏忠告 HealthyGamingAdvice = [] diff --git a/builder.py b/builder.py index 7a03c664..8ce969ed 100644 --- a/builder.py +++ b/builder.py @@ -1,5 +1,7 @@ from shutil import move as MOVE from subprocess import check_call + +import pkg_resources from linpgtoolkit import Builder # 编译游戏本体 @@ -14,10 +16,12 @@ if input("Do you want to generate a package for the game(Y/n):") == "Y": # 检测pyinstaller是否需要升级 - check_call(["python", "-m", "pip", "install", "--upgrade", "pyinstaller"]) + # check_call(["python", "-m", "pip", "install", "--upgrade", "pyinstaller"]) # 更新所有第三方库 - # os.system("pip list --outdated --format=freeze | grep -v '^\-e' | cut -d = -f 1 | xargs -n1 pip install -U") + check_call( + ["pip", "install", "--upgrade", " ".join([dist.project_name for dist in pkg_resources.working_set])], shell=True + ) # 删除dist文件夹 Builder.delete_file_if_exist("dist") From 1c96b95dcd15baeaf7ba789efc262a6ec70cddd0 Mon Sep 17 00:00:00 2001 From: AnyLeftovers <37920527+yudonglin@users.noreply.github.com> Date: Sun, 21 Nov 2021 20:25:28 -0800 Subject: [PATCH 09/11] fix issues relate to language update features and visibility --- README.md | 14 +++++++------- Source/core/editor.py | 39 +++++++++++++++++++++------------------ Source/core/tbs.py | 10 +++++----- Source/core/ui.py | 5 +++++ Source/mainMenu.py | 18 ++++++++++-------- builder.py | 10 +--------- 6 files changed, 49 insertions(+), 47 deletions(-) diff --git a/README.md b/README.md index 9590ad13..636ca831 100644 --- a/README.md +++ b/README.md @@ -76,13 +76,13 @@ Their stories may be forgotten by history, but what they have done will be remem # :computer: System Requirements / 系统需求 -| Type | 类型 | Minimum / 最低要求 | Recommended / 推荐配置 | -| ---------------- | -------- | ----------------------------------------- | ----------------------------------------- | -| Operating System | 操作系统 | Windows®10, MacOS, Ubuntu | Same as left | -| CPU | 处理器 | Intel® or AMD 1.2 GHz processor or better | Intel® or AMD 2.8 GHz processor or better | -| Memory | 内存 | 8 GB RAM | 16GB RAM | -| Graphics Cards | 显卡 | Any Nvidia or AMD Graphics Cards | Same as left | -| Storage | 硬盘空间 | 1.5 GB | 2 GB | +| Type | 类型 | Minimum / 最低要求 | Recommended / 推荐配置 | +| ---------------- | -------- | --------------------------------------- | ------------------------------------ | +| Operating System | 操作系统 | Windows® 10, MacOS 11, Ubuntu 20.04 LTS | Windows® 11, MacOS12, Ubuntu 21 | +| CPU | 处理器 | any Intel® or AMD 2+ GHz processor | Intel® or AMD 3+ GHz processor | +| Memory | 内存 | 8 GB RAM | 16GB RAM | +| Graphics Cards | 显卡 | GTX 960 or AMD RX 560 XT | GTX 1060 or AMD RX 5600 XT | +| Storage | 硬盘空间 | 1.5 GB of free hard drive space | 2 GB of free solid-state drive space | diff --git a/Source/core/editor.py b/Source/core/editor.py index d2fee81b..68948944 100644 --- a/Source/core/editor.py +++ b/Source/core/editor.py @@ -116,7 +116,7 @@ def load(self, screen: linpg.ImageSurface, chapterType: str, chapterId: int, pro ) self.__envImgContainer.set_item_per_line(4) self.__envImgContainer.set_scroll_bar_pos("right") - self.__envImgContainer.hidden = False + self.__envImgContainer.set_visible(True) self.__envImgContainer.distance_between_item = panding # 加载所有的装饰品 self.__decorationsImgContainer: object = linpg.SurfaceContainerWithScrollbar( @@ -134,7 +134,7 @@ def load(self, screen: linpg.ImageSurface, chapterType: str, chapterId: int, pro ) self.__decorationsImgContainer.set_item_per_line(4) self.__decorationsImgContainer.set_scroll_bar_pos("right") - self.__decorationsImgContainer.hidden = True + self.__decorationsImgContainer.set_visible(False) self.__decorationsImgContainer.distance_between_item = panding """加载下方的界面""" container_width = int(screen.get_width() * 0.8) @@ -198,7 +198,7 @@ def load(self, screen: linpg.ImageSurface, chapterType: str, chapterId: int, pro ), ) self.__charactersImgContainer.set_scroll_bar_pos("bottom") - self.__charactersImgContainer.hidden = False + self.__charactersImgContainer.set_visible(True) self.__charactersImgContainer.distance_between_item = panding # 加载所有敌对角色的图片文件 self.__sangvisFerrisImgContainer: object = linpg.SurfaceContainerWithScrollbar( @@ -221,7 +221,7 @@ def load(self, screen: linpg.ImageSurface, chapterType: str, chapterId: int, pro ), ) self.__sangvisFerrisImgContainer.set_scroll_bar_pos("bottom") - self.__sangvisFerrisImgContainer.hidden = True + self.__sangvisFerrisImgContainer.set_visible(False) self.__sangvisFerrisImgContainer.distance_between_item = panding # 绿色方块/方块标准 self.greenBlock = linpg.load.img("Assets/image/UI/range/green.png", (self.MAP.block_width * 0.8, None)) @@ -329,7 +329,7 @@ def draw(self, screen: linpg.ImageSurface) -> None: self.stop() break else: - self.__no_save_warning.hidden = False + self.__no_save_warning.set_visible(True) elif linpg.is_hover(self.UIButton["delete"]) and self.object_to_put_down is None and not self.deleteMode: self.object_to_put_down = None self.data_to_edit = None @@ -495,8 +495,8 @@ def draw(self, screen: linpg.ImageSurface) -> None: ) and linpg.controller.get_event("confirm") ): - self.__envImgContainer.hidden = False - self.__decorationsImgContainer.hidden = True + self.__envImgContainer.set_visible(True) + self.__decorationsImgContainer.set_visible(False) if ( linpg.is_hover( self.__button_select_decoration, @@ -504,18 +504,18 @@ def draw(self, screen: linpg.ImageSurface) -> None: ) and linpg.controller.get_event("confirm") ): - self.__envImgContainer.hidden = True - self.__decorationsImgContainer.hidden = False + self.__envImgContainer.set_visible(False) + self.__decorationsImgContainer.set_visible(True) self.__button_select_block.display(screen, (self.__UIContainerButtonRight.right, 0)) self.__button_select_decoration.display(screen, (self.__UIContainerButtonRight.right, 0)) if linpg.controller.get_event("confirm"): - if not self.__envImgContainer.hidden and self.__envImgContainer.item_being_hovered is not None: + if self.__envImgContainer.is_visible() and self.__envImgContainer.item_being_hovered is not None: self.object_to_put_down = { "type": "block", "id": self.__envImgContainer.item_being_hovered, } elif ( - not self.__decorationsImgContainer.hidden + self.__decorationsImgContainer.is_visible() and self.__decorationsImgContainer.item_being_hovered is not None ): self.object_to_put_down = { @@ -535,8 +535,8 @@ def draw(self, screen: linpg.ImageSurface) -> None: ) and linpg.controller.get_event("confirm") ): - self.__charactersImgContainer.hidden = False - self.__sangvisFerrisImgContainer.hidden = True + self.__charactersImgContainer.set_visible(True) + self.__sangvisFerrisImgContainer.set_visible(False) if ( linpg.is_hover( self.__button_select_sangvisFerri, @@ -544,18 +544,21 @@ def draw(self, screen: linpg.ImageSurface) -> None: ) and linpg.controller.get_event("confirm") ): - self.__charactersImgContainer.hidden = True - self.__sangvisFerrisImgContainer.hidden = False + self.__charactersImgContainer.set_visible(False) + self.__sangvisFerrisImgContainer.set_visible(True) self.__button_select_character.display(screen, (0, self.__UIContainerButtonBottom.bottom)) self.__button_select_sangvisFerri.display(screen, (0, self.__UIContainerButtonBottom.bottom)) if linpg.controller.get_event("confirm"): - if not self.__charactersImgContainer.hidden and self.__charactersImgContainer.item_being_hovered is not None: + if ( + self.__charactersImgContainer.is_visible() + and self.__charactersImgContainer.item_being_hovered is not None + ): self.object_to_put_down = { "type": "character", "id": self.__charactersImgContainer.item_being_hovered, } elif ( - not self.__sangvisFerrisImgContainer.hidden + self.__sangvisFerrisImgContainer.is_visible() and self.__sangvisFerrisImgContainer.item_being_hovered is not None ): self.object_to_put_down = { @@ -674,7 +677,7 @@ def draw(self, screen: linpg.ImageSurface) -> None: self.stop() # 取消 elif self.__no_save_warning.item_being_hovered == "cancel": - self.__no_save_warning.hidden = True + self.__no_save_warning.set_visible(False) # 不保存并离开 elif self.__no_save_warning.item_being_hovered == "dont_save": self.stop() diff --git a/Source/core/tbs.py b/Source/core/tbs.py index c2a51ff9..145fa99a 100644 --- a/Source/core/tbs.py +++ b/Source/core/tbs.py @@ -336,8 +336,8 @@ def __add_on_screen_object( self, image: linpg.ImageSurface, weight: int = -1, - pos: Iterable = linpg.pos.ORIGIN, - offSet: Iterable = linpg.pos.ORIGIN, + pos: Iterable = linpg.ORIGIN, + offSet: Iterable = linpg.ORIGIN, ) -> None: if weight < 0: self.__max_item_weight += 1 @@ -406,7 +406,7 @@ def _update_sound_volume(self) -> None: self.set_bgm_volume(linpg.media.volume.background_music / 100.0) # 更新语言 - def updated_language(self, screen: linpg.ImageSurface) -> None: + def updated_language(self) -> None: super().updated_language() self._initialize_pause_menu() self.selectMenuUI = SelectMenu() @@ -418,8 +418,8 @@ def updated_language(self, screen: linpg.ImageSurface) -> None: (self.window_x * 0.8, self.window_y * 0.7), (self.end_round_txt.get_width() * 2, self.end_round_txt.get_height() * 2.5), ) - self.warnings_to_display = WarningSystem(int(screen.get_height() * 0.03)) - self._DIALOG.updated_language(screen) + self.warnings_to_display.updated_language() + self._DIALOG.updated_language() # 警告某个角色周围的敌人 def __alert_enemy_around(self, name: str, value: int = 10) -> None: diff --git a/Source/core/ui.py b/Source/core/ui.py index dcf61ed7..bea84b0f 100644 --- a/Source/core/ui.py +++ b/Source/core/ui.py @@ -135,6 +135,11 @@ def __init__(self, font_size: int = 30): self.__warnings_msg: dict = linpg.lang.get_texts("Warnings") self.font_size: int = font_size + # 更新语言 + def updated_language(self): + self.__warnings_msg: dict = linpg.lang.get_texts("Warnings") + self.clear() + # 新增一个讯息 def add(self, the_warning: str) -> None: if len(self.__all_warnings) >= 5: diff --git a/Source/mainMenu.py b/Source/mainMenu.py index da27e5b7..821a7702 100644 --- a/Source/mainMenu.py +++ b/Source/mainMenu.py @@ -44,7 +44,7 @@ def __init__(self, screen: linpg.ImageSurface): for index in range(0, 250, int(2 * linpg.display.sfpsp)): screen.fill(linpg.color.BLACK) self.loading_screen.set_alpha(index) - screen.blit(self.loading_screen, linpg.pos.ORIGIN) + screen.blit(self.loading_screen, linpg.ORIGIN) linpg.display.flip() # 检测继续按钮是否可用的参数 self.continueButtonIsOn: bool = False @@ -294,12 +294,14 @@ def __load_scene(self, chapterType: str, chapterId: int, screen: linpg.ImageSurf # 继续章节 def __continue_scene(self, screen: linpg.ImageSurface) -> None: - SAVE: dict = linpg.config.load(r"Save/save.yaml") + SAVE: dict = dict(linpg.config.load("Save/save.yaml")) if RPC is not None: RPC.update( - details=linpg.lang.get_text("General", "main_chapter") - if SAVE["chapter_type"] == "main_chapter" - else linpg.lang.get_text("General", "workshop"), + details=( + linpg.lang.get_text("General", "main_chapter") + if SAVE["chapter_type"] == "main_chapter" + else linpg.lang.get_text("General", "workshop") + ), state=self.__get_chapter_title(SAVE["chapter_type"], SAVE["chapter_id"]), large_image=LARGE_IMAGE, start=get_current_time(), @@ -464,7 +466,7 @@ def draw(self, screen: linpg.ImageSurface) -> None: # 展示控制台 console.draw(screen) # 判断按键 - if linpg.controller.get_event("confirm") is True and linpg.option_menu.hidden is True: + if linpg.controller.get_event("confirm") is True and linpg.option_menu.is_hidden(): self.click_button_sound.play() # 主菜单 if self.menu_type == 0: @@ -487,7 +489,7 @@ def draw(self, screen: linpg.ImageSurface) -> None: pass # 设置 elif linpg.is_hover(self.main_menu_txt["menu_main"]["5_setting"]): - linpg.option_menu.hidden = False + linpg.option_menu.set_visible(True) # 制作组 elif linpg.is_hover(self.main_menu_txt["menu_main"]["6_developer_team"]): pass @@ -613,4 +615,4 @@ def draw(self, screen: linpg.ImageSurface) -> None: self.loading_screen = None else: self.loading_screen.set_alpha(max(0, alpha_t - int(5 * linpg.display.sfpsp))) - screen.blit(self.loading_screen, linpg.pos.ORIGIN) + screen.blit(self.loading_screen, linpg.ORIGIN) diff --git a/builder.py b/builder.py index 8ce969ed..d471ffb1 100644 --- a/builder.py +++ b/builder.py @@ -1,7 +1,5 @@ from shutil import move as MOVE from subprocess import check_call - -import pkg_resources from linpgtoolkit import Builder # 编译游戏本体 @@ -14,14 +12,8 @@ # 确认是否想要打包 if input("Do you want to generate a package for the game(Y/n):") == "Y": - - # 检测pyinstaller是否需要升级 - # check_call(["python", "-m", "pip", "install", "--upgrade", "pyinstaller"]) - # 更新所有第三方库 - check_call( - ["pip", "install", "--upgrade", " ".join([dist.project_name for dist in pkg_resources.working_set])], shell=True - ) + Builder.update_all_site_packages() # 删除dist文件夹 Builder.delete_file_if_exist("dist") From 8817a82157a561109054802fbe3cab54ed681781 Mon Sep 17 00:00:00 2001 From: AnyLeftovers <37920527+yudonglin@users.noreply.github.com> Date: Sun, 21 Nov 2021 22:25:09 -0800 Subject: [PATCH 10/11] Update README.md --- README.md | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 636ca831..7fe76c46 100644 --- a/README.md +++ b/README.md @@ -76,13 +76,21 @@ Their stories may be forgotten by history, but what they have done will be remem # :computer: System Requirements / 系统需求 -| Type | 类型 | Minimum / 最低要求 | Recommended / 推荐配置 | -| ---------------- | -------- | --------------------------------------- | ------------------------------------ | -| Operating System | 操作系统 | Windows® 10, MacOS 11, Ubuntu 20.04 LTS | Windows® 11, MacOS12, Ubuntu 21 | -| CPU | 处理器 | any Intel® or AMD 2+ GHz processor | Intel® or AMD 3+ GHz processor | -| Memory | 内存 | 8 GB RAM | 16GB RAM | -| Graphics Cards | 显卡 | GTX 960 or AMD RX 560 XT | GTX 1060 or AMD RX 5600 XT | -| Storage | 硬盘空间 | 1.5 GB of free hard drive space | 2 GB of free solid-state drive space | +| Type | 类型 | Minimum / 最低要求 | Recommended / 推荐配置 | +| ---------------- | -------- | --------------------------------------------------------- | ------------------------------------ | +| Operating System | 操作系统 | Windows® 10, Ubuntu 20.04 LTS | Windows® 11, Ubuntu 21 | +| CPU | 处理器 | any Intel® AMD 2+ GHz processor or AMD 2.5+ GHz processor | Intel® or AMD 3+ GHz processor | +| Memory | 内存 | 8 GB RAM | 16GB RAM | +| Graphics Cards | 显卡 | GTX 960 or AMD RX 580 XT | GTX 1060 or AMD RX 5800 XT | +| Storage | 硬盘空间 | 1.5 GB of free hard drive space | 2 GB of free solid-state drive space | + +***Q: Why are the requirements for AMD users slightly high?*** + +A: Due to global chip shortage (for both CPU and GPU), none of the developers in our development team are able to acquire one (without selling their organs or blood). As a result, we are not able to provide any hardware optimization for AMD hardware. If you want to donate or sell AMD hardware at a low price, don't hesitate to get in touch with us. + +***Q: Why is macOS not supported?*** + +A: Again, none of the developers in our development team has a device that can run Mac OS, so we cannot run testing on Mac OS. We assume the game "may" run just fine, but we cannot guarantee the stability due to a lack of testing. From abfe328808c536d513fae881baf6de3293aac9ee Mon Sep 17 00:00:00 2001 From: AnyLeftovers <37920527+yudonglin@users.noreply.github.com> Date: Sat, 27 Nov 2021 16:20:27 -0800 Subject: [PATCH 11/11] optimize action selection ui and switch from int dialog ids to str ones for better compatibility --- Assets/music/First_Kiss.mp3 | 3 - Assets/music/Only_for_you.mp3 | 3 - .../chapter1_dialogs_English.yaml | 70 +++--- .../chapter1_dialogs_SimplifiedChinese.yaml | 136 +++++----- Source/core/tbs.py | 100 ++++---- Source/core/ui.py | 232 +++++++----------- Source/mainMenu.py | 4 +- 7 files changed, 250 insertions(+), 298 deletions(-) delete mode 100644 Assets/music/First_Kiss.mp3 delete mode 100644 Assets/music/Only_for_you.mp3 diff --git a/Assets/music/First_Kiss.mp3 b/Assets/music/First_Kiss.mp3 deleted file mode 100644 index a69e81a0..00000000 --- a/Assets/music/First_Kiss.mp3 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:79bed5b20f494f3c0f443616a722cb9c8b9041eefdf55c20301c0352fc6a06e2 -size 2825428 diff --git a/Assets/music/Only_for_you.mp3 b/Assets/music/Only_for_you.mp3 deleted file mode 100644 index 4b650038..00000000 --- a/Assets/music/Only_for_you.mp3 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:93a3ce6dd3dabd256725119e5de481d1d1fcc417845e54de84185293d4a8bc6e -size 5240126 diff --git a/Data/main_chapter/chapter1_dialogs_English.yaml b/Data/main_chapter/chapter1_dialogs_English.yaml index 07d107a9..1fe27220 100644 --- a/Data/main_chapter/chapter1_dialogs_English.yaml +++ b/Data/main_chapter/chapter1_dialogs_English.yaml @@ -11,10 +11,10 @@ dialogs: head: content: - Ding...... - 1: + id_001: content: - Commander, according to the plan, this is not the time for us to have a conversation. - 2: + id_002: content: - I think you know better than I do about how urgent the situation is right now. @@ -22,57 +22,57 @@ dialogs: team - you were talking about would finally arrive. narrator: Me - 3: + id_003: content: - As I'm sure you're aware, the help I'm talking about has been right there with you all along. - But if I don't have the stuff, I won't let them go. - 4: + id_004: content: - Then I'd like to know why there was no mention of SangvisFerri in the documents which - were provided in the first place. narrator: Me - 5: + id_005: content: - SangvisFerri should not know about this, if I may say so. But as things stood, - someone on the inside must have leaked the information. - 6: + id_006: content: - If we don't get the support, I don't think my troops will be able to hold very long, - so how will we ever find what you're asking for? narrator: Me - 7: + id_007: content: - That's okay. Since the girls under your command can only do so much to support - you, then just keep going. I'll figure out the rest. - 8: + id_008: content: - End of communication. - 9: + id_009: content: - Damn it, I should have never accepted this commission in the first place. narrator: Me - 10: + id_010: content: - It's not your fault either... narrator: Kalina - 11: + id_011: content: - Now, let's just hope that sv-98 and the others will be back in time, and we'll think about - other things after that. narrator: Me - 12: + id_012: content: - And what if they don't make it back? narrator: Kalina - 13: + id_013: content: - Then... There's no other way... narrator: Me - 14: + id_014: content: - Thanks for trying out Girls' Frontline - Last Wish, more content is still in development, @@ -83,10 +83,10 @@ dialogs: - I have to admit, that I have thought about all kinds of situations that may occur - during the mission. - 1: + id_001: content: - But I didn't expect, that our mission will go south so quickly. - 2: + id_002: content: - Commander, SangvisFerri's attack is getting fiercer. If this continues, the remaining @@ -94,11 +94,11 @@ dialogs: the evacuation - procedure. narrator: Kalina - 3: + id_003: content: - Any good news about them? The tenth logistic unit... narrator: Me - 4: + id_004: content: - I haven't been able to get ahold of them, so i have no idea what's going on... - That's worrisome. If we keep this up, it is only a matter of time before SangvisFerri @@ -106,19 +106,19 @@ dialogs: narrator: Kalina next_dialog_id: target: - - id: 5 + - id: id_005 txt: What were the coordinates of the last call for help? type: option - 5: + id_005: content: - The latest communication shows that they were on a site 50 kilometers away. - However, it fell under SangvisFerri's control 13 hours ago. narrator: Kalina - 6: + id_006: content: - Can we send someone out to search the area? narrator: Me - 7: + id_007: content: - All operational troops are currently spread out on the first line of defense. - Not to mention breaking through, it's already fortunate to be able to block @@ -126,36 +126,36 @@ dialogs: - attack! If we pull out any force at this point, the defense will soon fall apart. narrator: Kalina - 8: + id_008: content: - Damn it, where's that backup we were talking about? And this is just an island with no - resources whatsoever! Why the National Security Bureau is so concerned? narrator: Me - 9: + id_009: content: - I don't really know. The commission only mentions that it's related to information - intercepted by the National Security Bureau. Other than that, no more information was - revealed. narrator: Kalina - 10: + id_010: content: - Kalina... narrator: Me - 11: + id_011: content: - Yes!? narrator: Kalina - 12: + id_012: content: - Please start the evacuation procedure. Then get me K. I need to talk to him. narrator: Me - 13: + id_013: content: - Okay, I'm on it. narrator: Kalina - 14: + id_014: content: - At the moment, I was very anxious, whether sv-98 and the others could make it back @@ -164,27 +164,27 @@ dialogs: - on this island that Griffin and even the National Security Bureau themselves don't even - know about yet. - 15: + id_015: content: - 24 hours ago. - 16: + id_016: content: - Asval, how is everything going so far? - 17: + id_017: content: - The commander has already sent a helicopter to pick us up. - We just need to clear the area in case there's an accident when the helicopter lands. - 18: + id_018: content: - Let's hurry up! As long as we can destroy all SangvisFerri's forces in the area before - the helicopters arrive, we'll be able to evacuate safely. - 19: + id_019: content: - Great! narrator: Other dolls - 20: + id_020: content: - Keep your voice down! It's not like SangvisFerri didn't have ears. dialog_during_battle: diff --git a/Data/main_chapter/chapter1_dialogs_SimplifiedChinese.yaml b/Data/main_chapter/chapter1_dialogs_SimplifiedChinese.yaml index 0179363e..71b9ab7b 100644 --- a/Data/main_chapter/chapter1_dialogs_SimplifiedChinese.yaml +++ b/Data/main_chapter/chapter1_dialogs_SimplifiedChinese.yaml @@ -17,9 +17,9 @@ dialogs: last_dialog_id: null narrator: null next_dialog_id: - target: 1 + target: id_001 type: default - 1: + id_001: background_img: research.jpg background_music: null characters_img: @@ -30,9 +30,9 @@ dialogs: last_dialog_id: head narrator: K next_dialog_id: - target: 2 + target: id_002 type: default - 2: + id_002: background_img: research.jpg background_music: null characters_img: @@ -44,9 +44,9 @@ dialogs: last_dialog_id: 1 narrator: 我 next_dialog_id: - target: 3 + target: id_003 type: default - 3: + id_003: background_img: research.jpg background_music: null characters_img: @@ -58,9 +58,9 @@ dialogs: last_dialog_id: 2 narrator: K next_dialog_id: - target: 4 + target: id_004 type: default - 4: + id_004: background_img: research.jpg background_music: null characters_img: @@ -71,9 +71,9 @@ dialogs: last_dialog_id: 3 narrator: 我 next_dialog_id: - target: 5 + target: id_005 type: default - 5: + id_005: background_img: research.jpg background_music: null characters_img: @@ -85,9 +85,9 @@ dialogs: last_dialog_id: 4 narrator: K next_dialog_id: - target: 6 + target: id_006 type: default - 6: + id_006: background_img: research.jpg background_music: null characters_img: @@ -98,9 +98,9 @@ dialogs: last_dialog_id: 5 narrator: 我 next_dialog_id: - target: 7 + target: id_007 type: default - 7: + id_007: background_img: research.jpg background_music: null characters_img: @@ -111,9 +111,9 @@ dialogs: last_dialog_id: 6 narrator: K next_dialog_id: - target: 8 + target: id_008 type: default - 8: + id_008: background_img: research.jpg background_music: null characters_img: @@ -123,9 +123,9 @@ dialogs: last_dialog_id: 7 narrator: null next_dialog_id: - target: 9 + target: id_009 type: default - 9: + id_009: background_img: research.jpg background_music: null characters_img: @@ -135,9 +135,9 @@ dialogs: last_dialog_id: 8 narrator: 我 next_dialog_id: - target: 10 + target: id_010 type: default - 10: + id_010: background_img: research.jpg background_music: null characters_img: @@ -147,9 +147,9 @@ dialogs: last_dialog_id: 9 narrator: 格林娜 next_dialog_id: - target: 11 + target: id_011 type: default - 11: + id_011: background_img: research.jpg background_music: null characters_img: @@ -159,9 +159,9 @@ dialogs: last_dialog_id: 10 narrator: 我 next_dialog_id: - target: 12 + target: id_012 type: default - 12: + id_012: background_img: research.jpg background_music: null characters_img: @@ -171,9 +171,9 @@ dialogs: last_dialog_id: 11 narrator: 格林娜 next_dialog_id: - target: 13 + target: id_013 type: default - 13: + id_013: background_img: research.jpg background_music: null characters_img: @@ -183,9 +183,9 @@ dialogs: last_dialog_id: 12 narrator: 我 next_dialog_id: - target: 14 + target: id_014 type: default - 14: + id_014: background_img: SlumpingFluid.mp4 background_music: null characters_img: null @@ -206,9 +206,9 @@ dialogs: last_dialog_id: null narrator: null next_dialog_id: - target: 1 + target: id_001 type: default - 1: + id_001: background_img: null background_music: null characters_img: null @@ -217,9 +217,9 @@ dialogs: last_dialog_id: head narrator: null next_dialog_id: - target: 2 + target: id_002 type: default - 2: + id_002: background_img: research.jpg background_music: BGM_Boss_1.ogg characters_img: @@ -230,9 +230,9 @@ dialogs: last_dialog_id: 1 narrator: 格林娜 next_dialog_id: - target: 3 + target: id_003 type: default - 3: + id_003: background_img: research.jpg background_music: BGM_Boss_1.ogg characters_img: @@ -243,9 +243,9 @@ dialogs: last_dialog_id: 2 narrator: 我 next_dialog_id: - target: 4 + target: id_004 type: default - 4: + id_004: background_img: research.jpg background_music: BGM_Boss_1.ogg characters_img: @@ -257,10 +257,10 @@ dialogs: narrator: 格林娜 next_dialog_id: target: - - id: 5 + - id: id_005 txt: 最后发出呼救的坐标在哪？ type: option - 5: + id_005: background_img: research.jpg background_music: BGM_Boss_1.ogg characters_img: @@ -271,9 +271,9 @@ dialogs: last_dialog_id: 4 narrator: 格林娜 next_dialog_id: - target: 6 + target: id_006 type: default - 6: + id_006: background_img: research.jpg background_music: BGM_Boss_1.ogg characters_img: @@ -283,9 +283,9 @@ dialogs: last_dialog_id: 5 narrator: 我 next_dialog_id: - target: 7 + target: id_007 type: default - 7: + id_007: background_img: research.jpg background_music: BGM_Boss_1.ogg characters_img: @@ -297,9 +297,9 @@ dialogs: last_dialog_id: 6 narrator: 格林娜 next_dialog_id: - target: 8 + target: id_008 type: default - 8: + id_008: background_img: research.jpg background_music: BGM_Boss_1.ogg characters_img: @@ -310,9 +310,9 @@ dialogs: last_dialog_id: 7 narrator: 我 next_dialog_id: - target: 9 + target: id_009 type: default - 9: + id_009: background_img: research.jpg background_music: BGM_Boss_1.ogg characters_img: @@ -323,9 +323,9 @@ dialogs: last_dialog_id: 8 narrator: 格林娜 next_dialog_id: - target: 10 + target: id_010 type: default - 10: + id_010: background_img: research.jpg background_music: BGM_Boss_1.ogg characters_img: @@ -335,9 +335,9 @@ dialogs: last_dialog_id: 9 narrator: 我 next_dialog_id: - target: 11 + target: id_011 type: default - 11: + id_011: background_img: research.jpg background_music: BGM_Boss_1.ogg characters_img: @@ -347,9 +347,9 @@ dialogs: last_dialog_id: 10 narrator: 格林娜 next_dialog_id: - target: 12 + target: id_012 type: default - 12: + id_012: background_img: research.jpg background_music: BGM_Boss_1.ogg characters_img: @@ -359,9 +359,9 @@ dialogs: last_dialog_id: 11 narrator: 我 next_dialog_id: - target: 13 + target: id_013 type: default - 13: + id_013: background_img: research.jpg background_music: BGM_Boss_1.ogg characters_img: @@ -371,9 +371,9 @@ dialogs: last_dialog_id: 12 narrator: 格林娜 next_dialog_id: - target: 14 + target: id_014 type: default - 14: + id_014: background_img: research.jpg background_music: BGM_Boss_1.ogg characters_img: null @@ -383,9 +383,9 @@ dialogs: last_dialog_id: 13 narrator: null next_dialog_id: - target: 15 + target: id_015 type: changeScene - 15: + id_015: background_img: snowfield.jpg background_music: BGM_Brain_1.ogg characters_img: null @@ -394,9 +394,9 @@ dialogs: last_dialog_id: null narrator: null next_dialog_id: - target: 16 + target: id_016 type: default - 16: + id_016: background_img: snowfield.jpg background_music: BGM_Brain_1.ogg characters_img: @@ -406,9 +406,9 @@ dialogs: last_dialog_id: 15 narrator: sv-98 next_dialog_id: - target: 17 + target: id_017 type: default - 17: + id_017: background_img: snowfield.jpg background_music: BGM_Brain_1.ogg characters_img: @@ -419,9 +419,9 @@ dialogs: last_dialog_id: 16 narrator: asval next_dialog_id: - target: 18 + target: id_018 type: default - 18: + id_018: background_img: snowfield.jpg background_music: BGM_Brain_1.ogg characters_img: @@ -432,9 +432,9 @@ dialogs: last_dialog_id: 17 narrator: asval next_dialog_id: - target: 19 + target: id_019 type: default - 19: + id_019: background_img: snowfield.jpg background_music: BGM_Brain_1.ogg characters_img: @@ -444,9 +444,9 @@ dialogs: last_dialog_id: 18 narrator: 众人 next_dialog_id: - target: 20 + target: id_020 type: default - 20: + id_020: background_img: snowfield.jpg background_music: BGM_Brain_1.ogg characters_img: diff --git a/Source/core/tbs.py b/Source/core/tbs.py index 145fa99a..8e988383 100644 --- a/Source/core/tbs.py +++ b/Source/core/tbs.py @@ -23,8 +23,8 @@ def __init__(self): self.enemiesGetAttack: dict = {} self.action_choice = None # 是否不要画出用于表示范围的方块 - self.__if_draw_range = True - self.areaDrawColorBlock: dict = { + self.__if_draw_range: bool = True + self.__areaDrawColorBlock: dict[str, list] = { "green": [], "red": [], "yellow": [], @@ -40,8 +40,6 @@ def __init__(self): self.rightClickCharacterAlpha = None # 技能对象 self.skill_target = None - # 被按到的按键 - self.buttonGetHover = None # 被救助的那个角色 self.friendGetHelp = None # AI系统正在操控的敌对角色ID @@ -409,7 +407,7 @@ def _update_sound_volume(self) -> None: def updated_language(self) -> None: super().updated_language() self._initialize_pause_menu() - self.selectMenuUI = SelectMenu() + self.selectMenuUI.update() self.battleModeUiTxt = linpg.lang.get_texts("Battle_UI") self.RoundSwitchUI = RoundSwitch(self.window_x, self.window_y, self.battleModeUiTxt) self.end_round_txt = self.FONT.render(linpg.lang.get_text("Battle_UI", "endRound"), linpg.color.WHITE) @@ -437,7 +435,7 @@ def __alert_enemy_around(self, name: str, value: int = 10) -> None: # 重置用于储存需要画出范围方块的字典 def reset_areaDrawColorBlock(self): - for value in self.areaDrawColorBlock.values(): + for value in self.__areaDrawColorBlock.values(): value.clear() # 切换回合 @@ -728,8 +726,8 @@ def __play_battle(self, screen: linpg.ImageSurface) -> None: self.zoomIntoBe -= 10 # 画出用彩色方块表示的范围 - for area in self.areaDrawColorBlock: - for position in self.areaDrawColorBlock[area]: + for area in self.__areaDrawColorBlock: + for position in self.__areaDrawColorBlock[area]: xTemp, yTemp = self.MAP.calPosInMap(position[0], position[1]) self.range_ui_images[area].set_pos(xTemp + self.MAP.block_width * 0.1, yTemp) self.range_ui_images[area].draw(screen) @@ -757,44 +755,50 @@ def __play_battle(self, screen: linpg.ImageSurface) -> None: self.characterInControl.try_reduce_action_point(len(self.the_route) * 2) self.characterInControl.move_follow(self.the_route) self.reset_areaDrawColorBlock() - elif self.__if_draw_range == "SelectMenu" and self.buttonGetHover == "attack": + elif self.selectMenuUI.item_being_hovered == "attack": if self.characterInControl.current_bullets > 0 and self.characterInControl.have_enough_action_point(5): self.action_choice = "attack" self.__if_draw_range = False + self.selectMenuUI.set_visible(False) elif self.characterInControl.current_bullets <= 0: self.warnings_to_display.add("magazine_is_empty") elif not self.characterInControl.have_enough_action_point(5): self.warnings_to_display.add("no_enough_ap_to_attack") - elif self.__if_draw_range == "SelectMenu" and self.buttonGetHover == "move": + elif self.selectMenuUI.item_being_hovered == "move": if self.characterInControl.have_enough_action_point(2): self.action_choice = "move" self.__if_draw_range = False + self.selectMenuUI.set_visible(False) else: self.warnings_to_display.add("no_enough_ap_to_move") - elif self.__if_draw_range == "SelectMenu" and self.buttonGetHover == "skill": + elif self.selectMenuUI.item_being_hovered == "skill": if self.characterInControl.have_enough_action_point(8): self.action_choice = "skill" self.__if_draw_range = False + self.selectMenuUI.set_visible(False) else: self.warnings_to_display.add("no_enough_ap_to_use_skill") - elif self.__if_draw_range == "SelectMenu" and self.buttonGetHover == "reload": + elif self.selectMenuUI.item_being_hovered == "reload": if self.characterInControl.have_enough_action_point(5) and self.characterInControl.bullets_carried > 0: self.action_choice = "reload" self.__if_draw_range = False + self.selectMenuUI.set_visible(False) elif self.characterInControl.bullets_carried <= 0: self.warnings_to_display.add("no_bullets_left") elif not self.characterInControl.have_enough_action_point(5): self.warnings_to_display.add("no_enough_ap_to_reload") - elif self.__if_draw_range == "SelectMenu" and self.buttonGetHover == "rescue": + elif self.selectMenuUI.item_being_hovered == "rescue": if self.characterInControl.have_enough_action_point(8): self.action_choice = "rescue" self.__if_draw_range = False + self.selectMenuUI.set_visible(False) else: self.warnings_to_display.add("no_enough_ap_to_rescue") - elif self.__if_draw_range == "SelectMenu" and self.buttonGetHover == "interact": + elif self.selectMenuUI.item_being_hovered == "interact": if self.characterInControl.have_enough_action_point(2): self.action_choice = "interact" self.__if_draw_range = False + self.selectMenuUI.set_visible(False) else: self.warnings_to_display.add("no_enough_ap_to_interact") # 攻击判定 @@ -886,10 +890,10 @@ def __play_battle(self, screen: linpg.ImageSurface) -> None: if decoration.type == "campfire" and self.alliances_data[key].near(decoration): self.thingsCanReact.append(index) index += 1 - self.__if_draw_range = "SelectMenu" + self.selectMenuUI.set_visible(True) break # 选择菜单的判定，显示功能在角色动画之后 - if self.__if_draw_range == "SelectMenu": + if self.selectMenuUI.is_visible() and self.characterGetClick is not None: # 移动画面以使得被点击的角色可以被更好的操作 tempX, tempY = self.MAP.calPosInMap(self.characterInControl.x, self.characterInControl.y) if self.screen_to_move_x is None: @@ -909,7 +913,7 @@ def __play_battle(self, screen: linpg.ImageSurface) -> None: block_get_click = self.MAP.calBlockInMap() # 显示移动范围 if self.action_choice == "move": - self.areaDrawColorBlock["green"].clear() + self.__areaDrawColorBlock["green"].clear() if block_get_click is not None: # 根据行动值计算最远可以移动的距离 max_blocks_can_move = int(self.characterInControl.current_action_point / 2) @@ -928,7 +932,7 @@ def __play_battle(self, screen: linpg.ImageSurface) -> None: ) if len(self.the_route) > 0: # 显示路径 - self.areaDrawColorBlock["green"] = self.the_route + self.__areaDrawColorBlock["green"] = self.the_route xTemp, yTemp = self.MAP.calPosInMap(self.the_route[-1][0], self.the_route[-1][1]) screen.blit( self.FONT.render(str(len(self.the_route) * 2), linpg.color.WHITE), @@ -941,9 +945,9 @@ def __play_battle(self, screen: linpg.ImageSurface) -> None: # 显示攻击范围 elif self.action_choice == "attack": attacking_range = self.characterInControl.getAttackRange(self.MAP) - self.areaDrawColorBlock["green"] = attacking_range["near"] - self.areaDrawColorBlock["blue"] = attacking_range["middle"] - self.areaDrawColorBlock["yellow"] = attacking_range["far"] + self.__areaDrawColorBlock["green"] = attacking_range["near"] + self.__areaDrawColorBlock["blue"] = attacking_range["middle"] + self.__areaDrawColorBlock["yellow"] = attacking_range["far"] if block_get_click is not None: the_attacking_range_area = [] for area in attacking_range: @@ -982,7 +986,7 @@ def __play_battle(self, screen: linpg.ImageSurface) -> None: break self.enemiesGetAttack.clear() if len(the_attacking_range_area) > 0: - self.areaDrawColorBlock["orange"] = the_attacking_range_area + self.__areaDrawColorBlock["orange"] = the_attacking_range_area for enemies in self.enemies_data: if ( self.enemies_data[enemies].pos in the_attacking_range_area @@ -1076,9 +1080,9 @@ def __play_battle(self, screen: linpg.ImageSurface) -> None: <= self.characterInControl.skill_effective_range["near"][1] ): skill_range["near"].append([x, y]) - self.areaDrawColorBlock["green"] = skill_range["near"] - self.areaDrawColorBlock["blue"] = skill_range["middle"] - self.areaDrawColorBlock["yellow"] = skill_range["far"] + self.__areaDrawColorBlock["green"] = skill_range["near"] + self.__areaDrawColorBlock["blue"] = skill_range["middle"] + self.__areaDrawColorBlock["yellow"] = skill_range["far"] block_get_click = self.MAP.calBlockInMap() if block_get_click is not None: the_skill_cover_area = [] @@ -1123,7 +1127,7 @@ def __play_battle(self, screen: linpg.ImageSurface) -> None: and self.MAP.ifBlockCanPassThrough({"x": x, "y": y}) ): the_skill_cover_area.append([x, y]) - self.areaDrawColorBlock["orange"] = the_skill_cover_area + self.__areaDrawColorBlock["orange"] = the_skill_cover_area self.skill_target = self.__skill( self.characterGetClick, { @@ -1164,10 +1168,10 @@ def __play_battle(self, screen: linpg.ImageSurface) -> None: # 无需换弹 else: self.warnings_to_display.add("magazine_is_full") - self.__if_draw_range = "SelectMenu" + self.selectMenuUI.set_visible(True) elif self.action_choice == "rescue": - self.areaDrawColorBlock["green"].clear() - self.areaDrawColorBlock["orange"].clear() + self.__areaDrawColorBlock["green"].clear() + self.__areaDrawColorBlock["orange"].clear() self.friendGetHelp = None for friendNeedHelp in self.friendsCanSave: if ( @@ -1175,26 +1179,26 @@ def __play_battle(self, screen: linpg.ImageSurface) -> None: and block_get_click["x"] == self.alliances_data[friendNeedHelp].x and block_get_click["y"] == self.alliances_data[friendNeedHelp].y ): - self.areaDrawColorBlock["orange"] = [(block_get_click["x"], block_get_click["y"])] + self.__areaDrawColorBlock["orange"] = [(block_get_click["x"], block_get_click["y"])] self.friendGetHelp = friendNeedHelp else: - self.areaDrawColorBlock["green"].append( + self.__areaDrawColorBlock["green"].append( ( self.alliances_data[friendNeedHelp].x, self.alliances_data[friendNeedHelp].y, ) ) elif self.action_choice == "interact": - self.areaDrawColorBlock["green"].clear() - self.areaDrawColorBlock["orange"].clear() + self.__areaDrawColorBlock["green"].clear() + self.__areaDrawColorBlock["orange"].clear() self.decorationGetClick = None for index in self.thingsCanReact: decoration = self.MAP.find_decoration_with_id(index) if block_get_click is not None and decoration.is_on_pos(block_get_click): - self.areaDrawColorBlock["orange"] = [(block_get_click["x"], block_get_click["y"])] + self.__areaDrawColorBlock["orange"] = [(block_get_click["x"], block_get_click["y"])] self.decorationGetClick = index else: - self.areaDrawColorBlock["green"].append((decoration.x, decoration.y)) + self.__areaDrawColorBlock["green"].append((decoration.x, decoration.y)) # 当有角色被点击时 if self.characterGetClick is not None and not self.__is_waiting: @@ -1381,9 +1385,9 @@ def __play_battle(self, screen: linpg.ImageSurface) -> None: self.range_ui_images["blue"].set_alpha(self.rightClickCharacterAlpha) self.range_ui_images["green"].set_alpha(self.rightClickCharacterAlpha) rangeCanAttack = value.getAttackRange(self.MAP) - self.areaDrawColorBlock["yellow"] = rangeCanAttack["far"] - self.areaDrawColorBlock["blue"] = rangeCanAttack["middle"] - self.areaDrawColorBlock["green"] = rangeCanAttack["near"] + self.__areaDrawColorBlock["yellow"] = rangeCanAttack["far"] + self.__areaDrawColorBlock["blue"] = rangeCanAttack["middle"] + self.__areaDrawColorBlock["green"] = rangeCanAttack["near"] value.draw(screen, self.MAP) else: value.draw_nothing() @@ -1442,9 +1446,9 @@ def __play_battle(self, screen: linpg.ImageSurface) -> None: self.range_ui_images["blue"].set_alpha(self.rightClickCharacterAlpha) self.range_ui_images["green"].set_alpha(self.rightClickCharacterAlpha) elif self.rightClickCharacterAlpha == 0: - self.areaDrawColorBlock["yellow"].clear() - self.areaDrawColorBlock["blue"].clear() - self.areaDrawColorBlock["green"].clear() + self.__areaDrawColorBlock["yellow"].clear() + self.__areaDrawColorBlock["blue"].clear() + self.__areaDrawColorBlock["green"].clear() self.range_ui_images["yellow"].set_alpha(255) self.range_ui_images["blue"].set_alpha(255) self.range_ui_images["green"].set_alpha(255) @@ -1457,12 +1461,9 @@ def __play_battle(self, screen: linpg.ImageSurface) -> None: for enemies in self.enemies_data: if self.MAP.isPosInLightArea(int(self.enemies_data[enemies].x), int(self.enemies_data[enemies].y)): self.enemies_data[enemies].drawUI(screen, self.MAP) - # 显示选择菜单 - if self.__if_draw_range == "SelectMenu": - # 左下角的角色信息 - self.characterInfoBoardUI.draw(screen, self.characterInControl) - # ----选择菜单---- - self.buttonGetHover = self.selectMenuUI.draw( + if self.characterGetClick is not None: + # 显示选择菜单 + self.selectMenuUI.draw( screen, round(self.MAP.block_width / 10), self.MAP.getBlockExactLocation(self.characterInControl.x, self.characterInControl.y), @@ -1470,6 +1471,9 @@ def __play_battle(self, screen: linpg.ImageSurface) -> None: self.friendsCanSave, self.thingsCanReact, ) + # 左下角的角色信息 + if self.selectMenuUI.is_visible(): + self.characterInfoBoardUI.draw(screen, self.characterInControl) # 展示天气 self._weather_system.draw(screen, self.MAP.block_width) # 移除电影视觉 @@ -1584,7 +1588,7 @@ def draw(self, screen: linpg.ImageSurface) -> None: # 根据block尺寸重新加载对应尺寸的UI for key in self.range_ui_images: self.range_ui_images[key].set_width_with_original_image_size_locked(self.MAP.block_width * 0.8) - self.selectMenuUI.allButton = None + self.selectMenuUI.update() # 画出地图 self._display_map(screen) # 游戏主循环 diff --git a/Source/core/ui.py b/Source/core/ui.py index bea84b0f..10f3e8e2 100644 --- a/Source/core/ui.py +++ b/Source/core/ui.py @@ -172,105 +172,39 @@ def draw(self, screen: linpg.ImageSurface) -> None: # 角色行动选项菜单 -class SelectMenu: - def __init__(self): - selectMenuTxtDic: dict = linpg.lang.get_texts("SelectMenu") +class SelectMenu(linpg.GameObjectsDictContainer): + def __init__(self) -> None: + super().__init__(None, 0, 0, 0, 0) self.selectButtonImg = linpg.load.img("button.png") - # 攻击 - self.attackAP = linpg.AP_IS_NEEDED_TO_ATTACK - self.attackTxt = selectMenuTxtDic["attack"] - self.attackAPTxt = str(self.attackAP) + " AP" - # 移动 - self.moveAP = linpg.AP_IS_NEEDED_TO_MOVE_ONE_BLOCK - self.moveTxt = selectMenuTxtDic["move"] - self.moveAPTxt = str(self.moveAP) + "N AP" - # 换弹 - self.reloadAP = 5 - self.reloadTxt = selectMenuTxtDic["reload"] - self.reloadAPTxt = str(self.reloadAP) + " AP" - # 技能 - self.skillAP = 8 - self.skillTxt = selectMenuTxtDic["skill"] - self.skillAPTxt = str(self.skillAP) + " AP" - # 救助 - self.rescueAP = 8 - self.rescueTxt = selectMenuTxtDic["rescue"] - self.rescueAPTxt = str(self.rescueAP) + " AP" - # 互动 - self.interactAP = 2 - self.interactTxt = selectMenuTxtDic["interact"] - self.interactAPTxt = str(self.interactAP) + " AP" - # 所有按钮 - self.allButton = None - - # 初始化按钮 - def initialButtons(self, fontSize: linpg.int_f) -> None: - selectButtonBase = linpg.transform.resize(self.selectButtonImg, (round(fontSize * 5), round(fontSize * 2.6))) - selectButtonBaseWidth = selectButtonBase.get_width() - sizeBig = int(fontSize) - sizeSmall = int(fontSize * 0.75) - self.allButton = { - "attack": selectButtonBase.copy(), - "move": selectButtonBase.copy(), - "reload": selectButtonBase.copy(), - "skill": selectButtonBase.copy(), - "rescue": selectButtonBase.copy(), - "interact": selectButtonBase.copy(), - } - # 攻击按钮 - txt_temp = linpg.font.render(self.attackTxt, "black", sizeBig) - txt_temp2 = linpg.font.render(self.attackAPTxt, "black", sizeSmall) - self.allButton["attack"].blit( - txt_temp, ((selectButtonBaseWidth - txt_temp.get_width()) / 2, txt_temp.get_height() * 0.15) - ) - self.allButton["attack"].blit( - txt_temp2, ((selectButtonBaseWidth - txt_temp2.get_width()) / 2, txt_temp.get_height() * 1.1) - ) - # 移动按钮 - txt_temp = linpg.font.render(self.moveTxt, "black", sizeBig) - txt_temp2 = linpg.font.render(self.moveAPTxt, "black", sizeSmall) - self.allButton["move"].blit( - txt_temp, ((selectButtonBaseWidth - txt_temp.get_width()) / 2, txt_temp.get_height() * 0.15) - ) - self.allButton["move"].blit( - txt_temp2, ((selectButtonBaseWidth - txt_temp2.get_width()) / 2, txt_temp.get_height() * 1.1) - ) - # 换弹按钮 - txt_temp = linpg.font.render(self.reloadTxt, "black", sizeBig) - txt_temp2 = linpg.font.render(self.reloadAPTxt, "black", sizeSmall) - self.allButton["reload"].blit( - txt_temp, ((selectButtonBaseWidth - txt_temp.get_width()) / 2, txt_temp.get_height() * 0.15) - ) - self.allButton["reload"].blit( - txt_temp2, ((selectButtonBaseWidth - txt_temp2.get_width()) / 2, txt_temp.get_height() * 1.1) - ) - # 技能按钮 - txt_temp = linpg.font.render(self.skillTxt, "black", sizeBig) - txt_temp2 = linpg.font.render(self.skillAPTxt, "black", sizeSmall) - self.allButton["skill"].blit( - txt_temp, ((selectButtonBaseWidth - txt_temp.get_width()) / 2, txt_temp.get_height() * 0.15) - ) - self.allButton["skill"].blit( - txt_temp2, ((selectButtonBaseWidth - txt_temp2.get_width()) / 2, txt_temp.get_height() * 1.1) - ) - # 救助按钮 - txt_temp = linpg.font.render(self.rescueTxt, "black", sizeBig) - txt_temp2 = linpg.font.render(self.rescueAPTxt, "black", sizeSmall) - self.allButton["rescue"].blit( - txt_temp, ((selectButtonBaseWidth - txt_temp.get_width()) / 2, txt_temp.get_height() * 0.15) - ) - self.allButton["rescue"].blit( - txt_temp2, ((selectButtonBaseWidth - txt_temp2.get_width()) / 2, txt_temp.get_height() * 1.1) - ) - # 互动按钮 - txt_temp = linpg.font.render(self.interactTxt, "black", sizeBig) - txt_temp2 = linpg.font.render(self.interactAPTxt, "black", sizeSmall) - self.allButton["interact"].blit( - txt_temp, ((selectButtonBaseWidth - txt_temp.get_width()) / 2, txt_temp.get_height() * 0.15) - ) - self.allButton["interact"].blit( - txt_temp2, ((selectButtonBaseWidth - txt_temp2.get_width()) / 2, txt_temp.get_height() * 1.1) + self._update( + { + # 攻击 + "attack": { + "button": None, + "ap": linpg.AP_IS_NEEDED_TO_ATTACK, + "ap_text": str(linpg.AP_IS_NEEDED_TO_ATTACK) + " AP", + }, + # 移动 + "move": { + "button": None, + "ap": linpg.AP_IS_NEEDED_TO_MOVE_ONE_BLOCK, + "ap_text": str(linpg.AP_IS_NEEDED_TO_MOVE_ONE_BLOCK) + "N AP", + }, + # 换弹 + "reload": {"button": None, "ap": 5, "ap_text": "5 AP"}, + # 技能 + "skill": {"button": None, "ap": 8, "ap_text": "8 AP"}, + # 救援 + "rescue": {"button": None, "ap": 8, "ap_text": "8 AP"}, + # 互动 + "interact": {"button": None, "ap": 2, "ap_text": "2 AP"}, + } ) + self.__need_update: bool = True + self.set_visible(False) + + def update(self) -> None: + self.__need_update = True # 将菜单按钮画出 def draw( @@ -282,51 +216,69 @@ def draw( friendsCanSave: list, thingsCanReact: list, ) -> str: - # 如果按钮没有初始化，则应该立刻初始化按钮 - if self.allButton is None: - self.initialButtons(fontSize) - buttonGetHover: str = "" - selectButtonBaseWidth = round(fontSize * 5) - # 攻击按钮 - 左 - txt_tempX = location["xStart"] - selectButtonBaseWidth * 0.6 - txt_tempY = location["yStart"] - if linpg.is_hover(self.allButton["attack"], (txt_tempX, txt_tempY)): - buttonGetHover = "attack" - screen.blit(self.allButton["attack"], (txt_tempX, txt_tempY)) - # 移动按钮 - 右 - txt_tempX = location["xEnd"] - selectButtonBaseWidth * 0.4 - # txt_tempY 与攻击按钮一致 - if linpg.is_hover(self.allButton["move"], (txt_tempX, txt_tempY)): - buttonGetHover = "move" - screen.blit(self.allButton["move"], (txt_tempX, txt_tempY)) - # 换弹按钮 - 下 - txt_tempX = location["xStart"] + selectButtonBaseWidth * 0.5 - txt_tempY = location["yEnd"] - selectButtonBaseWidth * 0.25 - if linpg.is_hover(self.allButton["reload"], (txt_tempX, txt_tempY)): - buttonGetHover = "reload" - screen.blit(self.allButton["reload"], (txt_tempX, txt_tempY)) - # 技能按钮 - 上 - if kind != "HOC": - # txt_tempX与换弹按钮一致 - txt_tempY = location["yStart"] - selectButtonBaseWidth * 0.7 - if linpg.is_hover(self.allButton["skill"], (txt_tempX, txt_tempY)): - buttonGetHover = "skill" - screen.blit(self.allButton["skill"], (txt_tempX, txt_tempY)) - # 救助队友 - if len(friendsCanSave) > 0: + self._item_being_hovered = None + if self.is_visible(): + # 如果按钮没有初始化，则应该立刻初始化按钮 + if self.__need_update is True: + selectButtonBase = linpg.transform.resize(self.selectButtonImg, (round(fontSize * 5), round(fontSize * 2.6))) + big_font_size: int = int(fontSize) + small_font_size: int = int(fontSize * 0.75) + selectMenuTxtDict: dict = linpg.lang.get_texts("SelectMenu") + panding: int = int(fontSize / 10) + for key in self.keys(): + button_data_t = self.get(key) + button_data_t["button"] = selectButtonBase.copy() + txt_temp = linpg.font.render(selectMenuTxtDict[key], "black", big_font_size) + txt_temp2 = linpg.font.render(button_data_t["ap_text"], "black", small_font_size) + top: int = int( + (selectButtonBase.get_height() - txt_temp.get_height() - txt_temp2.get_height() - panding) / 2 + ) + button_data_t["button"].blit(txt_temp, ((selectButtonBase.get_width() - txt_temp.get_width()) / 2, top)) + button_data_t["button"].blit( + txt_temp2, + ((selectButtonBase.get_width() - txt_temp2.get_width()) / 2, top + panding + txt_temp.get_height()), + ) + self.__need_update = False + selectButtonBaseWidth = round(fontSize * 5) + # 攻击按钮 - 左 txt_tempX = location["xStart"] - selectButtonBaseWidth * 0.6 - txt_tempY = location["yStart"] - selectButtonBaseWidth * 0.7 - if linpg.is_hover(self.allButton["rescue"], (txt_tempX, txt_tempY)): - buttonGetHover = "rescue" - screen.blit(self.allButton["rescue"], (txt_tempX, txt_tempY)) - # 互动 - if len(thingsCanReact) > 0: + txt_tempY = location["yStart"] + if linpg.is_hover(self.get("attack")["button"], (txt_tempX, txt_tempY)): + self._item_being_hovered = "attack" + screen.blit(self.get("attack")["button"], (txt_tempX, txt_tempY)) + # 移动按钮 - 右 txt_tempX = location["xEnd"] - selectButtonBaseWidth * 0.4 - txt_tempY = location["yStart"] - selectButtonBaseWidth * 0.7 - if linpg.is_hover(self.allButton["interact"], (txt_tempX, txt_tempY)): - buttonGetHover = "interact" - screen.blit(self.allButton["interact"], (txt_tempX, txt_tempY)) - return buttonGetHover + # txt_tempY 与攻击按钮一致 + if linpg.is_hover(self.get("move")["button"], (txt_tempX, txt_tempY)): + self._item_being_hovered = "move" + screen.blit(self.get("move")["button"], (txt_tempX, txt_tempY)) + # 换弹按钮 - 下 + txt_tempX = location["xStart"] + selectButtonBaseWidth * 0.5 + txt_tempY = location["yEnd"] - selectButtonBaseWidth * 0.25 + if linpg.is_hover(self.get("reload")["button"], (txt_tempX, txt_tempY)): + self._item_being_hovered = "reload" + screen.blit(self.get("reload")["button"], (txt_tempX, txt_tempY)) + # 技能按钮 - 上 + if kind != "HOC": + # txt_tempX与换弹按钮一致 + txt_tempY = location["yStart"] - selectButtonBaseWidth * 0.7 + if linpg.is_hover(self.get("skill")["button"], (txt_tempX, txt_tempY)): + self._item_being_hovered = "skill" + screen.blit(self.get("skill")["button"], (txt_tempX, txt_tempY)) + # 救助队友 + if len(friendsCanSave) > 0: + txt_tempX = location["xStart"] - selectButtonBaseWidth * 0.6 + txt_tempY = location["yStart"] - selectButtonBaseWidth * 0.7 + if linpg.is_hover(self.get("rescue")["button"], (txt_tempX, txt_tempY)): + self._item_being_hovered = "rescue" + screen.blit(self.get("rescue")["button"], (txt_tempX, txt_tempY)) + # 互动 + if len(thingsCanReact) > 0: + txt_tempX = location["xEnd"] - selectButtonBaseWidth * 0.4 + txt_tempY = location["yStart"] - selectButtonBaseWidth * 0.7 + if linpg.is_hover(self.get("interact")["button"], (txt_tempX, txt_tempY)): + self._item_being_hovered = "interact" + screen.blit(self.get("interact")["button"], (txt_tempX, txt_tempY)) # 角色信息板 diff --git a/Source/mainMenu.py b/Source/mainMenu.py index 821a7702..d247ec4a 100644 --- a/Source/mainMenu.py +++ b/Source/mainMenu.py @@ -74,7 +74,9 @@ def __init__(self, screen: linpg.ImageSurface): self.hover_sound_play_on = None self.last_hover_sound_play_on = None # 加载主菜单背景 - gamemode.VIDEO_BACKGROUND = linpg.VideoSurface(r"Assets/movie/SquadAR.mp4", True, True, (935, 3105)) + gamemode.VIDEO_BACKGROUND = linpg.VideoSurface( + r"Assets/movie/SquadAR.mp4", True, not linpg.setting.developer_mode, (935, 3105) + ) gamemode.VIDEO_BACKGROUND.set_volume(linpg.media.volume.background_music / 100.0) # 初始化返回菜单判定参数 linpg.global_value.set("BackToMainMenu", False)