Browse Source

Merge branch 'dev' of GooseHouse/game-client into master

Ivan Arkhipov 6 years ago
parent
commit
9c85919e71
100 changed files with 148 additions and 12 deletions
  1. 11 12
      README.md
  2. 137 0
      assets/Filling traits.py
  3. BIN
      assets/common/5f9d1323434921.56323324063cc.gif
  4. BIN
      assets/common/703b279e128a9a0c1d754800957f191a8f595845_hq.gif
  5. BIN
      assets/common/ImprobableGivingAlbertosaurus.gif
  6. BIN
      assets/common/background.jpg
  7. 0 0
      assets/common/battle_bg/CmBkCF.png
  8. 0 0
      assets/common/battle_bg/CmBkCur.png
  9. 0 0
      assets/common/battle_bg/CmBkDeck.png
  10. 0 0
      assets/common/battle_bg/CmBkDes.png
  11. 0 0
      assets/common/battle_bg/CmBkDrDd.png
  12. 0 0
      assets/common/battle_bg/CmBkDrMt.png
  13. 0 0
      assets/common/battle_bg/CmBkDrTr.png
  14. 0 0
      assets/common/battle_bg/CmBkGrMt.png
  15. 0 0
      assets/common/battle_bg/CmBkGrTr.png
  16. 0 0
      assets/common/battle_bg/CmBkHG.png
  17. 0 0
      assets/common/battle_bg/CmBkLava.png
  18. 0 0
      assets/common/battle_bg/CmBkMag.png
  19. 0 0
      assets/common/battle_bg/CmBkRK.png
  20. 0 0
      assets/common/battle_bg/CmBkRgh.png
  21. 0 0
      assets/common/battle_bg/CmBkSnMt.png
  22. 0 0
      assets/common/battle_bg/CmBkSnTr.png
  23. 0 0
      assets/common/battle_bg/CmBkSub.png
  24. 0 0
      assets/common/battle_bg/CmBkSwmp.png
  25. 0 0
      assets/common/battle_bg/OBBHL02.png
  26. 0 0
      assets/common/battle_bg/OBBHL03.png
  27. 0 0
      assets/common/battle_bg/OBBHL05.png
  28. 0 0
      assets/common/battle_bg/OBBHL06.png
  29. 0 0
      assets/common/battle_bg/OBBHL14.png
  30. 0 0
      assets/common/battle_bg/OBBHL16.png
  31. 0 0
      assets/common/battle_bg/OBLvL02.png
  32. 0 0
      assets/common/battle_bg/OBRGL01.png
  33. 0 0
      assets/common/battle_bg/OBRGL02.png
  34. 0 0
      assets/common/battle_bg/OBRGL03.png
  35. 0 0
      assets/common/battle_bg/OBRGL04.png
  36. 0 0
      assets/common/battle_bg/OBRGL05.png
  37. 0 0
      assets/common/battle_bg/OBRGL06.png
  38. 0 0
      assets/common/battle_bg/OBSNL01.png
  39. 0 0
      assets/common/battle_bg/OBSNL14.png
  40. 0 0
      assets/common/battle_bg/OBSWL22.png
  41. 0 0
      assets/common/battle_bg/ObBhS02.png
  42. 0 0
      assets/common/battle_bg/ObBhS03.png
  43. 0 0
      assets/common/battle_bg/ObBhS04.png
  44. 0 0
      assets/common/battle_bg/ObBhS11a.png
  45. 0 0
      assets/common/battle_bg/ObBhS12b.png
  46. 0 0
      assets/common/battle_bg/ObBhS14b.png
  47. 0 0
      assets/common/battle_bg/ObBhS16a.png
  48. 0 0
      assets/common/battle_bg/ObBtS04.png
  49. 0 0
      assets/common/battle_bg/ObCFL00.png
  50. 0 0
      assets/common/battle_bg/ObCFs00.png
  51. 0 0
      assets/common/battle_bg/ObCFs01.png
  52. 0 0
      assets/common/battle_bg/ObCFs02.png
  53. 0 0
      assets/common/battle_bg/ObCFs03.png
  54. 0 0
      assets/common/battle_bg/ObDRk01.png
  55. 0 0
      assets/common/battle_bg/ObDRk02.png
  56. 0 0
      assets/common/battle_bg/ObDRk03.png
  57. 0 0
      assets/common/battle_bg/ObDRk04.png
  58. 0 0
      assets/common/battle_bg/ObDSM01.png
  59. 0 0
      assets/common/battle_bg/ObDSM02.png
  60. 0 0
      assets/common/battle_bg/ObDSS17.png
  61. 0 0
      assets/common/battle_bg/ObDSh01.png
  62. 0 0
      assets/common/battle_bg/ObDSs02.png
  63. 0 0
      assets/common/battle_bg/ObDTF03.png
  64. 0 0
      assets/common/battle_bg/ObDino1.png
  65. 0 0
      assets/common/battle_bg/ObDino2.png
  66. 0 0
      assets/common/battle_bg/ObDino3.png
  67. 0 0
      assets/common/battle_bg/ObDtL02.png
  68. 0 0
      assets/common/battle_bg/ObDtL03.png
  69. 0 0
      assets/common/battle_bg/ObDtL04.png
  70. 0 0
      assets/common/battle_bg/ObDtL06.png
  71. 0 0
      assets/common/battle_bg/ObDtL10.png
  72. 0 0
      assets/common/battle_bg/ObDtS03.png
  73. 0 0
      assets/common/battle_bg/ObDtS04.png
  74. 0 0
      assets/common/battle_bg/ObDtS14.png
  75. 0 0
      assets/common/battle_bg/ObDtS15.png
  76. 0 0
      assets/common/battle_bg/ObEFs00.png
  77. 0 0
      assets/common/battle_bg/ObEFs01.png
  78. 0 0
      assets/common/battle_bg/ObEFs02.png
  79. 0 0
      assets/common/battle_bg/ObEFs03.png
  80. 0 0
      assets/common/battle_bg/ObEFs04.png
  81. 0 0
      assets/common/battle_bg/ObFFL00.png
  82. 0 0
      assets/common/battle_bg/ObFFs00.png
  83. 0 0
      assets/common/battle_bg/ObFFs01.png
  84. 0 0
      assets/common/battle_bg/ObFFs02.png
  85. 0 0
      assets/common/battle_bg/ObFFs03.png
  86. 0 0
      assets/common/battle_bg/ObFFs04.png
  87. 0 0
      assets/common/battle_bg/ObGLg01.png
  88. 0 0
      assets/common/battle_bg/ObGRk01.png
  89. 0 0
      assets/common/battle_bg/ObGRk02.png
  90. 0 0
      assets/common/battle_bg/ObGSt01.png
  91. 0 0
      assets/common/battle_bg/ObGrS01.png
  92. 0 0
      assets/common/battle_bg/ObGrS02.png
  93. 0 0
      assets/common/battle_bg/ObGrS03.png
  94. 0 0
      assets/common/battle_bg/ObHGs00.png
  95. 0 0
      assets/common/battle_bg/ObHGs01.png
  96. 0 0
      assets/common/battle_bg/ObHGs02.png
  97. 0 0
      assets/common/battle_bg/ObHGs03.png
  98. 0 0
      assets/common/battle_bg/ObHGs04.png
  99. 0 0
      assets/common/battle_bg/ObLPL00.png
  100. 0 0
      assets/common/battle_bg/ObLPs00.png

