Merge branch 'develop_ddcy_1.0.3' of gitlab.huolea.com:wangxuewei/luckyfarm into develop_ddcy_1.0.3

# Conflicts:
#	game/src/main/assets/bin/Data/Managed/UnityGameFramework.Runtime.dll
#	game/src/main/assets/bin/Data/sharedassets1.assets.split42
#	game/src/main/assets/bin/Data/sharedassets1.assets.split43
#	game/src/main/assets/bin/Data/sharedassets1.assets.split44
#	game/src/main/assets/bin/Data/sharedassets1.assets.split45
#	game/src/main/assets/bin/Data/sharedassets1.assets.split46

app/src/main/java/com/ym/game/view/PuzzleDialog.kt

@@ -323,6 +323,8 @@ object PuzzleDialog : PuzzleContract.View, OnRecycleItemClickListener<PuzzleEnti
         if (data.number == 0) {
             Utils.showToast(AppliContext.get(), "看广告")
             AdManager.playRewardAd(
+
+
                 ADConfig.AD_VIDEO,
                 "",
                 context as Activity,