cyzhao 5 月之前
父節點
當前提交
64438118d6
共有 64 個文件被更改,包括 234 次插入63 次删除
  1. 1 1
      Gameserver/App/model/Const/GameConfig.php
  2. 1 1
      Gameserver/App/model/Const/sm_accumulaterecharge.php
  3. 1 1
      Gameserver/App/model/Const/sm_achieve_new.php
  4. 1 1
      Gameserver/App/model/Const/sm_activeTask.php
  5. 1 1
      Gameserver/App/model/Const/sm_activeTask_type.php
  6. 1 1
      Gameserver/App/model/Const/sm_active_day7_accumulate.php
  7. 1 1
      Gameserver/App/model/Const/sm_activepointreward.php
  8. 1 1
      Gameserver/App/model/Const/sm_activity.php
  9. 1 1
      Gameserver/App/model/Const/sm_activity_battlepass.php
  10. 1 1
      Gameserver/App/model/Const/sm_activity_battlepass_type.php
  11. 1 1
      Gameserver/App/model/Const/sm_activity_day7.php
  12. 1 1
      Gameserver/App/model/Const/sm_activity_day7sign_newplayer.php
  13. 1 1
      Gameserver/App/model/Const/sm_activity_lottery_tree.php
  14. 1 1
      Gameserver/App/model/Const/sm_activity_lotteryitem_exchange.php
  15. 1 1
      Gameserver/App/model/Const/sm_activity_lotterynum_accumulate.php
  16. 1 1
      Gameserver/App/model/Const/sm_activity_promopackinfo.php
  17. 1 1
      Gameserver/App/model/Const/sm_activity_promopackinfo_type.php
  18. 1 1
      Gameserver/App/model/Const/sm_announcement.php
  19. 1 1
      Gameserver/App/model/Const/sm_clientVersionHistory.php
  20. 1 1
      Gameserver/App/model/Const/sm_equip.php
  21. 1 1
      Gameserver/App/model/Const/sm_equip_compose.php
  22. 1 1
      Gameserver/App/model/Const/sm_equip_levelupgrade.php
  23. 1 1
      Gameserver/App/model/Const/sm_equip_position.php
  24. 1 1
      Gameserver/App/model/Const/sm_equip_suit.php
  25. 1 1
      Gameserver/App/model/Const/sm_errmsg.php
  26. 1 1
      Gameserver/App/model/Const/sm_evolve.php
  27. 1 1
      Gameserver/App/model/Const/sm_firstrecharge_reward.php
  28. 1 1
      Gameserver/App/model/Const/sm_fun_unlock.php
  29. 1 1
      Gameserver/App/model/Const/sm_gate.php
  30. 1 1
      Gameserver/App/model/Const/sm_gate_sbox.php
  31. 1 1
      Gameserver/App/model/Const/sm_gate_unlock.php
  32. 1 1
      Gameserver/App/model/Const/sm_gem.php
  33. 1 1
      Gameserver/App/model/Const/sm_gem_slotposition.php
  34. 11 1
      Gameserver/App/model/Const/sm_glc2.php
  35. 1 1
      Gameserver/App/model/Const/sm_globalsettings.php
  36. 1 1
      Gameserver/App/model/Const/sm_hero.php
  37. 1 1
      Gameserver/App/model/Const/sm_heroType_typeId.php
  38. 1 1
      Gameserver/App/model/Const/sm_heroattr.php
  39. 3 2
      Gameserver/App/model/Const/sm_item.php
  40. 1 1
      Gameserver/App/model/Const/sm_item_2023_box.php
  41. 1 1
      Gameserver/App/model/Const/sm_player_level.php
  42. 1 1
      Gameserver/App/model/Const/sm_plots.php
  43. 1 1
      Gameserver/App/model/Const/sm_predicate.php
  44. 1 1
      Gameserver/App/model/Const/sm_rank_fightpowerreward.php
  45. 1 1
      Gameserver/App/model/Const/sm_rank_passgatereward.php
  46. 1 1
      Gameserver/App/model/Const/sm_service_schedule.php
  47. 1 1
      Gameserver/App/model/Const/sm_shop.php
  48. 1 1
      Gameserver/App/model/Const/sm_shop_box.php
  49. 1 1
      Gameserver/App/model/Const/sm_shop_cash.php
  50. 1 1
      Gameserver/App/model/Const/sm_shop_daily.php
  51. 1 1
      Gameserver/App/model/Const/sm_shop_gategift.php
  52. 1 1
      Gameserver/App/model/Const/sm_shop_gold.php
  53. 1 1
      Gameserver/App/model/Const/sm_shop_junbei.php
  54. 1 1
      Gameserver/App/model/Const/sm_shop_monthcard.php
  55. 1 1
      Gameserver/App/model/Const/sm_shop_supply.php
  56. 1 1
      Gameserver/App/model/Const/sm_skills.php
  57. 1 1
      Gameserver/App/model/Const/sm_subfun_unlock.php
  58. 1 1
      Gameserver/App/model/Const/sm_sysmail.php
  59. 1 1
      Gameserver/App/model/Const/sm_token_PublicGift.php
  60. 1 1
      Gameserver/App/model/Const/sm_token_gift.php
  61. 1 1
      Gameserver/App/model/Const/sm_waveItem.php
  62. 1 1
      Gameserver/App/model/Const/sm_waves.php
  63. 88 0
      Gameserver/App/model/User/E_PredicateActionType.php
  64. 72 0
      Gameserver/App/process/FightPower_Calculate.php