+ 11 - 12
README.md

@@ -38,20 +38,19 @@ dpkg -i ./goosehouse-game.deb
 ```
 
 
-## Ветки развития юнитов расы людей:
+## Структура папок проекта:
 
-### Ветка Лучника
-![image](http://git.gi1dor.ru/GooseHouse/game-client/raw/master/assets/unittrees/human-archer.png)
+#### Папка *assets* : 
+В этой папке содержатся все графические файлы, связанные с проектом. Часть из них (версии для деплоя) собираются в специальные файлы ресурсов для каждой сцены, которые загружаются вместе со сценой.
 
-### Ветка Мага
-![image](http://git.gi1dor.ru/GooseHouse/game-client/raw/master/assets/unittrees/human-mage.png)
+#### Папка *include* :
+Эта папка содержит в себе все .h файлы приложения - все интерфейсы классов приложения (исключения - .h файлы, связанные с .ui сценами, они хранятся вместе с этими сценами)
 
-### Ветка Всадника
-![image](http://git.gi1dor.ru/GooseHouse/game-client/raw/master/assets/unittrees/human-rider.png)
+#### Папка *source* :
+Здесь находятся все файлы реализации классов приложения, кроме тех, что завязаны на .ui файлах (аналогично с .h файлами, последние хранятся вместе с .ui сценами)
 
-### Ветка Изгоя
-![image](http://git.gi1dor.ru/GooseHouse/game-client/raw/master/assets/unittrees/human-rogue.png)
-
-### Ветка Воина 
-![image](http://git.gi1dor.ru/GooseHouse/game-client/raw/master/assets/unittrees/human-warrior.png)
+#### Папка *ui* : 
+В папке ui размещены все файлы графических сцен проекта. Каждая сцена состоит из 3-х файлов - .ui, .cpp и .h. Одна логическая сцена (главное меню, к примеру), может состоять из нескольких физических, которые накладываются друг на друга (сцена анимированного фона, сцена меню, расположенного по центру)
 
+#### Папка *res* :
+В ней находятся специальные файлы .qrc, содержащие информацию о тех файлах из */аssets*, которые будут собраны в файл ресурсов.

+ 137 - 0
assets/Filling traits.py

@@ -0,0 +1,137 @@
+import sys
+import os
+import argparse
+import math
+
+parser = argparse.ArgumentParser()
+parser.add_argument('-dir', '--directory', '--game-directory', dest='game_dir',
+                    help='set path of GAME_DIR', required=True)
+
+print("Type arguments and tap enter. If there are not any arguments tap enter with empty string")
+print("Use -h or --help to get list of arguments")
+args = parser.parse_args(input().split())
+path_to_game = args.game_dir
+
+
+def get_lvl(path):
+    lvl = 0
+    for file in os.listdir(path=path):
+        if file == 'unitname.txt':
+            cur_file = open(path + '\\' + file, 'r')
+            # print(cur_file)
+            name = cur_file.read()
+            if 'IV' in name:
+                lvl = 4
+            elif 'III' in name:
+                lvl = 3
+            elif 'II' in name:
+                lvl = 2
+            elif 'I' in name:
+                lvl = 1
+            cur_file.close()
+    return lvl
+
+
+def get_baseclass(path):
+    for file in os.listdir(path=path):
+        if file == 'baseclass.txt':
+            cur_file = open(path + '\\' + file, 'r')
+            name = cur_file.read()
+            cur_file.close()
+    return name
+
+
+def print_traits(file, lvl, baseclass):
+    file.write('lvl=')
+    file.write(str(lvl) + '\n')
+    file.write('cost=')
+    file.write(str(125 + 150 * (lvl - 1)) + '\n')
+    file.write('starting_ap=')
+    file.write(str(max(2, lvl ** 2 - 2 * lvl - 2 * lvl // 4)) + '\n')
+    if baseclass == 'Warrior\n' or baseclass == 'Rider\n':
+        file.write('strength=')
+        file.write(str(lvl + 1) + '\n')
+        file.write('agility=')
+        stat = max(lvl - 1, 0)
+        file.write(str(stat) + '\n')
+        file.write('intelligence=')
+        stat = max(lvl - 2, 0)
+        file.write(str(stat) + '\n')
+    elif baseclass == 'Archer\n' or baseclass == 'Rogue\n':
+        stat = max(lvl - 2, 0)
+        file.write('strength=')
+        file.write(str(stat) + '\n')
+        file.write('agility=')
+        stat = max(lvl, 0)
+        file.write(str(lvl + 1) + '\n')
+        file.write('intelligence=')
+        stat = max(lvl - 2, 0)
+        file.write(str(stat) + '\n')
+    else:
+        stat = max(lvl - 2, 0)
+        file.write('strength=')
+        file.write(str(stat) + '\n')
+        file.write('agility=')
+        stat = max(lvl - 2, 0)
+        file.write(str(stat) + '\n')
+        file.write('intelligence=')
+        file.write(str(lvl + 1) + '\n')
+
+    file.write('initiative=')
+    if baseclass == 'Rider\n' or 'Rogue\n':
+        file.write(str(math.ceil(lvl * 2.5)) + '\n')
+    elif baseclass == 'Archer\n' or 'Warrior\n':
+        file.write(str(math.ceil(lvl * 2)) + '\n')
+    elif baseclass == 'Mage\n':
+        file.write(str(math.ceil(lvl * 1.5)) + '\n')
+
+    if baseclass == 'Rogue\n':
+        file.write('magic_def=' + str(math.ceil(lvl * 1.5)) + '\n')
+        file.write('physic_def=' + str(math.ceil(lvl)) + '\n')
+    elif baseclass == 'Rider\n':
+        file.write('magic_def=' + str(max(1, int(math.ceil(lvl * 0.75)))) + '\n')
+        file.write('physic_def=' + str(math.ceil(lvl * 1.5)) + '\n')
+    elif baseclass == 'Warrior\n':
+        file.write('magic_def=' + str(max(1, int(math.ceil(lvl * 0.75)))) + '\n')
+        file.write('physic_def=' + str(math.ceil(lvl * 2)) + '\n')
+    elif baseclass == 'Mage\n':
+        file.write('magic_def=' + str(math.ceil(lvl * 2)) + '\n')
+        file.write('physic_def=' + str(max(1, int(math.ceil(lvl * 0.75)))) + '\n')
+    elif baseclass == 'Archer\n':
+        file.write('magic_def=' + str(math.ceil(lvl)) + '\n')
+        file.write('physic_def=' + str(max(1, int(math.ceil(lvl * 0.75)))) + '\n')
+
+
+# -d D:\Honourihed\repo
+
+
+def race_traits_fill(racename):
+    path_to_race = path_to_game + '\\assets\\units\\' + racename
+    for class_dir in os.listdir(path=path_to_race):
+        if '.' not in class_dir:
+            for file in os.listdir(path=path_to_race + '\\' + class_dir):
+                if file.startswith('traits'):
+                    path = path_to_race + '\\' + class_dir + '\\' + file
+                    try:
+                        lvl = get_lvl(path_to_race + '\\' + class_dir)
+                        baseclass = get_baseclass(path_to_race + '\\' + class_dir)
+
+                        os.rename(path, path_to_race + '\\' + class_dir + '\\' + 'traits.ini')
+                        path = path_to_race + '\\' + class_dir + '\\' + 'traits.ini';
+
+                        cur_file = open(path, 'w')
+                        print_traits(cur_file, lvl, baseclass)
+                        cur_file.close()
+                        print(path + ' - OK!')
+
+                    except OSError:
+                        print(path + ' - FAILED!')
+
+
+def main():
+    race_traits_fill('undead')
+    race_traits_fill('human')
+
+
+if __name__ == '__main__':
+    main()

BIN
assets/common/5f9d1323434921.56323324063cc.gif


BIN
assets/common/703b279e128a9a0c1d754800957f191a8f595845_hq.gif


BIN
assets/common/ImprobableGivingAlbertosaurus.gif


BIN
assets/common/background.jpg


+ 0 - 0
assets/hotseatpvp/battle_bg/CmBkCF.png → assets/common/battle_bg/CmBkCF.png


+ 0 - 0
assets/hotseatpvp/battle_bg/CmBkCur.png → assets/common/battle_bg/CmBkCur.png


+ 0 - 0
assets/hotseatpvp/battle_bg/CmBkDeck.png → assets/common/battle_bg/CmBkDeck.png


+ 0 - 0
assets/hotseatpvp/battle_bg/CmBkDes.png → assets/common/battle_bg/CmBkDes.png


+ 0 - 0
assets/hotseatpvp/battle_bg/CmBkDrDd.png → assets/common/battle_bg/CmBkDrDd.png


+ 0 - 0
assets/hotseatpvp/battle_bg/CmBkDrMt.png → assets/common/battle_bg/CmBkDrMt.png


+ 0 - 0
assets/hotseatpvp/battle_bg/CmBkDrTr.png → assets/common/battle_bg/CmBkDrTr.png


+ 0 - 0
assets/hotseatpvp/battle_bg/CmBkGrMt.png → assets/common/battle_bg/CmBkGrMt.png


+ 0 - 0
assets/hotseatpvp/battle_bg/CmBkGrTr.png → assets/common/battle_bg/CmBkGrTr.png


+ 0 - 0
assets/hotseatpvp/battle_bg/CmBkHG.png → assets/common/battle_bg/CmBkHG.png


+ 0 - 0
assets/hotseatpvp/battle_bg/CmBkLava.png → assets/common/battle_bg/CmBkLava.png


+ 0 - 0
assets/hotseatpvp/battle_bg/CmBkMag.png → assets/common/battle_bg/CmBkMag.png


+ 0 - 0
assets/hotseatpvp/battle_bg/CmBkRK.png → assets/common/battle_bg/CmBkRK.png


+ 0 - 0
assets/hotseatpvp/battle_bg/CmBkRgh.png → assets/common/battle_bg/CmBkRgh.png


+ 0 - 0
assets/hotseatpvp/battle_bg/CmBkSnMt.png → assets/common/battle_bg/CmBkSnMt.png


+ 0 - 0
assets/hotseatpvp/battle_bg/CmBkSnTr.png → assets/common/battle_bg/CmBkSnTr.png


+ 0 - 0
assets/hotseatpvp/battle_bg/CmBkSub.png → assets/common/battle_bg/CmBkSub.png


+ 0 - 0
assets/hotseatpvp/battle_bg/CmBkSwmp.png → assets/common/battle_bg/CmBkSwmp.png


+ 0 - 0
assets/hotseatpvp/battle_bg/OBBHL02.png → assets/common/battle_bg/OBBHL02.png


+ 0 - 0
assets/hotseatpvp/battle_bg/OBBHL03.png → assets/common/battle_bg/OBBHL03.png


+ 0 - 0
assets/hotseatpvp/battle_bg/OBBHL05.png → assets/common/battle_bg/OBBHL05.png


+ 0 - 0
assets/hotseatpvp/battle_bg/OBBHL06.png → assets/common/battle_bg/OBBHL06.png


+ 0 - 0
assets/hotseatpvp/battle_bg/OBBHL14.png → assets/common/battle_bg/OBBHL14.png


+ 0 - 0
assets/hotseatpvp/battle_bg/OBBHL16.png → assets/common/battle_bg/OBBHL16.png


+ 0 - 0
assets/hotseatpvp/battle_bg/OBLvL02.png → assets/common/battle_bg/OBLvL02.png


+ 0 - 0
assets/hotseatpvp/battle_bg/OBRGL01.png → assets/common/battle_bg/OBRGL01.png


+ 0 - 0
assets/hotseatpvp/battle_bg/OBRGL02.png → assets/common/battle_bg/OBRGL02.png


+ 0 - 0
assets/hotseatpvp/battle_bg/OBRGL03.png → assets/common/battle_bg/OBRGL03.png


+ 0 - 0
assets/hotseatpvp/battle_bg/OBRGL04.png → assets/common/battle_bg/OBRGL04.png


+ 0 - 0
assets/hotseatpvp/battle_bg/OBRGL05.png → assets/common/battle_bg/OBRGL05.png


+ 0 - 0
assets/hotseatpvp/battle_bg/OBRGL06.png → assets/common/battle_bg/OBRGL06.png


+ 0 - 0
assets/hotseatpvp/battle_bg/OBSNL01.png → assets/common/battle_bg/OBSNL01.png


+ 0 - 0
assets/hotseatpvp/battle_bg/OBSNL14.png → assets/common/battle_bg/OBSNL14.png


+ 0 - 0
assets/hotseatpvp/battle_bg/OBSWL22.png → assets/common/battle_bg/OBSWL22.png


+ 0 - 0
assets/hotseatpvp/battle_bg/ObBhS02.png → assets/common/battle_bg/ObBhS02.png


+ 0 - 0
assets/hotseatpvp/battle_bg/ObBhS03.png → assets/common/battle_bg/ObBhS03.png


+ 0 - 0
assets/hotseatpvp/battle_bg/ObBhS04.png → assets/common/battle_bg/ObBhS04.png


+ 0 - 0
assets/hotseatpvp/battle_bg/ObBhS11a.png → assets/common/battle_bg/ObBhS11a.png


+ 0 - 0
assets/hotseatpvp/battle_bg/ObBhS12b.png → assets/common/battle_bg/ObBhS12b.png


+ 0 - 0
assets/hotseatpvp/battle_bg/ObBhS14b.png → assets/common/battle_bg/ObBhS14b.png


+ 0 - 0
assets/hotseatpvp/battle_bg/ObBhS16a.png → assets/common/battle_bg/ObBhS16a.png


+ 0 - 0
assets/hotseatpvp/battle_bg/ObBtS04.png → assets/common/battle_bg/ObBtS04.png


+ 0 - 0
assets/hotseatpvp/battle_bg/ObCFL00.png → assets/common/battle_bg/ObCFL00.png


+ 0 - 0
assets/hotseatpvp/battle_bg/ObCFs00.png → assets/common/battle_bg/ObCFs00.png


+ 0 - 0
assets/hotseatpvp/battle_bg/ObCFs01.png → assets/common/battle_bg/ObCFs01.png


+ 0 - 0
assets/hotseatpvp/battle_bg/ObCFs02.png → assets/common/battle_bg/ObCFs02.png


+ 0 - 0
assets/hotseatpvp/battle_bg/ObCFs03.png → assets/common/battle_bg/ObCFs03.png


+ 0 - 0
assets/hotseatpvp/battle_bg/ObDRk01.png → assets/common/battle_bg/ObDRk01.png


+ 0 - 0
assets/hotseatpvp/battle_bg/ObDRk02.png → assets/common/battle_bg/ObDRk02.png


+ 0 - 0
assets/hotseatpvp/battle_bg/ObDRk03.png → assets/common/battle_bg/ObDRk03.png


+ 0 - 0
assets/hotseatpvp/battle_bg/ObDRk04.png → assets/common/battle_bg/ObDRk04.png


+ 0 - 0
assets/hotseatpvp/battle_bg/ObDSM01.png → assets/common/battle_bg/ObDSM01.png


+ 0 - 0
assets/hotseatpvp/battle_bg/ObDSM02.png → assets/common/battle_bg/ObDSM02.png


+ 0 - 0
assets/hotseatpvp/battle_bg/ObDSS17.png → assets/common/battle_bg/ObDSS17.png


+ 0 - 0
assets/hotseatpvp/battle_bg/ObDSh01.png → assets/common/battle_bg/ObDSh01.png


+ 0 - 0
assets/hotseatpvp/battle_bg/ObDSs02.png → assets/common/battle_bg/ObDSs02.png


+ 0 - 0
assets/hotseatpvp/battle_bg/ObDTF03.png → assets/common/battle_bg/ObDTF03.png


+ 0 - 0
assets/hotseatpvp/battle_bg/ObDino1.png → assets/common/battle_bg/ObDino1.png


+ 0 - 0
assets/hotseatpvp/battle_bg/ObDino2.png → assets/common/battle_bg/ObDino2.png


+ 0 - 0
assets/hotseatpvp/battle_bg/ObDino3.png → assets/common/battle_bg/ObDino3.png


+ 0 - 0
assets/hotseatpvp/battle_bg/ObDtL02.png → assets/common/battle_bg/ObDtL02.png


+ 0 - 0
assets/hotseatpvp/battle_bg/ObDtL03.png → assets/common/battle_bg/ObDtL03.png


+ 0 - 0
assets/hotseatpvp/battle_bg/ObDtL04.png → assets/common/battle_bg/ObDtL04.png


+ 0 - 0
assets/hotseatpvp/battle_bg/ObDtL06.png → assets/common/battle_bg/ObDtL06.png


+ 0 - 0
assets/hotseatpvp/battle_bg/ObDtL10.png → assets/common/battle_bg/ObDtL10.png


+ 0 - 0
assets/hotseatpvp/battle_bg/ObDtS03.png → assets/common/battle_bg/ObDtS03.png


+ 0 - 0
assets/hotseatpvp/battle_bg/ObDtS04.png → assets/common/battle_bg/ObDtS04.png


+ 0 - 0
assets/hotseatpvp/battle_bg/ObDtS14.png → assets/common/battle_bg/ObDtS14.png


+ 0 - 0
assets/hotseatpvp/battle_bg/ObDtS15.png → assets/common/battle_bg/ObDtS15.png


+ 0 - 0
assets/hotseatpvp/battle_bg/ObEFs00.png → assets/common/battle_bg/ObEFs00.png


+ 0 - 0
assets/hotseatpvp/battle_bg/ObEFs01.png → assets/common/battle_bg/ObEFs01.png


+ 0 - 0
assets/hotseatpvp/battle_bg/ObEFs02.png → assets/common/battle_bg/ObEFs02.png


+ 0 - 0
assets/hotseatpvp/battle_bg/ObEFs03.png → assets/common/battle_bg/ObEFs03.png


+ 0 - 0
assets/hotseatpvp/battle_bg/ObEFs04.png → assets/common/battle_bg/ObEFs04.png


+ 0 - 0
assets/hotseatpvp/battle_bg/ObFFL00.png → assets/common/battle_bg/ObFFL00.png


+ 0 - 0
assets/hotseatpvp/battle_bg/ObFFs00.png → assets/common/battle_bg/ObFFs00.png


+ 0 - 0
assets/hotseatpvp/battle_bg/ObFFs01.png → assets/common/battle_bg/ObFFs01.png


+ 0 - 0
assets/hotseatpvp/battle_bg/ObFFs02.png → assets/common/battle_bg/ObFFs02.png


+ 0 - 0
assets/hotseatpvp/battle_bg/ObFFs03.png → assets/common/battle_bg/ObFFs03.png


+ 0 - 0
assets/hotseatpvp/battle_bg/ObFFs04.png → assets/common/battle_bg/ObFFs04.png


+ 0 - 0
assets/hotseatpvp/battle_bg/ObGLg01.png → assets/common/battle_bg/ObGLg01.png


+ 0 - 0
assets/hotseatpvp/battle_bg/ObGRk01.png → assets/common/battle_bg/ObGRk01.png


+ 0 - 0
assets/hotseatpvp/battle_bg/ObGRk02.png → assets/common/battle_bg/ObGRk02.png


+ 0 - 0
assets/hotseatpvp/battle_bg/ObGSt01.png → assets/common/battle_bg/ObGSt01.png


+ 0 - 0
assets/hotseatpvp/battle_bg/ObGrS01.png → assets/common/battle_bg/ObGrS01.png


+ 0 - 0
assets/hotseatpvp/battle_bg/ObGrS02.png → assets/common/battle_bg/ObGrS02.png


+ 0 - 0
assets/hotseatpvp/battle_bg/ObGrS03.png → assets/common/battle_bg/ObGrS03.png


+ 0 - 0
assets/hotseatpvp/battle_bg/ObHGs00.png → assets/common/battle_bg/ObHGs00.png


+ 0 - 0
assets/hotseatpvp/battle_bg/ObHGs01.png → assets/common/battle_bg/ObHGs01.png


+ 0 - 0
assets/hotseatpvp/battle_bg/ObHGs02.png → assets/common/battle_bg/ObHGs02.png


+ 0 - 0
assets/hotseatpvp/battle_bg/ObHGs03.png → assets/common/battle_bg/ObHGs03.png


+ 0 - 0
assets/hotseatpvp/battle_bg/ObHGs04.png → assets/common/battle_bg/ObHGs04.png


+ 0 - 0
assets/hotseatpvp/battle_bg/ObLPL00.png → assets/common/battle_bg/ObLPL00.png


+ 0 - 0
assets/hotseatpvp/battle_bg/ObLPs00.png → assets/common/battle_bg/ObLPs00.png


Some files were not shown because too many files changed in this diff