From 46dbd186435d234538857bb17d320c7a54ab8e2f Mon Sep 17 00:00:00 2001
From: elf <360197197@qq.com>
Date: Wed, 15 Dec 2021 16:46:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Application/Admin/View/Game/edit.html | 6 +++---
Application/Base/Tool/GameResource/LeyouClient.class.php | 4 ++++
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/Application/Admin/View/Game/edit.html b/Application/Admin/View/Game/edit.html
index 75123fb45..8db8c4af4 100644
--- a/Application/Admin/View/Game/edit.html
+++ b/Application/Admin/View/Game/edit.html
@@ -461,7 +461,7 @@
- 视频大小不能超过50M,支持格式:mp4,3gp,wmv,asf,asx,mov,m4v,avi,flv,qlv
+ 视频大小不能超过20M,支持格式:mp4,3gp,wmv,asf,asx,mov,m4v,avi,flv,qlv
@@ -1677,7 +1677,7 @@
// 选择文件的按钮。可选。
// 内部根据当前运行是创建,可能是input元素,也可能是flash.
pick: {id:'#pickerVideo'},
- fileSingleSizeLimit:50*1024*1024, //设定单个文件大小
+ fileSingleSizeLimit:20*1024*1024, //设定单个文件大小
// dnd: true,
paste: document.body,
accept: {
@@ -1751,7 +1751,7 @@
if (type=="Q_TYPE_DENIED"){
layer.msg("不支持该视频格式");
}else if(type=="F_EXCEED_SIZE"){
- layer.msg("视频大小不能超过50M");
+ layer.msg("视频大小不能超过20M");
}
});
diff --git a/Application/Base/Tool/GameResource/LeyouClient.class.php b/Application/Base/Tool/GameResource/LeyouClient.class.php
index 8bbe77bc2..83eda4729 100644
--- a/Application/Base/Tool/GameResource/LeyouClient.class.php
+++ b/Application/Base/Tool/GameResource/LeyouClient.class.php
@@ -179,6 +179,10 @@ class LeyouClient
121221 => ['ref_id' => 121221, 'name' => '20000元专属充值卡', 'amount' => 20000],
121265 => ['ref_id' => 121265, 'name' => '化妖30元礼包卡', 'amount' => 30],
121261 => ['ref_id' => 121261, 'name' => '入魔30元礼包卡', 'amount' => 30],
+ 121267 => ['ref_id' => 121267, 'name' => '兄弟团购30元激活卡', 'amount' => 30],
+ 121268 => ['ref_id' => 121268, 'name' => '兄弟团购68元激活卡', 'amount' => 68],
+ 121269 => ['ref_id' => 121269, 'name' => '兄弟团购98元激活卡', 'amount' => 98],
+ 121270 => ['ref_id' => 121270, 'name' => '兄弟团购128元激活卡', 'amount' => 128],
];
/* return [