+ 1 - 1
Gameserver/App/model/Const/GameConfig.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-23 15:37:03
+ // 日期: 2024-12-24 16:11:13
 ////////////////////
 
 /**

+ 1 - 1
Gameserver/App/model/Const/sm_accumulaterecharge.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-18 15:24:39
+ // 日期: 2024-09-05 17:01:24
 ////////////////////
 
 

+ 1 - 1
Gameserver/App/model/Const/sm_achieve_new.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-20 09:05:03
+ // 日期: 2024-06-07 18:24:29
 ////////////////////
 
 

+ 1 - 1
Gameserver/App/model/Const/sm_activeTask.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-20 09:05:03
+ // 日期: 2024-12-19 12:05:55
 ////////////////////
 
 

+ 1 - 1
Gameserver/App/model/Const/sm_activeTask_type.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-20 09:05:03
+ // 日期: 2024-12-19 12:05:55
 ////////////////////
 
 

+ 1 - 1
Gameserver/App/model/Const/sm_active_day7_accumulate.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-20 09:05:01
+ // 日期: 2024-09-29 16:05:51
 ////////////////////
 
 

+ 1 - 1
Gameserver/App/model/Const/sm_activepointreward.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-18 15:24:39
+ // 日期: 2024-04-29 11:24:54
 ////////////////////
 
 

+ 1 - 1
Gameserver/App/model/Const/sm_activity.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-20 09:05:03
+ // 日期: 2024-09-20 15:50:58
 ////////////////////
 
 

+ 1 - 1
Gameserver/App/model/Const/sm_activity_battlepass.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-18 15:24:40
+ // 日期: 2024-10-15 15:06:52
 ////////////////////
 
 

+ 1 - 1
Gameserver/App/model/Const/sm_activity_battlepass_type.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-18 15:24:40
+ // 日期: 2024-10-15 15:06:52
 ////////////////////
 
 

+ 1 - 1
Gameserver/App/model/Const/sm_activity_day7.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-20 09:05:03
+ // 日期: 2024-12-19 16:53:06
 ////////////////////
 
 

+ 1 - 1
Gameserver/App/model/Const/sm_activity_day7sign_newplayer.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-20 09:05:03
+ // 日期: 2024-11-28 09:13:30
 ////////////////////
 
 

+ 1 - 1
Gameserver/App/model/Const/sm_activity_lottery_tree.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-18 15:24:40
+ // 日期: 2024-09-11 14:37:02
 ////////////////////
 
 

+ 1 - 1
Gameserver/App/model/Const/sm_activity_lotteryitem_exchange.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-18 15:24:40
+ // 日期: 2024-09-12 17:11:58
 ////////////////////
 
 

+ 1 - 1
Gameserver/App/model/Const/sm_activity_lotterynum_accumulate.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-18 15:24:40
+ // 日期: 2024-09-11 14:53:30
 ////////////////////
 
 

+ 1 - 1
Gameserver/App/model/Const/sm_activity_promopackinfo.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-18 15:24:40
+ // 日期: 2024-10-09 17:58:39
 ////////////////////
 
 

+ 1 - 1
Gameserver/App/model/Const/sm_activity_promopackinfo_type.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-18 15:24:40
+ // 日期: 2024-10-09 17:58:39
 ////////////////////
 
 

+ 1 - 1
Gameserver/App/model/Const/sm_announcement.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-20 09:05:04
+ // 日期: 2024-12-19 17:35:55
 ////////////////////
 
 

+ 1 - 1
Gameserver/App/model/Const/sm_clientVersionHistory.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-20 09:05:04
+ // 日期: 2024-06-07 18:24:30
 ////////////////////
 
 

+ 1 - 1
Gameserver/App/model/Const/sm_equip.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-20 09:05:04
+ // 日期: 2024-12-24 15:09:40
 ////////////////////
 
 

+ 1 - 1
Gameserver/App/model/Const/sm_equip_compose.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-18 15:24:41
+ // 日期: 2024-11-01 16:19:57
 ////////////////////
 
 

+ 1 - 1
Gameserver/App/model/Const/sm_equip_levelupgrade.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-20 09:05:05
+ // 日期: 2024-12-24 14:26:34
 ////////////////////
 
 

+ 1 - 1
Gameserver/App/model/Const/sm_equip_position.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-20 09:05:05
+ // 日期: 2024-12-17 10:29:52
 ////////////////////
 
 

+ 1 - 1
Gameserver/App/model/Const/sm_equip_suit.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-18 15:24:42
+ // 日期: 2024-10-30 14:43:38
 ////////////////////
 
 

+ 1 - 1
Gameserver/App/model/Const/sm_errmsg.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-20 09:05:06
+ // 日期: 2024-10-09 18:05:52
 ////////////////////
 
 

+ 1 - 1
Gameserver/App/model/Const/sm_evolve.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-20 09:05:05
+ // 日期: 2024-12-17 15:05:55
 ////////////////////
 
 

+ 1 - 1
Gameserver/App/model/Const/sm_firstrecharge_reward.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-18 15:24:42
+ // 日期: 2024-09-04 16:07:40
 ////////////////////
 
 

+ 1 - 1
Gameserver/App/model/Const/sm_fun_unlock.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-20 09:05:06
+ // 日期: 2024-12-18 18:01:33
 ////////////////////
 
 

+ 1 - 1
Gameserver/App/model/Const/sm_gate.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-20 09:05:06
+ // 日期: 2024-12-19 09:05:13
 ////////////////////
 
 

+ 1 - 1
Gameserver/App/model/Const/sm_gate_sbox.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-20 09:05:06
+ // 日期: 2024-07-24 15:35:47
 ////////////////////
 
 

+ 1 - 1
Gameserver/App/model/Const/sm_gate_unlock.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-20 09:05:06
+ // 日期: 2024-12-19 09:05:13
 ////////////////////
 
 

+ 1 - 1
Gameserver/App/model/Const/sm_gem.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-20 09:05:06
+ // 日期: 2024-11-20 17:31:21
 ////////////////////
 
 

+ 1 - 1
Gameserver/App/model/Const/sm_gem_slotposition.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-18 15:24:43
+ // 日期: 2024-10-29 16:16:44
 ////////////////////
 
 

+ 11 - 1
Gameserver/App/model/Const/sm_glc2.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-20 09:05:06
+ // 日期: 2024-12-18 18:01:58
 ////////////////////
 
 
@@ -18,6 +18,16 @@ class sm_glc2
     */
     public $activity_lottery_FreeNum;
 
