diff --git a/app/Controllers/PlayerController.php b/app/Controllers/PlayerController.php index d54a8add..f73d3f81 100644 --- a/app/Controllers/PlayerController.php +++ b/app/Controllers/PlayerController.php @@ -47,7 +47,7 @@ class PlayerController extends BaseController $user = new User($_SESSION['email']); - if ($user->getScore() < 100) + if ($user->getScore() < Option::get('score_per_player')) View::json('积分不够添加角色啦', 7); $player = new PlayerModel(); @@ -57,7 +57,7 @@ class PlayerController extends BaseController $player->last_modified = Utils::getTimeFormatted(); $player->save(); - $user->setScore(100, 'minus'); + $user->setScore(Option::get('score_per_player'), 'minus'); View::json('成功添加了角色 '.$player_name.'', 0); @@ -68,7 +68,7 @@ class PlayerController extends BaseController $player_name = $this->player->eloquent_model->player_name; $this->player->eloquent_model->delete(); - (new User($_SESSION['email']))->setScore(100, 'plus'); + (new User($_SESSION['email']))->setScore(Option::get('score_per_player'), 'plus'); View::json('角色 '.$player_name.' 已被删除', 0); } diff --git a/app/Controllers/SkinlibController.php b/app/Controllers/SkinlibController.php index f210601d..7912b0b0 100644 --- a/app/Controllers/SkinlibController.php +++ b/app/Controllers/SkinlibController.php @@ -133,7 +133,7 @@ class SkinlibController extends BaseController $t->uploader = $this->user->uid; $t->upload_at = Utils::getTimeFormatted(); - if ($this->user->getScore() < $t->size) + if ($this->user->getScore() / Option::get('score_per_storage') < $t->size) View::json('积分不够啦', 7); $results = Texture::where('hash', $t->hash)->get(); @@ -183,7 +183,7 @@ class SkinlibController extends BaseController if (Texture::where('hash', $result['hash'])->count() == 1) \Storage::remove("./textures/".$result['hash']); - $this->user->setScore($result->size, 'plus'); + $this->user->setScore($result->size * Option::get('score_per_storage'), 'plus'); if ($result->delete()) View::json('材质已被成功删除', 0); diff --git a/app/Models/User.php b/app/Models/User.php index 66ce152a..bdfcfc3e 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -2,6 +2,9 @@ namespace App\Models; +use Option; +use Utils; + class User { public $uid = ""; @@ -41,7 +44,7 @@ class User */ function __construct($email, $uid = 0) { - $this->email = \Utils::convertString($email); + $this->email = Utils::convertString($email); $this->eloquent_model = ($uid == 0) ? UserModel::where('email', $this->email)->first() : UserModel::find($uid); $class_name = "App\Services\Cipher\\".$_ENV['PWD_METHOD']; @@ -81,6 +84,7 @@ class User * -1 - banned * 0 - normal * 1 - admin + * 2 - super admin */ public function setPermission($permission) { @@ -155,9 +159,10 @@ class User public function sign() { if ($this->canSign()) { - $aquired_score = rand(10, 100); + $sign_score = explode(',', Option::get('sign_score')); + $aquired_score = rand($sign_score[0], $sign_score[1]); $this->setScore($aquired_score, 'plus'); - $this->eloquent_model->last_sign_at = \Utils::getTimeFormatted(); + $this->eloquent_model->last_sign_at = Utils::getTimeFormatted(); $this->eloquent_model->save(); return $aquired_score; } else { @@ -168,7 +173,7 @@ class User public function canSign($return_remaining_time = false) { // convert to timestamp - $remaining_time = (strtotime($this->getLastSignTime()) + \Option::get('sign_gap_time') * 3600 - time()) / 3600; + $remaining_time = (strtotime($this->getLastSignTime()) + Option::get('sign_gap_time') * 3600 - time()) / 3600; return $return_remaining_time ? round($remaining_time) : ($remaining_time <= 0); } @@ -190,9 +195,9 @@ class User $user->email = $this->email; $user->password = $this->cipher->encrypt($password, $_ENV['SALT']); $user->ip = $ip; - $user->score = \Option::get('user_initial_score'); - $user->register_at = \Utils::getTimeFormatted(); - $user->last_sign_at = \Utils::getTimeFormatted(time() - 86400); + $user->score = Option::get('user_initial_score'); + $user->register_at = Utils::getTimeFormatted(); + $user->last_sign_at = Utils::getTimeFormatted(time() - 86400); $user->permission = 0; $user->save(); diff --git a/resources/views/user/index.tpl b/resources/views/user/index.tpl index aac57f87..4dcd76cd 100644 --- a/resources/views/user/index.tpl +++ b/resources/views/user/index.tpl @@ -32,17 +32,20 @@
角色数量 - getPlayers()) + floor($user->getScore() / 100); ?> + getPlayers()) + floor($user->getScore() / Option::get('score_per_player')); + $percent = ($players_available == 0) ? 0 : count($user->getPlayers()) / $players_available * 100 + ?> {{ count($user->getPlayers()) }}/{{ $players_available }}
-
+
存储空间 - {{ $user->getStorageUsed() }}/{{ $user->getStorageUsed() + $user->getScore() }} KB + {{ $user->getStorageUsed() }}/{{ $user->getStorageUsed() + $user->getScore() / Option::get('score_per_storage') }} KB
-
+