瀏覽代碼

refactor(Game): 优化游戏条件项控制器中的宠物和代币选择

- 将宠物选择从 Pet 模型更改为 PetConfig模型
- 将代币选择从 Currency 模型更改为 FundCurrencyModel 模型
- 更新相关模型的命名空间引用
notfff 8 月之前
父節點
當前提交
1042236029
共有 2 個文件被更改,包括 17 次插入16 次删除
  1. 11 10
      app/Module/Game/AdminControllers/GameConditionItemController.php
  2. 6 6
      app/Module/Pet/Models/PetConfig.php

+ 11 - 10
app/Module/Game/AdminControllers/GameConditionItemController.php

@@ -3,13 +3,14 @@
 namespace App\Module\Game\AdminControllers;
 
 use App\Module\Farm\Models\FarmLandType;
-use App\Module\Fund\Models\Currency;
+use App\Module\Fund\Models\FundCurrencyModel;
 use App\Module\Game\Enums\CONDITION_OPERATOR;
 use App\Module\Game\Enums\CONDITION_TYPE;
 use App\Module\Game\Models\GameConditionGroup;
 use App\Module\Game\Repositorys\GameConditionItemRepository;
 use App\Module\GameItems\Models\Item;
-use App\Module\Pet\Models\Pet;
+use App\Module\Pet\Models\PetConfig;
+use App\Module\Pet\Models\PetUser;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Show;
@@ -113,7 +114,7 @@ class GameConditionItemController extends AdminController
             $form->select('group_id', '条件组')
                 ->options(GameConditionGroup::pluck('name', 'id'))
                 ->required();
-            
+
             $form->select('condition_type', '条件类型')
                 ->options(CONDITION_TYPE::getAll())
                 ->required()
@@ -131,7 +132,7 @@ class GameConditionItemController extends AdminController
                 ->when(CONDITION_TYPE::PET_LEVEL->value, function (Form $form) {
                     // 宠物等级条件
                     $form->select('target_id', '宠物')
-                        ->options(Pet::pluck('name', 'id'))
+                        ->options(PetConfig::pluck('name', 'id'))
                         ->required()
                         ->help('选择要检查的宠物');
                 })
@@ -145,30 +146,30 @@ class GameConditionItemController extends AdminController
                 ->when(CONDITION_TYPE::CURRENCY_COUNT->value, function (Form $form) {
                     // 代币持有数条件
                     $form->select('target_id', '代币')
-                        ->options(Currency::pluck('name', 'id'))
+                        ->options(FundCurrencyModel::pluck('name', 'id'))
                         ->required()
                         ->help('选择要检查的代币');
                 });
-            
+
             $form->select('operator', '比较运算符')
                 ->options(CONDITION_OPERATOR::getAll())
                 ->default(CONDITION_OPERATOR::GREATER_THAN_OR_EQUAL->value)
                 ->required()
                 ->help('选择比较运算符,如等于、大于等于等');
-            
+
             $form->number('value', '比较值')
                 ->default(0)
                 ->required()
                 ->help('设置比较的目标值');
-            
+
             $form->number('param1', '参数1')
                 ->default(0)
                 ->help('根据条件类型不同含义,可选');
-            
+
             $form->number('param2', '参数2')
                 ->default(0)
                 ->help('根据条件类型不同含义,可选');
-            
+
             $form->textarea('extra_data', '额外数据')
                 ->help('JSON格式,可存储特定条件类型的额外参数,可选');
 

+ 6 - 6
app/Module/Pet/Models/PetConfig.php

@@ -10,14 +10,14 @@ use App\Module\Pet\Casts\NumericAttributesCast;
 /**
  * 宠物配置模型
  *
- * field start 
- * @property  int  $id  
+ * field start
+ * @property  int  $id
  * @property  string  $pet_type  宠物类型
  * @property  \App\Module\Pet\Casts\GradeProbability  $grade_probability  品阶概率配置
- * @property  App\Module\Pet\Casts\DisplayAttributesCast  $display_attributes  显示属性配置
+ * @property  \App\Module\Pet\Casts\DisplayAttributesCast  $display_attributes  显示属性配置
  * @property  \App\Module\Pet\Casts\NumericAttributesCast  $numeric_attributes  数值属性配置
- * @property  \Carbon\Carbon  $created_at  
- * @property  \Carbon\Carbon  $updated_at  
+ * @property  \Carbon\Carbon  $created_at
+ * @property  \Carbon\Carbon  $updated_at
  * field end
  */
 class PetConfig extends ModelCore
@@ -30,7 +30,7 @@ class PetConfig extends ModelCore
      */
     protected $table = 'pet_configs';
 
-    // attrlist start 
+    // attrlist start
     protected $fillable = [
         'id',
         'pet_type',