+    /**
+    * @var Int32 攻击力系数  
+    */
+    public $attackParas;
+
+    /**
+    * @var Int32 生命系数  
+    */
+    public $hpParas;
+
     /**
     * @var Int32 仙树抽奖广告  
     */

+ 1 - 1
Gameserver/App/model/Const/sm_globalsettings.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-20 09:05:06
+ // 日期: 2024-12-23 14:35:56
 ////////////////////
 
 

+ 1 - 1
Gameserver/App/model/Const/sm_hero.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-20 09:05:07
+ // 日期: 2024-12-20 11:05:55
 ////////////////////
 
 

+ 1 - 1
Gameserver/App/model/Const/sm_heroType_typeId.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-20 09:05:07
+ // 日期: 2024-12-20 11:05:55
 ////////////////////
 
 

+ 1 - 1
Gameserver/App/model/Const/sm_heroattr.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-20 09:05:07
+ // 日期: 2024-06-07 18:24:31
 ////////////////////
 
 

+ 3 - 2
Gameserver/App/model/Const/sm_item.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-20 09:05:07
+ // 日期: 2024-12-24 16:05:07
 ////////////////////
 
 
@@ -58,7 +58,8 @@ class sm_item
     public $pileNum;
 
     /**
-    * @var Int32 品质/稀有度 1白2绿3蓝 default(1) 
+    * @var Int32 道具品质/稀有度 1白2绿3蓝4紫5橙色6红色7金
+    *  装备品质颜色对应装备品阶数据:1白2绿3蓝4紫7橙11红16金 default(1) 
     */
     public $quality;
 

