diff --git a/Application/Admin/Controller/AutoPackController.class.php b/Application/Admin/Controller/AutoPackController.class.php
index 622619e61..e7da748cd 100644
--- a/Application/Admin/Controller/AutoPackController.class.php
+++ b/Application/Admin/Controller/AutoPackController.class.php
@@ -319,7 +319,7 @@ class AutoPackController extends Think
$launchCountList = M('apply_launch', 'tab_')->field(['apply_id', 'count(*) count'])->where(['apply_id' => ['in', $applyIds]])->group('apply_id')->select();
$launchCountList = index_by_column('apply_id', $launchCountList);
- $gameSources = M('game_source', 'tab_')->field(['id', 'file_name', 'source_version', 'file_type', 'bao_name', 'game_id'])->where(['game_id' => ['in', $gameIds]])->select();
+ $gameSources = M('game_source', 'tab_')->field(['id', 'file_name', 'source_version', 'file_type', 'bao_name', 'game_id', 'is_new_sdk'])->where(['game_id' => ['in', $gameIds]])->select();
$gameSources = index_by_column('game_id', $gameSources);
$gameSourceService = new GameSourceService();
diff --git a/Application/Admin/Event/SourceEvent.class.php b/Application/Admin/Event/SourceEvent.class.php
index 8627141d9..64c9862bb 100644
--- a/Application/Admin/Event/SourceEvent.class.php
+++ b/Application/Admin/Event/SourceEvent.class.php
@@ -96,7 +96,6 @@ class SourceEvent extends Controller
}
}
$data['source_version'] = $game_source['source_version'] + 1;
-
$version = '';
$packageName = '';
if ($data['file_type'] == 1) {
diff --git a/Application/Admin/View/GameSource/add.html b/Application/Admin/View/GameSource/add.html
index aeabae76f..1c9c6d83f 100644
--- a/Application/Admin/View/GameSource/add.html
+++ b/Application/Admin/View/GameSource/add.html
@@ -91,6 +91,14 @@
+
+ 是否新包 |
+
+
+
+
+ |
+
*上传原包 |
@@ -420,8 +428,10 @@ $("#game_id").change(function(){
$("#game_name").val($("#game_id option:selected").text());
$("#file_type").val(type);
if (type == 2){
+ $('#is-new-sdk').show();
$('#apply_bz').show();
}else{
+ $('#is-new-sdk').hide();
$('#apply_bz').hide();
}
//if(type == 1){$('.pack_name_class').show();}else{$('.pack_name_class').hide();}
diff --git a/Application/Admin/View/GameSource/edit.html b/Application/Admin/View/GameSource/edit.html
index 251a72ceb..9f4d450a8 100644
--- a/Application/Admin/View/GameSource/edit.html
+++ b/Application/Admin/View/GameSource/edit.html
@@ -78,7 +78,16 @@
-
+
+
+ 是否新包 |
+
+
+
+
+ |
+
+
上传原包 |
diff --git a/Application/Base/Service/GameSourceService.class.php b/Application/Base/Service/GameSourceService.class.php
index dcfe7edf7..595b13c3b 100644
--- a/Application/Base/Service/GameSourceService.class.php
+++ b/Application/Base/Service/GameSourceService.class.php
@@ -92,7 +92,8 @@ class GameSourceService {
return false;
}
- if (self::IS_FIXED_IOS13 && $game['sdk_version'] == 2) {
+ $isNewSdk = (isset($gameSource['is_new_sdk']) && $gameSource['is_new_sdk'] == 1);
+ if ($isNewSdk && $game['sdk_version'] == 2) {
$channelFolder = $this->getChannelConfigFolder($zip, $packData);
return $this->packChannelFolder($zip, $channelFolder);
} else {
diff --git a/Data/update.sql b/Data/update.sql
index 285b53baf..d9e6deaf4 100644
--- a/Data/update.sql
+++ b/Data/update.sql
@@ -615,4 +615,6 @@ ALTER TABLE `tab_device_bans`
MODIFY COLUMN `type` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '类型 0未知 1设备号 2IP 3落地页链接 4下载链接' AFTER `tag`;
-- user表注册类型添加7虚拟
-ALTER TABLE `tab_user` MODIFY COLUMN `register_type` tinyint(2) DEFAULT '1' COMMENT '注册方式 0游客1账号 2 手机 3微信 4QQ 5百度 6微博 7虚拟'
\ No newline at end of file
+ALTER TABLE `tab_user` MODIFY COLUMN `register_type` tinyint(2) DEFAULT '1' COMMENT '注册方式 0游客1账号 2 手机 3微信 4QQ 5百度 6微博 7虚拟';
+
+ALTER TABLE `tab_game_source` add COLUMN `is_new_sdk` tinyint(2) DEFAULT '0' COMMENT '是否新SDK(IOS)';
\ No newline at end of file
|