Merge branch 'main' of https://github.com/MAWHA/MWA

MAWHA · Sep 24, 2024 · 158a13d · 158a13d
2 parents 09ff945 + 016e7d8
commit 158a13d
Show file tree

Hide file tree

Showing 15 changed files with 464 additions and 10 deletions.
diff --git a/assets/resource_picli/base/image/Research2/add_people.png b/assets/resource_picli/base/image/Research2/add_people.png
diff --git a/assets/resource_picli/base/image/Research2/auto.png b/assets/resource_picli/base/image/Research2/auto.png
diff --git a/assets/resource_picli/base/image/Research2/begin_fight.png b/assets/resource_picli/base/image/Research2/begin_fight.png
diff --git a/assets/resource_picli/base/image/Research2/boss.png b/assets/resource_picli/base/image/Research2/boss.png
diff --git a/assets/resource_picli/base/image/Research2/buff.png b/assets/resource_picli/base/image/Research2/buff.png
diff --git a/assets/resource_picli/base/image/Research2/continue.png b/assets/resource_picli/base/image/Research2/continue.png
diff --git a/assets/resource_picli/base/image/Research2/ensure_2.png b/assets/resource_picli/base/image/Research2/ensure_2.png
diff --git a/assets/resource_picli/base/image/Research2/fight.png b/assets/resource_picli/base/image/Research2/fight.png
diff --git a/assets/resource_picli/base/image/Research2/fight_2.png b/assets/resource_picli/base/image/Research2/fight_2.png
diff --git a/assets/resource_picli/base/image/Research2/import.png b/assets/resource_picli/base/image/Research2/import.png
diff --git a/assets/resource_picli/base/image/Research2/new_buff.png b/assets/resource_picli/base/image/Research2/new_buff.png
diff --git a/assets/resource_picli/base/image/Research2/rest.png b/assets/resource_picli/base/image/Research2/rest.png
diff --git a/assets/resource_picli/base/pipeline/11_2_goldresearch.json b/assets/resource_picli/base/pipeline/11_2_goldresearch.json
diff --git a/res.zip b/res.zip
diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-169
+177