+ 1 - 1
Gameserver/App/model/Const/sm_item_2023_box.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-18 15:24:44
+ // 日期: 2024-06-07 14:15:10
 ////////////////////
 
 

+ 1 - 1
Gameserver/App/model/Const/sm_player_level.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-20 09:05:12
+ // 日期: 2024-12-18 11:56:39
 ////////////////////
 
 

+ 1 - 1
Gameserver/App/model/Const/sm_plots.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-20 09:05:12
+ // 日期: 2024-12-06 10:05:55
 ////////////////////
 
 

+ 1 - 1
Gameserver/App/model/Const/sm_predicate.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-20 09:05:12
+ // 日期: 2024-12-18 16:29:46
 ////////////////////
 
 

+ 1 - 1
Gameserver/App/model/Const/sm_rank_fightpowerreward.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-18 15:24:45
+ // 日期: 2024-05-27 17:24:24
 ////////////////////
 
 

+ 1 - 1
Gameserver/App/model/Const/sm_rank_passgatereward.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-18 15:24:46
+ // 日期: 2024-05-27 17:21:59
 ////////////////////
 
 

+ 1 - 1
Gameserver/App/model/Const/sm_service_schedule.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-20 09:05:12
+ // 日期: 2024-06-07 18:24:33
 ////////////////////
 
 

+ 1 - 1
Gameserver/App/model/Const/sm_shop.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-20 09:05:12
+ // 日期: 2024-12-18 18:10:09
 ////////////////////
 
 

+ 1 - 1
Gameserver/App/model/Const/sm_shop_box.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-18 15:24:46
+ // 日期: 2024-04-17 10:49:26
 ////////////////////
 
 

+ 1 - 1
Gameserver/App/model/Const/sm_shop_cash.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-20 09:05:12
+ // 日期: 2024-12-18 18:09:27
 ////////////////////
 
 

+ 1 - 1
Gameserver/App/model/Const/sm_shop_daily.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-18 15:24:46
+ // 日期: 2024-03-20 15:21:17
 ////////////////////
 
 

