sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-19 23:33:33 +08:00
Code Activity

Fix: Resolve merge conflict, migrate new module guild

Browse Source 
Merge remote-tracking branch 'remotes/origin/revised_guild_reward' into guild_reward

# Conflicts:
#	module/reward/guild.py
This commit is contained in:
nEEtdo0d
2021-01-05 17:15:25 -05:00
parent cdf8e05750 532e4ae8e4
commit 7ab3d8c051
20 changed files with 588 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/reward/reward.py
View File

@@ -13,7 +13,7 @@ from module.reward.dorm import RewardDorm
from module.reward.meowfficer import RewardMeowfficer
from module.reward.tactical_class import RewardTacticalClass
from module.reward.data_key import RewardDataKey
from module.reward.guild import RewardGuild
from module.guild.guild_reward import RewardGuild
from module.ui.page import *
from module.update import Update