Merge branch 'dev' of http://ylsjtt.game7000.com:3000/YLSJ/jzhj2024server into dev

Gameserver/App/process/FightProc.php

@@ -572,7 +572,7 @@ class FightProc {
         ctx()->base()->Add_Gold($waveMo->rewardGold);                           # 金币奖励
         # 图纸奖励: 数量min-max, 部位随机
         if (strlen($waveMo->rewardTuZhi) > 0 && str_contains($waveMo->rewardTuZhi, '-')) {
-            list($tz_min, $tz_max) = explode($waveMo->rewardTuZhi, '-');        # 图纸数量
+            list($tz_min, $tz_max) = explode('-', $waveMo->rewardTuZhi);        # 图纸数量
             $tz_n = rand($tz_min, $tz_max);
             # 图纸部位数据源 1001, 1002, 1003, 1004, 1005, 1006
             for ($i = 0; $i < $tz_n; $i++) {
@@ -583,14 +583,14 @@ class FightProc {
         }
         # 宝石奖励: 数量min-max;品质:权重,品质:权重...
         if (strlen($waveMo->rewardGem) > 0) {
-            list($gs_num, $gs_props) = explode($waveMo->rewardGem, ';');
-            list($gem_min, $gem_max) = explode($gs_num, '-');                   # 宝石数量
+            list($gs_num, $gs_props) = explode(';', $waveMo->rewardGem);
+            list($gem_min, $gem_max) = explode('-', $gs_num);                   # 宝石数量
             $gem_n = rand($gem_min, $gem_max);
-            $arr = explode($gs_props, ",");
+            $arr = explode(",", $gs_props);
             $pool = array();
             $n = 0;
             foreach ($arr as $str) {
-                list($qual, $props) = explode($str, ':');
+                list($qual, $props) = explode(':', $str);
                 $pool[] = array('q' => $qual, 'p' => $props);
                 $n += $props;
             }

Gameserver/App/test.php

@@ -30,3 +30,5 @@ new Req($s);
 req()->CV = "999.999.999";
 $arr = GameConfig::waves_getItemArray(FightProc::TowerGateId);
 var_dump($arr);
+
+var_dump(explode('-', '1-2'));