+ 1 - 1
Gameserver/App/model/Const/sm_shop_gategift.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-18 15:24:47
+ // 日期: 2024-03-20 15:21:17
 ////////////////////
 
 

+ 1 - 1
Gameserver/App/model/Const/sm_shop_gold.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-18 15:24:47
+ // 日期: 2024-03-20 15:21:18
 ////////////////////
 
 

+ 1 - 1
Gameserver/App/model/Const/sm_shop_junbei.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-18 15:24:47
+ // 日期: 2024-03-20 15:21:18
 ////////////////////
 
 

+ 1 - 1
Gameserver/App/model/Const/sm_shop_monthcard.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-18 15:24:47
+ // 日期: 2024-04-24 14:44:52
 ////////////////////
 
 

+ 1 - 1
Gameserver/App/model/Const/sm_shop_supply.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-18 15:24:48
+ // 日期: 2024-03-20 15:21:18
 ////////////////////
 
 

+ 1 - 1
Gameserver/App/model/Const/sm_skills.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-20 09:05:12
+ // 日期: 2024-12-19 17:05:55
 ////////////////////
 
 

+ 1 - 1
Gameserver/App/model/Const/sm_subfun_unlock.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-18 15:24:48
+ // 日期: 2024-09-09 18:06:13
 ////////////////////
 
 

+ 1 - 1
Gameserver/App/model/Const/sm_sysmail.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-23 15:36:41
+ // 日期: 2024-12-23 15:21:05
 ////////////////////
 
 

+ 1 - 1
Gameserver/App/model/Const/sm_token_PublicGift.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-18 15:24:49
+ // 日期: 2024-06-20 17:00:35
 ////////////////////
 
 

+ 1 - 1
Gameserver/App/model/Const/sm_token_gift.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-20 09:05:07
+ // 日期: 2024-06-20 17:35:46
 ////////////////////
 
 

+ 1 - 1
Gameserver/App/model/Const/sm_waveItem.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-20 17:31:20
+ // 日期: 2024-12-20 17:24:40
 ////////////////////
 
 

+ 1 - 1
Gameserver/App/model/Const/sm_waves.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2024-12-20 17:31:20
+ // 日期: 2024-12-20 17:24:40
 ////////////////////
 
 

+ 88 - 0
Gameserver/App/model/User/E_PredicateActionType.php

@@ -0,0 +1,88 @@
+<?php
+
+/* 
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+namespace loyalsoft;
+
+/**
+ * 词条
+ *
+ * @author c'y'zhao
+ */
+class E_PredicateActionType {
+    
+    /**
+     * 攻击力增加X actionParam1
+     */
+    const addDamage = "addDamage";
+    
+    /**
+     * 攻击力额外增加X% actionParam1
+     */
+    const mulDamage = "mulDamage";
+    
+    /**
+     * 所有装备基础属性+5%----等级的基础攻击力/生命 攻击力取actionParam1 生命actionParam2
+     */
+    const mulEquipBasicProps = "mulEquipBasicProps";
+    
+    /**
+     * 生命增加X  actionParam1
+     */    
+    const addHp = "addHp";
+    
+    /**
+     * 生命值额外增加X% actionParam1
+     */
+    const mulHp = "mulHp";
+    
+    /**
+     * 暴击率增加3% actionParam1
+     */
+    const addBigHitRate = "addBigHitRate";
+    
+    /**
+     * 增加X%暴击率且增加Y%暴击伤害 actionParam1 X  actionParam1 Y
+     */
+    const addBigHitRateAndVal = "addBigHitRateAndVal";
+    
+    /**
+     * 暴击伤害增加50%  actionParam1
+     */
+    const addBigHitVal = "addBigHitVal";
+    
+    /**
+     * 肉食恢复+10  actionParam1
+     */
+    const addEatFood = "addEatFood";
+    
+    /**
+     * 肉食恢复效果增加10%  actionParam1
+     */
+    const mulEatFood = "mulEatFood";
+    
+    /**
+     * 减伤+1 受到伤害减少X actionParam1
+     */
+    const addDecDamage = "addDecDamage";
+    
+    /**
+     * 伤害减免+20%  actionParam1
+     */
+    const mulDecDamage = "mulDecDamage";
+    
+    /**
+     * 所有装备基础属性+5%----等级的基础攻击力/生命 攻击力取actionParam1 
+     */
+    const mulEquipBasicProps_damage = "mulEquipBasicProps_damage";
+    
+    /**
+     * 所有装备基础属性+5%----等级的基础攻击力/生命 攻击力取actionParam1  生命actionParam2
+     */
+    const mulEquipBasicProps_hp = "mulEquipBasicProps_hp";
+    
+}

