冲突解决

Gameserver/App/configs/GameConfig.php

@@ -1,38 +1,41 @@
 <?php
+
 ////////////////////
- // 由CodeGenerator创建。
- // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
- // author： gwang 
- // 日期: 2024-05-28 10:40:54
+// 由CodeGenerator创建。
+// Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
+// author： gwang
+// 日期: 2024-05-30 09:45:20
 ////////////////////
 
 namespace loyalsoft;
 
 /**
- * 常量配置数据 
+ * 常量配置数据
  */
 class GameConfig {
-// <editor-fold defaultstate="collapsed" desc="  基础代码 ">    
+// <editor-fold defaultstate="collapsed" desc="  基础代码 ">
+
     /**
-     * 是否启用codegen 
+     * 是否启用codegen
      */
-    private static function isCG()  {
-        return defined('CodeGen_Enabled') && CodeGen_Enabled; 
+    private static function isCG() {
+        return defined('CodeGen_Enabled') && CodeGen_Enabled;
     }
+
     /**
      * @var bool 分区是否使用独立的常量配置数据
      */
     private static $useZoneId = false;
+
     /**
      * 追加分区列表字符串
      * @return string
      */
-    private static function zoneid()
-    {
+    private static function zoneid() {
         global $zoneid;
         return self::$useZoneId ? "-zone$zoneid" : "";
     }
-	
+
     /**
      * @return ClientVersion
      */
@@ -84,593 +87,593 @@ class GameConfig {
         }
         return null;
     }
+
 // </editor-fold>
+
     /**
-    * 全局参数
-    * @return \globalsettings
-    */
-    public static function globalsettings()
-    { 
-        static $a = null; 
+     * 全局参数
+     * @return \globalsettings
+     */
+    public static function globalsettings() {
+        static $a = null;
         return self::initValue($a, 'globalsettings');
     }
+
     /**
-    * 停服计划
-    * @return \service_schedule
-    */
-    public static function service_schedule()
-    { 
-        static $a = null; 
+     * 停服计划
+     * @return \service_schedule
+     */
+    public static function service_schedule() {
+        static $a = null;
         return self::initValue($a, 'service_schedule');
     }
+
     /**
-    * @return \sm_service_schedule service_schedule item数据 
-    */
-    public static function service_schedule_getItem($itemid)
-    { 
+     * @return \sm_service_schedule service_schedule item数据
+     */
+    public static function service_schedule_getItem($itemid) {
         return self::get_hash_item('service_schedule', $itemid);
     }
+
     /**
-    * 道具表
-    * @return \item
-    */
-    public static function item()
-    { 
-        static $a = null; 
+     * 道具表
+     * @return \item
+     */
+    public static function item() {
+        static $a = null;
         return self::initValue($a, 'item');
     }
+
     /**
-    * @return \sm_item item item数据 
-    */
-    public static function item_getItem($itemid)
-    { 
+     * @return \sm_item item item数据
+     */
+    public static function item_getItem($itemid) {
         return self::get_hash_item('item', $itemid);
     }
+
     /**
-    * 系统邮件
-    * @return \sysmail
-    */
-    public static function sysmail()
-    { 
-        static $a = null; 
+     * 系统邮件
+     * @return \sysmail
+     */
+    public static function sysmail() {
+        static $a = null;
         return self::initValue($a, 'sysmail');
     }
+
     /**
-    * @return \sm_sysmail sysmail item数据 
-    */
-    public static function sysmail_getItem($itemid)
-    { 
+     * @return \sm_sysmail sysmail item数据
+     */
+    public static function sysmail_getItem($itemid) {
         return self::get_hash_item('sysmail', $itemid);
     }
+
     /**
-    * 客户端版本信息
-    * @return \clientVersionHistory
-    */
-    public static function clientVersionHistory()
-    { 
-        static $a = null; 
+     * 客户端版本信息
+     * @return \clientVersionHistory
+     */
+    public static function clientVersionHistory() {
+        static $a = null;
         return self::initValue($a, 'clientVersionHistory');
     }
+
     /**
-    * @return \sm_clientVersionHistory clientVersionHistory item数据 
-    */
-    public static function clientVersionHistory_getItem($itemid)
-    { 
+     * @return \sm_clientVersionHistory clientVersionHistory item数据
+     */
+    public static function clientVersionHistory_getItem($itemid) {
         return self::get_hash_item('clientVersionHistory', $itemid);
     }
+
     /**
-    * 错误信息表
-    * @return \errmsg
-    */
-    public static function errmsg()
-    { 
-        static $a = null; 
+     * 错误信息表
+     * @return \errmsg
+     */
+    public static function errmsg() {
+        static $a = null;
         return self::initValue($a, 'errmsg');
     }
+
     /**
-    * @return \sm_errmsg errmsg item数据 
-    */
-    public static function errmsg_getItem($itemid)
-    { 
+     * @return \sm_errmsg errmsg item数据
+     */
+    public static function errmsg_getItem($itemid) {
         return self::get_hash_item('errmsg', $itemid);
     }
+
     /**
-    * 战斗: 波次表
-    * @return \waves
-    */
-    public static function waves()
-    { 
-        static $a = null; 
+     * 战斗: 波次表
+     * @return \waves
+     */
+    public static function waves() {
+        static $a = null;
         return self::initValue($a, 'waves');
     }
+
     /**
-    * @return \sm_waves waves itemArray 
-    */
-    public static function waves_getItemArray($key)
-    { 
+     * @return \sm_waves waves itemArray
+     */
+    public static function waves_getItemArray($key) {
         return self::get_hash_item('waves', $key);
     }
+
     /**
-    * 活动: 七日签到
-    * @return \activity_day7
-    */
-    public static function activity_day7()
-    { 
-        static $a = null; 
+     * 活动: 七日签到
+     * @return \activity_day7
+     */
+    public static function activity_day7() {
+        static $a = null;
         return self::initValue($a, 'activity_day7');
     }
+
     /**
-    * @return \sm_activity_day7 activity_day7 item数据 
-    */
-    public static function activity_day7_getItem($itemid)
-    { 
+     * @return \sm_activity_day7 activity_day7 item数据
+     */
+    public static function activity_day7_getItem($itemid) {
         return self::get_hash_item('activity_day7', $itemid);
     }
+
     /**
-    * 章节表
-    * @return \gate
-    */
-    public static function gate()
-    { 
-        static $a = null; 
+     * 章节表
+     * @return \gate
+     */
+    public static function gate() {
+        static $a = null;
         return self::initValue($a, 'gate');
     }
+
     /**
-    * @return \sm_gate gate item数据 
-    */
-    public static function gate_getItem($itemid)
-    { 
+     * @return \sm_gate gate item数据
+     */
+    public static function gate_getItem($itemid) {
         return self::get_hash_item('gate', $itemid);
     }
+
     /**
-    * 角色
-    * @return \hero
-    */
-    public static function hero()
-    { 
-        static $a = null; 
+     * 角色
+     * @return \hero
+     */
+    public static function hero() {
+        static $a = null;
         return self::initValue($a, 'hero');
     }
+
     /**
-    * @return \sm_hero hero item数据 
-    */
-    public static function hero_getItem($itemid)
-    { 
+     * @return \sm_hero hero item数据
+     */
+    public static function hero_getItem($itemid) {
         return self::get_hash_item('hero', $itemid);
     }
+
     /**
-    * 装备表
-    * @return \equip
-    */
-    public static function equip()
-    { 
-        static $a = null; 
+     * 装备表
+     * @return \equip
+     */
+    public static function equip() {
+        static $a = null;
         return self::initValue($a, 'equip');
     }
+
     /**
-    * @return \sm_equip equip item数据 
-    */
-    public static function equip_getItem($itemid)
-    { 
+     * @return \sm_equip equip item数据
+     */
+    public static function equip_getItem($itemid) {
         return self::get_hash_item('equip', $itemid);
     }
+
     /**
-    * 装备升级表
-    * @return \equip_levelupgrade
-    */
-    public static function equip_levelupgrade()
-    { 
-        static $a = null; 
+     * 装备升级表
+     * @return \equip_levelupgrade
+     */
+    public static function equip_levelupgrade() {
+        static $a = null;
         return self::initValue($a, 'equip_levelupgrade');
     }
+
     /**
-    * @return \sm_equip_levelupgrade equip_levelupgrade item数据 
-    */
-    public static function equip_levelupgrade_getItem($itemid)
-    { 
+     * @return \sm_equip_levelupgrade equip_levelupgrade item数据
+     */
+    public static function equip_levelupgrade_getItem($itemid) {
         return self::get_hash_item('equip_levelupgrade', $itemid);
     }
+
     /**
-    * 章节礼包表
-    * @return \shop_gategift
-    */
-    public static function shop_gategift()
-    { 
-        static $a = null; 
+     * 章节礼包表
+     * @return \shop_gategift
+     */
+    public static function shop_gategift() {
+        static $a = null;
         return self::initValue($a, 'shop_gategift');
     }
+
     /**
-    * @return \sm_shop_gategift shop_gategift item数据 
-    */
-    public static function shop_gategift_getItem($itemid)
-    { 
+     * @return \sm_shop_gategift shop_gategift item数据
+     */
+    public static function shop_gategift_getItem($itemid) {
         return self::get_hash_item('shop_gategift', $itemid);
     }
+
     /**
-    * 每日商店
-    * @return \shop_daily
-    */
-    public static function shop_daily()
-    { 
-        static $a = null; 
+     * 每日商店
+     * @return \shop_daily
+     */
+    public static function shop_daily() {
+        static $a = null;
         return self::initValue($a, 'shop_daily');
     }
+
     /**
-    * @return \sm_shop_daily shop_daily item数据 
-    */
-    public static function shop_daily_getItem($itemid)
-    { 
+     * @return \sm_shop_daily shop_daily item数据
+     */
+    public static function shop_daily_getItem($itemid) {
         return self::get_hash_item('shop_daily', $itemid);
     }
+
     /**
-    * 钻石商店
-    * @return \shop_cash
-    */
-    public static function shop_cash()
-    { 
-        static $a = null; 
+     * 钻石商店
+     * @return \shop_cash
+     */
+    public static function shop_cash() {
+        static $a = null;
         return self::initValue($a, 'shop_cash');
     }
+
     /**
-    * @return \sm_shop_cash shop_cash item数据 
-    */
-    public static function shop_cash_getItem($itemid)
-    { 
+     * @return \sm_shop_cash shop_cash item数据
+     */
+    public static function shop_cash_getItem($itemid) {
         return self::get_hash_item('shop_cash', $itemid);
     }
+
     /**
-    * 金币商店
-    * @return \shop_gold
-    */
-    public static function shop_gold()
-    { 
-        static $a = null; 
+     * 金币商店
+     * @return \shop_gold
+     */
+    public static function shop_gold() {
+        static $a = null;
         return self::initValue($a, 'shop_gold');
     }
+
     /**
-    * @return \sm_shop_gold shop_gold item数据 
-    */
-    public static function shop_gold_getItem($itemid)
-    { 
+     * @return \sm_shop_gold shop_gold item数据
+     */
+    public static function shop_gold_getItem($itemid) {
         return self::get_hash_item('shop_gold', $itemid);
     }
+
     /**
-    * 商城供给表-应该是废弃了
-    * @return \shop_supply
-    */
-    public static function shop_supply()
-    { 
-        static $a = null; 
+     * 商城供给表-应该是废弃了
+     * @return \shop_supply
+     */
+    public static function shop_supply() {
+        static $a = null;
         return self::initValue($a, 'shop_supply');
     }
+
     /**
-    * @return \sm_shop_supply shop_supply item数据 
-    */
-    public static function shop_supply_getItem($itemid)
-    { 
+     * @return \sm_shop_supply shop_supply item数据
+     */
+    public static function shop_supply_getItem($itemid) {
         return self::get_hash_item('shop_supply', $itemid);
     }
+
     /**
-    * 词条配置表
-    * @return \predicate
-    */
-    public static function predicate()
-    { 
-        static $a = null; 
+     * 词条配置表
+     * @return \predicate
+     */
+    public static function predicate() {
+        static $a = null;
         return self::initValue($a, 'predicate');
     }
+
     /**
-    * @return \sm_predicate predicate item数据 
-    */
-    public static function predicate_getItem($itemid)
-    { 
+     * @return \sm_predicate predicate item数据
+     */
+    public static function predicate_getItem($itemid) {
         return self::get_hash_item('predicate', $itemid);
     }
+
     /**
-    * 商城军备
-    * @return \shop_junbei
-    */
-    public static function shop_junbei()
-    { 
-        static $a = null; 
+     * 商城军备
+     * @return \shop_junbei
+     */
+    public static function shop_junbei() {
+        static $a = null;
         return self::initValue($a, 'shop_junbei');
     }
+
     /**
-    * @return \sm_shop_junbei shop_junbei item数据 
-    */
-    public static function shop_junbei_getItem($itemid)
-    { 
+     * @return \sm_shop_junbei shop_junbei item数据
+     */
+    public static function shop_junbei_getItem($itemid) {
         return self::get_hash_item('shop_junbei', $itemid);
     }
+
     /**
-    * 进化表
-    * @return \evolve
-    */
-    public static function evolve()
-    { 
-        static $a = null; 
+     * 进化表
+     * @return \evolve
+     */
+    public static function evolve() {
+        static $a = null;
         return self::initValue($a, 'evolve');
     }
+
     /**
-    * @return \sm_evolve evolve item数据 
-    */
-    public static function evolve_getItem($itemid)
-    { 
+     * @return \sm_evolve evolve item数据
+     */
+    public static function evolve_getItem($itemid) {
         return self::get_hash_item('evolve', $itemid);
     }
+
     /**
-    * 7日签到累计
-    * @return \active_day7_accumulate
-    */
-    public static function active_day7_accumulate()
-    { 
-        static $a = null; 
+     * 7日签到累计
+     * @return \active_day7_accumulate
+     */
+    public static function active_day7_accumulate() {
+        static $a = null;
         return self::initValue($a, 'active_day7_accumulate');
     }
+
     /**
-    * @return \sm_active_day7_accumulate active_day7_accumulate item数据 
-    */
-    public static function active_day7_accumulate_getItem($itemid)
-    { 
+     * @return \sm_active_day7_accumulate active_day7_accumulate item数据
+     */
+    public static function active_day7_accumulate_getItem($itemid) {
         return self::get_hash_item('active_day7_accumulate', $itemid);
     }
+
     /**
-    * 宝石表
-    * @return \gem
-    */
-    public static function gem()
-    { 
-        static $a = null; 
+     * 宝石表
+     * @return \gem
+     */
+    public static function gem() {
+        static $a = null;
         return self::initValue($a, 'gem');
     }
+
     /**
-    * @return \sm_gem gem item数据 
-    */
-    public static function gem_getItem($itemid)
-    { 
+     * @return \sm_gem gem item数据
+     */
+    public static function gem_getItem($itemid) {
         return self::get_hash_item('gem', $itemid);
     }
+
     /**
-    * 秘宝表
-    * @return \gate_sbox
-    */
-    public static function gate_sbox()
-    { 
-        static $a = null; 
+     * 秘宝表
+     * @return \gate_sbox
+     */
+    public static function gate_sbox() {
+        static $a = null;
         return self::initValue($a, 'gate_sbox');
     }
+
     /**
-    * @return \sm_gate_sbox gate_sbox itemArray 
-    */
-    public static function gate_sbox_getItemArray($key)
-    { 
+     * @return \sm_gate_sbox gate_sbox itemArray
+     */
+    public static function gate_sbox_getItemArray($key) {
         return self::get_hash_item('gate_sbox', $key);
     }
+
     /**
-    * 最新的成就
-    * @return \achieve_new
-    */
-    public static function achieve_new()
-    { 
-        static $a = null; 
+     * 最新的成就
+     * @return \achieve_new
+     */
+    public static function achieve_new() {
+        static $a = null;
         return self::initValue($a, 'achieve_new');
     }
+
     /**
-    * @return \sm_achieve_new achieve_new item数据 
-    */
-    public static function achieve_new_getItem($itemid)
-    { 
+     * @return \sm_achieve_new achieve_new item数据
+     */
+    public static function achieve_new_getItem($itemid) {
         return self::get_hash_item('achieve_new', $itemid);
     }
+
     /**
-    * 人物属性
-    * @return \heroattr
-    */
-    public static function heroattr()
-    { 
-        static $a = null; 
+     * 人物属性
+     * @return \heroattr
+     */
+    public static function heroattr() {
+        static $a = null;
         return self::initValue($a, 'heroattr');
     }
+
     /**
-    * @return \sm_heroattr heroattr item数据 
-    */
-    public static function heroattr_getItem($itemid)
-    { 
+     * @return \sm_heroattr heroattr item数据
+     */
+    public static function heroattr_getItem($itemid) {
         return self::get_hash_item('heroattr', $itemid);
     }
+
     /**
-    * 剧情对话
-    * @return \plots
-    */
-    public static function plots()
-    { 
-        static $a = null; 
+     * 剧情对话
+     * @return \plots
+     */
+    public static function plots() {
+        static $a = null;
         return self::initValue($a, 'plots');
     }
+
     /**
-    * @return \sm_plots plots item数据 
-    */
-    public static function plots_getItem($itemid)
-    { 
+     * @return \sm_plots plots item数据
+     */
+    public static function plots_getItem($itemid) {
         return self::get_hash_item('plots', $itemid);
     }
+
     /**
-    * 商城宝箱表
-    * @return \shop_box
-    */
-    public static function shop_box()
-    { 
-        static $a = null; 
+     * 商城宝箱表
+     * @return \shop_box
+     */
+    public static function shop_box() {
+        static $a = null;
         return self::initValue($a, 'shop_box');
     }
+
     /**
-    * @return \sm_shop_box shop_box item数据 
-    */
-    public static function shop_box_getItem($itemid)
-    { 
+     * @return \sm_shop_box shop_box item数据
+     */
+    public static function shop_box_getItem($itemid) {
         return self::get_hash_item('shop_box', $itemid);
     }
+
     /**
-    * 商城月卡
-    * @return \shop_monthcard
-    */
-    public static function shop_monthcard()
-    { 
-        static $a = null; 
+     * 商城月卡
+     * @return \shop_monthcard
+     */
+    public static function shop_monthcard() {
+        static $a = null;
         return self::initValue($a, 'shop_monthcard');
     }
+
     /**
-    * @return \sm_shop_monthcard shop_monthcard item数据 
-    */
-    public static function shop_monthcard_getItem($itemid)
-    { 
+     * @return \sm_shop_monthcard shop_monthcard item数据
+     */
+    public static function shop_monthcard_getItem($itemid) {
         return self::get_hash_item('shop_monthcard', $itemid);
     }
+
     /**
-    * 7日狂欢活跃点奖励
-    * @return \activepointreward
-    */
-    public static function activepointreward()
-    { 
-        static $a = null; 
+     * 7日狂欢活跃点奖励
+     * @return \activepointreward
+     */
+    public static function activepointreward() {
+        static $a = null;
         return self::initValue($a, 'activepointreward');
     }
+
     /**
-    * @return \sm_activepointreward activepointreward item数据 
-    */
-    public static function activepointreward_getItem($type, $pointId)
-    { 
+     * @return \sm_activepointreward activepointreward item数据
+     */
+    public static function activepointreward_getItem($type, $pointId) {
         return self::get_hash_item('activepointreward', "$type-$pointId");
     }
+
     /**
-    * 活动任务
-    * @return \activeTask
-    */
-    public static function activeTask()
-    { 
-        static $a = null; 
+     * 活动任务
+     * @return \activeTask
+     */
+    public static function activeTask() {
+        static $a = null;
         return self::initValue($a, 'activeTask');
     }
+
     /**
-    * @return \sm_activeTask activeTask item数据 
-    */
-    public static function activeTask_getItem($itemid)
-    { 
+     * @return \sm_activeTask activeTask item数据
+     */
+    public static function activeTask_getItem($itemid) {
         return self::get_hash_item('activeTask', $itemid);
     }
+
     /**
-    * 活动任务根据类型的不同分开
-    * @return \activeTask_type
-    */
-    public static function activeTask_type()
-    { 
-        static $a = null; 
+     * 活动任务根据类型的不同分开
+     * @return \activeTask_type
+     */
+    public static function activeTask_type() {
+        static $a = null;
         return self::initValue($a, 'activeTask_type');
     }
+
     /**
-    * @return \sm_activeTask_type activeTask_type itemArray 
-    */
-    public static function activeTask_type_getItemArray($key)
-    { 
+     * @return \sm_activeTask_type activeTask_type itemArray
+     */
+    public static function activeTask_type_getItemArray($key) {
         return self::get_hash_item('activeTask_type', $key);
     }
+
     /**
-    * 活动
-    * @return \activity
-    */
-    public static function activity()
-    { 
-        static $a = null; 
+     * 活动
+     * @return \activity
+     */
+    public static function activity() {
+        static $a = null;
         return self::initValue($a, 'activity');
     }
+
     /**
-    * @return \sm_activity activity item数据 
-    */
-    public static function activity_getItem($itemid)
-    { 
+     * @return \sm_activity activity item数据
+     */
+    public static function activity_getItem($itemid) {
         return self::get_hash_item('activity', $itemid);
     }
+
     /**
-    * 公告
-    * @return \announcement
-    */
-    public static function announcement()
-    { 
-        static $a = null; 
+     * 公告
+     * @return \announcement
+     */
+    public static function announcement() {
+        static $a = null;
         return self::initValue($a, 'announcement');
     }
+
     /**
-    * @return \sm_announcement announcement item数据 
-    */
-    public static function announcement_getItem($itemid)
-    { 
+     * @return \sm_announcement announcement item数据
+     */
+    public static function announcement_getItem($itemid) {
         return self::get_hash_item('announcement', $itemid);
     }
+
     /**
-    * 战力荣誉榜信息
-    * @return \rank_fightpowerreward
-    */
-    public static function rank_fightpowerreward()
-    { 
-        static $a = null; 
+     * 战力荣誉榜信息
+     * @return \rank_fightpowerreward
+     */
+    public static function rank_fightpowerreward() {
+        static $a = null;
         return self::initValue($a, 'rank_fightpowerreward');
     }
+
     /**
-    * @return \sm_rank_fightpowerreward rank_fightpowerreward item数据 
-    */
-    public static function rank_fightpowerreward_getItem($itemid)
-    { 
+     * @return \sm_rank_fightpowerreward rank_fightpowerreward item数据
+     */
+    public static function rank_fightpowerreward_getItem($itemid) {
         return self::get_hash_item('rank_fightpowerreward', $itemid);
     }
+
     /**
-    * 主线荣誉榜信息
-    * @return \rank_passgatereward
-    */
-    public static function rank_passgatereward()
-    { 
-        static $a = null; 
+     * 主线荣誉榜信息
+     * @return \rank_passgatereward
+     */
+    public static function rank_passgatereward() {
+        static $a = null;
         return self::initValue($a, 'rank_passgatereward');
     }
+
     /**
-    * @return \sm_rank_passgatereward rank_passgatereward item数据 
-    */
-    public static function rank_passgatereward_getItem($itemid)
-    { 
+     * @return \sm_rank_passgatereward rank_passgatereward item数据
+     */
+    public static function rank_passgatereward_getItem($itemid) {
         return self::get_hash_item('rank_passgatereward', $itemid);
     }
+
     /**
-    * 玩家等级表
-    * @return \player_level
-    */
-    public static function player_level()
-    { 
-        static $a = null; 
+     * 玩家等级表
+     * @return \player_level
+     */
+    public static function player_level() {
+        static $a = null;
         return self::initValue($a, 'player_level');
     }
+
     /**
-    * @return \sm_player_level player_level item数据 
-    */
-    public static function player_level_getItem($itemid)
-    { 
+     * @return \sm_player_level player_level item数据
+     */
+    public static function player_level_getItem($itemid) {
         return self::get_hash_item('player_level', $itemid);
     }
+
     /**
-    * 当前版本(时间戳)
-    * @return \ver
-    */
-    public static function ver()
-    { 
-        static $a = null; 
+     * 当前版本(时间戳)
+     * @return \ver
+     */
+    public static function ver() {
+        static $a = null;
         return self::initValue($a, 'ver', false);
     }
+
     /**
-    * 客户端配置数据
-    * @return \client
-    */
-    public static function client()
-    { 
-        static $a = null; 
+     * 客户端配置数据
+     * @return \client
+     */
+    public static function client() {
+        static $a = null;
         return self::initValue($a, 'client', false);
     }
 }
-

Gameserver/App/model/Const/GameConfig.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2024-05-28 14:39:48
+ // 日期: 2024-05-30 09:45:20
 ////////////////////
 
 /**

Gameserver/App/model/Const/sm_gate.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2024-05-27 15:34:57
+ // 日期: 2024-05-30 09:12:59
 ////////////////////
 
 
@@ -47,35 +47,15 @@ class sm_gate
     public $desc;
 
     /**
-    * @var String 通关奖励字符串(包含首次和再刷)(id,num;id,num...)  
+    * @var String 【废弃2024.5.29】通关奖励字符串(包含首次和再刷)(id,num;id,num...)  
     */
     public $reward_win;
 
     /**
-    * @var String 通关宝石奖励  
-    */
-    public $rewardGem_win;
-
-    /**
-    * @var String 通关图纸奖励  
-    */
-    public $rewardTuZhi_win;
-
-    /**
-    * @var String 通关失败奖励(id,num;id,num...)  
+    * @var String 【废弃2024.5.29】通关失败奖励(id,num;id,num...)  
     */
     public $reward_fail;
 
-    /**
-    * @var String 通关失败宝石奖励  
-    */
-    public $rewardGem_fail;
-
-    /**
-    * @var String 通关失败图纸奖励  
-    */
-    public $rewardTuZhi_fail;
-
     /**
     * @var String 5分钟  
     */
@@ -112,7 +92,7 @@ class sm_gate
     public $reliveLimit;
 
     /**
-    * @var Int32 金币补给宝箱金币基础值 default(100) 
+    * @var Int32 金币补给宝箱金币基础值(0:关闭) default(100) 
     */
     public $goldBujiBox;
 

Gameserver/App/model/Const/sm_globalsettings.php

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

Gameserver/App/model/Const/sm_hero.php

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

Gameserver/App/model/Const/sm_predicate.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2024-05-28 09:01:42
+ // 日期: 2024-05-29 11:43:18
 ////////////////////
 
 

Gameserver/App/model/Const/sm_waves.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2024-05-28 14:37:43
+ // 日期: 2024-05-30 09:18:36
 ////////////////////
 
 
@@ -64,9 +64,29 @@ class sm_waves
     public $condition;
 
     /**
-    * @var String 本层奖励: (id,数量;id,数量;...)  
+    * @var String 【挑战模式】本层奖励: (id,数量;id,数量;...)  
     */
     public $rewards;
 
+    /**
+    * @var String 通关宝石奖励(min-max;qual:weight,qual:weight,...)  
+    */
+    public $rewardGem;
+
+    /**
+    * @var Int32 通关金币奖励 default(0) 
+    */
+    public $rewardGold;
+
+    /**
+    * @var Int32 通关(指挥官)经验奖励 default(0) 
+    */
+    public $rewardExp;
+
+    /**
+    * @var Int32 通关图纸奖励(数量) default(0) 
+    */
+    public $rewardTuZhi;
+
 }
 

Gameserver/App/process/FightProc.php

@@ -37,9 +37,9 @@ class FightProc {
                 return self::TowerRefreshSkills();
             case CmdCode::fight_tower_updatelocklist:                           # 6810 挑战关卡: 更新技能锁定列表
                 return self::TowerUpdateLockskillList();
-            case CmdCode::fight_rankInfo:                                       # 6811 获取主线关卡排行榜信息    
+            case CmdCode::fight_rankInfo:                                       # 6811 获取主线关卡排行榜信息
                 return self::GetRankInfo();
-            case CmdCode::fight_rank_uidEquipInfo:                              # 6812 获取主线关卡榜内玩家的装备信息    
+            case CmdCode::fight_rank_uidEquipInfo:                              # 6812 获取主线关卡榜内玩家的装备信息
                 return self::GetUidEquipInfo_Rank();
             case CmdCode::fight_rank_GetMainGateRankRewardInfo:                 # 6813 获取通关荣誉榜信息
                 return self::GetmainGate_RankRewardInfo();
@@ -110,7 +110,7 @@ class FightProc {
             'fightSweepNum' => ctx()->gates->fightSweepNum,
             'prizeArr' => $prizeArr,
             'store' => ctx()->store,
-            'task'=> ctx()->task,
+            'task' => ctx()->task,
         );
         return Resp::ok($ret);
     }
@@ -391,29 +391,29 @@ class FightProc {
         $t->skill_zhudong_lockState = $li_zds;
         $t->skill_beidong_lockState = $li_bds;
         UserProc::updateUserInfo();
-        
-        $ret = array(               
-                'task'=> ctx()->task,
-            );
+
+        $ret = array(
+            'task' => ctx()->task,
+        );
         return Resp::ok($ret);
     }
 
     /**
      * 6805
      * @return type
-     * @deprecated since version 2024年5月17日
+     * @deprecated since version 2024年5月17日 已合并到6801
      */
     public static function ChallengeGateStartFight() {
-        list($layerNum) = req()->paras;
-        if ($layerNum != ctx()->gates()->TowerGateInfo()->CurLayer) {           # 起始层数校验
-            return Resp::err(ErrCode::tower_layerNum);
-        }
-        if (ctx()->gates()->TowerGateInfo()->TodayChanNum < 1) {                # 剩余次数校验
-            return Resp::err(ErrCode::tower_timeNo);
-        }
-        ctx()->gates()->TowerGateInfo()->TodayChanNum--;                        # 增加次数
-        UserProc::updateUserInfo();
-        return Resp::ok();
+//        list($layerNum) = req()->paras;
+//        if ($layerNum != ctx()->gates()->TowerGateInfo()->CurLayer) {           # 起始层数校验
+//            return Resp::err(ErrCode::tower_layerNum);
+//        }
+//        if (ctx()->gates()->TowerGateInfo()->TodayChanNum < 1) {                # 剩余次数校验
+//            return Resp::err(ErrCode::tower_timeNo);
+//        }
+//        ctx()->gates()->TowerGateInfo()->TodayChanNum--;                        # 增加次数
+//        UserProc::updateUserInfo();
+//        return Resp::ok();
     }
 
     /**
@@ -438,7 +438,7 @@ class FightProc {
                 'store' => ctx()->store,
                 'gold' => ctx()->base()->gold,
                 'cash' => ctx()->base()->cash,
-                'task'=> ctx()->task,
+                'task' => ctx()->task,
             );
             return Resp::ok($ret);
         }
@@ -518,8 +518,8 @@ class FightProc {
         $ret = array(
             'gates' => ctx()->gates,
             'store' => ctx()->store,
-            'task'=> ctx()->task,
-            'gold'=> ctx()->baseInfo->gold,
+            'task' => ctx()->task,
+            'gold' => ctx()->baseInfo->gold,
         );
         return Resp::ok($ret);
     }
@@ -530,6 +530,72 @@ class FightProc {
      */
     public static function Settle() {
         list($resultType, $gateId, $gold, $curTs, $pickups) = req()->paras;
+        # 客户端需要增加参数: killmonserNum,killBosssNum, finalHpPercent(最终血量百分比)
+        $gateMo = GameConfig::gate_getItem($gateId);
+        my_Assert($gateMo != null, ErrCode::err_const_no);
+        my_Assert(StlUtil::dictHasProperty(ctx()->gates->GateList, $gateId), ErrCode::gate_NoUserGateInfo);
+        $gateInfo = ctx()->gates->GateList->$gateId;
+        $ts = $gateInfo->MaxSeconds;
+        if ($curTs >= $ts) {
+            $gateInfo->MaxSeconds = $curTs;
+        }
+        if ($resultType) {                                                      # 胜利
+            if (ctx()->gates->GateList->$gateId->pass == 0) {
+                ctx()->gates->GateList->$gateId->pass = 1;
+                TaskProc::Day7TaskReset($gateId);
+            }
+            TaskProc::OnPassGate_X($gateId);
+            StoreProc::AddMultiItemInStore($gateMo->reward_win);
+            if (Ins_GateInfo::GateTypeFromId($gateId) == Enum_GateType::MainStoryGate) {
+                ctx()->gates->UnlockNextPlotGate();
+                $dic = GameConfig::gate();
+                $index = 0;                                                   # 挑战关卡解锁逻辑. -gwang 2024年4月15日
+                foreach ($dic as $id => $item) {
+                    if (Ins_GateInfo::GateTypeFromId($id) == Enum_GateType::MainChallengeGate && $item->challengeGateId == $gateId) {
+                        $index += 1;
+                        $gate = new Ins_GateInfo();
+                        $gate->GateId = $id;
+                        ctx()->gates->GateList->$id = $gate;
+                    }
+                    if ($index >= 3) {
+                        break;
+                    }
+                }
+            } else {
+
+            }
+        } else {                                                                # 失败
+            StoreProc::AddMultiItemInStore($gateMo->reward_fail);
+        }
+
+        StoreProc::AddMultiItemInStore($pickups);                               # 战场拾取道具
+        ctx()->baseInfo->Add_Gold($gold);
+        //ctx()->baseInfo->Add_Exp($exp);
+
+        if (Ins_GateInfo::GateTypeFromId($gateId) == Enum_GateType::MainStoryGate) {
+            TaskProc::OnFightNumMainGate();
+        } else if (Ins_GateInfo::GateTypeFromId($gateId) == Enum_GateType::MainChallengeGate) {
+            TaskProc::OnFightNumChallengeGate();
+        }
+        TaskProc::OnKillCommonNumMonster(1000);
+        TaskProc::OnKillleaderNumMonster(500);
+
+        UserProc::updateUserInfo();
+        $ret = array(
+            'gates' => ctx()->gates,
+            'store' => ctx()->store,
+            'task' => ctx()->task,
+        );
+        return Resp::ok($ret);
+    }
+
+    /**
+     * [6801]关卡战斗结算
+     * @return type
+     */
+    public static function Settle_bak() {
+        list($resultType, $gateId, $gold, $curTs, $pickups) = req()->paras;
+        # 客户端需要增加参数: killmonserNum,killBosssNum, finalHpPercent(最终血量百分比)
         $gateMo = GameConfig::gate_getItem($gateId);
         my_Assert($gateMo != null, ErrCode::err_const_no);
         my_Assert(StlUtil::dictHasProperty(ctx()->gates->GateList, $gateId), ErrCode::gate_NoUserGateInfo);
@@ -541,7 +607,7 @@ class FightProc {
         if ($resultType) {                                                      # 胜利
             if (ctx()->gates->GateList->$gateId->pass == 0) {
                 ctx()->gates->GateList->$gateId->pass = 1;
-                TaskProc::Day7TaskReset($gateId);                                
+                TaskProc::Day7TaskReset($gateId);
             }
             TaskProc::OnPassGate_X($gateId);
             StoreProc::AddMultiItemInStore($gateMo->reward_win);
@@ -571,23 +637,23 @@ class FightProc {
         ctx()->baseInfo->Add_Gold($gold);
         //ctx()->baseInfo->Add_Exp($exp);
 
-        if(Ins_GateInfo::GateTypeFromId($gateId) == Enum_GateType::MainStoryGate){
+        if (Ins_GateInfo::GateTypeFromId($gateId) == Enum_GateType::MainStoryGate) {
             TaskProc::OnFightNumMainGate();
-        } else if(Ins_GateInfo::GateTypeFromId($gateId) == Enum_GateType::MainChallengeGate){
+        } else if (Ins_GateInfo::GateTypeFromId($gateId) == Enum_GateType::MainChallengeGate) {
             TaskProc::OnFightNumChallengeGate();
         }
         TaskProc::OnKillCommonNumMonster(1000);
         TaskProc::OnKillleaderNumMonster(500);
-             
+
         UserProc::updateUserInfo();
         $ret = array(
             'gates' => ctx()->gates,
             'store' => ctx()->store,
-            'task'=> ctx()->task,
+            'task' => ctx()->task,
         );
         return Resp::ok($ret);
     }
-         
+
     /**
      * 参与主线关卡排行榜
      * @param type $gateIndex
@@ -597,16 +663,16 @@ class FightProc {
         $mem = gMem();
         $arr = array();
         $uid = req()->uid;
-        $arr["$uid"] = $maxGateIndex;    
-        $mem->zadd($memKey,$arr);
-        
+        $arr["$uid"] = $maxGateIndex;
+        $mem->zadd($memKey, $arr);
+
         $length = $mem->zlen($memKey);
-        if($length > glc()->Rank_MainGateIndex_OnListRank){
+        if ($length > glc()->Rank_MainGateIndex_OnListRank) {
             $num = $length - glc()->Rank_MainGateIndex_OnListRank;
-            $mem->zremrangebyrank($memKey,0, $num-1);
-        }      
+            $mem->zremrangebyrank($memKey, 0, $num - 1);
+        }
     }
-    
+
     /**
      * 战力榜
      * @param type $gateIndex
@@ -617,95 +683,95 @@ class FightProc {
         $arr = array();
         $uid = req()->uid;
         $power = 10;
-        $arr["$uid"] = $power;    
-        $mem->zadd($memKey,$arr);
-        
+        $arr["$uid"] = $power;
+        $mem->zadd($memKey, $arr);
+
         $length = $mem->zlen($memKey);
-        if($length > glc()->Rank_FightPower_OnListRank){
+        if ($length > glc()->Rank_FightPower_OnListRank) {
             $num = $length - glc()->Rank_FightPower_OnListRank;
-            $mem->zremrangebyrank($memKey,0, $num-1);
-        }      
+            $mem->zremrangebyrank($memKey, 0, $num - 1);
+        }
     }
-    
+
     /**
-     * 6811 获取主线关卡排行榜信息    
+     * 6811 获取主线关卡排行榜信息
      * @return type
      */
     public static function GetRankInfo() {
-        list($type) = req()->paras;               
-        
+        list($type) = req()->paras;
+
         $selfIsHasRank = 0; //本人是否上榜 0未上榜没有排名 1上榜则selfRank就是排名
         $selfExtraInfo = 0;
-                      
-        if($type == 1){
-            $list = gMem()->zrevrange(MemKey_GameRun::Rank_MainGateIndex_Zone_zset(req()->zoneid),0, glc()->Rank_MainGateIndex_OnListRank, true);
+
+        if ($type == 1) {
+            $list = gMem()->zrevrange(MemKey_GameRun::Rank_MainGateIndex_Zone_zset(req()->zoneid), 0, glc()->Rank_MainGateIndex_OnListRank, true);
             $selfExtraInfo = ctx()->gates->UnlockedGatesMaxId;
         } else {
-            $list = gMem()->zrevrange(MemKey_GameRun::Rank_FightPower_Zone_zset(req()->zoneid),0, glc()->Rank_FightPower_OnListRank, true);
-            $selfExtraInfo = 0;//战力还没有
+            $list = gMem()->zrevrange(MemKey_GameRun::Rank_FightPower_Zone_zset(req()->zoneid), 0, glc()->Rank_FightPower_OnListRank, true);
+            $selfExtraInfo = 0; //战力还没有
         }
-        
+
         $selfRank = self::initOtherUidRankInfo(req()->uid, $selfExtraInfo);
-        
+
         $retArr = array();
-        if(count($list)>0){
+        if (count($list) > 0) {
             foreach ($list as $uid => $score) {
                 $rankInfo = self::initOtherUidRankInfo($uid, $score);
-                if($rankInfo->uid == req()->uid){
+                if ($rankInfo->uid == req()->uid) {
                     $selfIsHasRank = 1;
                     $selfRank = $rankInfo;
                 }
-                
+
                 $retArr[] = $rankInfo;
-            }                     
+            }
         }
-        
+
         UserProc::updateUserInfo();
         $ret = array(
             'rankInfo' => $retArr,
-            'selfRank' =>$selfRank,
-            'selfIsHasRank' => $selfIsHasRank,         
+            'selfRank' => $selfRank,
+            'selfIsHasRank' => $selfIsHasRank,
         );
         return Resp::ok($ret);
     }
-    
+
     /**
      * 初始化玩家rank
      * @param type $uid
      * @param type $score
      * @return \loyalsoft\Ins_rank
      */
-    static function initOtherUidRankInfo($uid,$score) {       
+    static function initOtherUidRankInfo($uid, $score) {
         $ins_rank = new Ins_rank();
         $lv = gMem()->zrank(MemKey_GameRun::Rank_MainGateIndex_Zone_zset(req()->zoneid), $uid);
-        if($lv == null){
+        if ($lv == null) {
             $lv = 0;
         }
-        $ins_rank->rank = $lv+1;
+        $ins_rank->rank = $lv + 1;
         $ins_rank->uid = $uid;
         $userInfo = UserProc::getUserGame(req()->zoneid, $uid);
         $ins_rank->name = $userInfo->baseInfo->name;
         $ins_rank->headImg = $userInfo->baseInfo->headImg;
-        
+
         $ins_rank->score = $score;
         return $ins_rank;
     }
-    
+
     /**
-     * 6812 获取排行榜内玩家的装备信息   
+     * 6812 获取排行榜内玩家的装备信息
      * @return type
      */
     public static function GetUidEquipInfo_Rank() {
         list($uid) = req()->paras;
-        $userInfo = UserProc::getUserGame(req()->zoneid, $uid);    
-     
+        $userInfo = UserProc::getUserGame(req()->zoneid, $uid);
+
         $store = $userInfo->store;
-        $heros = $userInfo->heros;    
-        
+        $heros = $userInfo->heros;
+
         UserProc::updateUserInfo();
         $ret = array(
             'store' => $store,
-            'heros' =>$heros,           
+            'heros' => $heros,
         );
         return Resp::ok($ret);
     }
@@ -716,65 +782,66 @@ class FightProc {
      */
     public static function IsAchievedMainGate_PassReward($maxGateIndex) {
         $rewards = GameConfig::rank_passgatereward();
-        
-        $memKey = MemKey_GameRun::RankReward_MainGateIndex_Zone_hash(req()->zoneid);                
+
+        $memKey = MemKey_GameRun::RankReward_MainGateIndex_Zone_hash(req()->zoneid);
         foreach ($rewards as $passGateId => $mo) {
-            if($passGateId == $maxGateIndex && !gMem()->hexists($memKey, $maxGateIndex)){
+            if ($passGateId == $maxGateIndex && !gMem()->hexists($memKey, $maxGateIndex)) {
                 gMem()->hset($memKey, $maxGateIndex, req()->uid);
                 break;
             }
-        }       
+        }
     }
-     
+
     /*
      * 战力奖励是否达成
      */
+
     public static function IsAchievedFightPower_PassReward() {
-        $power = 0;//临时
+        $power = 0; //临时
         $rewards = GameConfig::rank_fightpowerreward();
-        
-        $memKey = MemKey_GameRun::RankReward_FightPower_Zone_hash(req()->zoneid);                
+
+        $memKey = MemKey_GameRun::RankReward_FightPower_Zone_hash(req()->zoneid);
         foreach ($rewards as $fightPower => $mo) {
-            if($power>=$fightPower && !gMem()->hexists($memKey, $fightPower)){
-                gMem()->hset($memKey, $fightPower, req()->uid);           
+            if ($power >= $fightPower && !gMem()->hexists($memKey, $fightPower)) {
+                gMem()->hset($memKey, $fightPower, req()->uid);
             }
-        } 
+        }
     }
-    
+
     /**
-     * 6813 
+     * 6813
      * @return type
      */
     public static function GetmainGate_RankRewardInfo() {
-        //list($type) = req()->paras;               
-                                           
-        $memKey = MemKey_GameRun::RankReward_MainGateIndex_Zone_hash(req()->zoneid);              
+        //list($type) = req()->paras;
+
+        $memKey = MemKey_GameRun::RankReward_MainGateIndex_Zone_hash(req()->zoneid);
         $dic = gMem()->hgetall($memKey);
-        
+
         UserProc::updateUserInfo();
         $ret = array(
-            'rankReward' => $dic,             
+            'rankReward' => $dic,
         );
         return Resp::ok($ret);
     }
-    
+
     /**
-     * 6814 
+     * 6814
      * @return type
      */
     public static function GetFightPower_RankRewardInfo() {
-        //list($type) = req()->paras;               
-                                           
-        $memKey = MemKey_GameRun::RankReward_FightPower_Zone_hash(req()->zoneid);              
+        //list($type) = req()->paras;
+
+        $memKey = MemKey_GameRun::RankReward_FightPower_Zone_hash(req()->zoneid);
         $dic = gMem()->hgetall($memKey);
-        
+
         UserProc::updateUserInfo();
         $ret = array(
-            'rankReward' => $dic,             
+            'rankReward' => $dic,
         );
         return Resp::ok($ret);
     }
-    
+
     /**
      * 6815 领取通关荣誉榜奖励
      * @return type