+ 72 - 0
Gameserver/App/process/FightPower_Calculate.php

@@ -0,0 +1,72 @@
+<?php
+
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+namespace loyalsoft;
+
+/**
+ * 【四舍五入】
+ * 战力 = (基础攻击力 * 攻击力系数 + 基础生命值 * 生命值系数 + (1+暴击率) * (1+暴击伤害) * 攻击力系数 + 肉食恢复加成 * (1+肉食恢复效果)*生命值系数+伤害减免值 * (1+伤害减免效果)* 生命值系数)*(1+装备系数+角色系数)
+ */
+class FightPower_Calculate {
+    //战力 = (基础攻击力 * 攻击力系数 + 基础生命值 * 生命值系数 + (1+暴击率) * (1+暴击伤害) * 攻击力系数 + 肉食恢复加成 * (1+肉食恢复效果)*生命值系数+伤害减免值 * (1+伤害减免效果)* 生命值系数) * (1+装备系数+角色系数)
+
+    /**
+     * 获取词条对应的参数值
+     * @param type $predicateId
+     */
+    public static function predicateActionParamVal($dic, $predicateId) {
+        $predicateMo = GameConfig::predicate_getItem($predicateId);
+
+        $predicateDic = new \stdClass();
+        
+        switch ($predicateMo->actionType) {
+            case E_PredicateActionType::mulEquipBasicProps://所有装备基础属性+5%----等级的基础攻击力/生命 攻击力取actionParam1 生命actionParam2            
+                if ($predicateMo->actionParam1 != null) {
+                    $actionKey = E_PredicateActionType::mulEquipBasicProps_damage;
+                    $actionVal = $predicateMo->actionParam1;
+
+                    $dic = self::predicateActionParamVal_Sav($dic, $actionKey,$actionVal);
+                }
+
+                if ($predicateMo->actionParam2 != null) {
+                    $actionKey = E_PredicateActionType::mulEquipBasicProps_hp;
+                    $actionVal = $predicateMo->actionParam2;
+
+                    $dic = self::predicateActionParamVal_Sav($dic, $actionKey,$actionVal);
+                }
+
+                break;
+            case E_PredicateActionType::addBigHitRateAndVal://增加X%暴击率且增加Y%暴击伤害 actionParam1 X  actionParam1 Y
+                $actionKey1 = E_PredicateActionType::addBigHitRate;
+                $actionKey2 = E_PredicateActionType::addBigHitVal;
+                $actionVal1 = $predicateMo->actionParam1;
+                $actionVal2 = $predicateMo->actionParam2;
+
+                $dic = self::predicateActionParamVal_Sav($dic, $actionKey1,$actionVal1);
+                $dic = self::predicateActionParamVal_Sav($dic, $actionKey2,$actionVal2);
+
+                break;
+            default:               
+                $dic = self::predicateActionParamVal_Sav($dic, $predicateMo->actionType, $predicateMo->actionParam1);
+                break;
+        }
+        
+        return $dic;
+    }
+
+    public static function predicateActionParamVal_Sav($dic,$actionKey, $actionVal) {
+        if (StlUtil::dictHasProperty($dic, $actionKey)) {
+            $dic->$actionKey += $actionVal;
+        } else {
+            $dic->$actionKey = $actionVal;
+        }
+        
+        return $dic;
+    }
+
+}