gwang 4 éve
szülő
commit
7f8cd6bc86

+ 1 - 5
Gameserver/Amfphp/base/Resp.php

@@ -71,11 +71,7 @@ class Resp extends Object_ext {
         return $resp;
     }
 
-    static $ext_events = array(array(
-            'name' => 'HelloWorld',
-            'arg1' => "你好,",
-            'arg2' => "世界!"
-    ));
+    static $ext_events = array();
 
     public static function AddEvent($name, $arg1, $arg2) {
         self::$ext_events[] = array(

+ 1 - 0
Gameserver/Amfphp/index.php

@@ -78,6 +78,7 @@ class Index {
             $rt->start();
         }
         $app = new AppServer();                                                 # 初始化业务框架
+
         $resp = $app->api(req());                                               # 分发处理逻辑
         if (self::$isDebugging) {                                               # 组织调试信息
             $rt->end();                                                         # 计时器结束

+ 32 - 0
Gameserver/Amfphp/model/User/EnumTaskType.php

@@ -31,3 +31,35 @@ class EnumTaskType extends Enum {
     const PlotOver = 203;
 
 }
+
+/**
+ * 任务卡状态类型
+ */
+class TaskCardStateType {
+
+    /**
+     * 全部
+     */
+    const all = 0;
+
+    /**
+     * 未开启(未激活)
+     */
+    const notopen = 1;
+
+    /**
+     * 进行中(已激活)
+     */
+    const ing = 2;
+
+    /**
+     * 已完成(未领奖)
+     */
+    const finish = 3;
+
+    /**
+     * 已领奖(可能会被删除)
+     */
+    const drawed = 4;
+
+}

+ 0 - 11
Gameserver/Amfphp/model/User/Info_Store.php

@@ -45,27 +45,16 @@ class Info_Store extends Object_ext {
      */
     public $segement;
 
-//    /**
-//     * 石头,叠加
-//     * @var object
-//     * @deprecated since version 0
-//     */
-//    public $stones;
-
     /**
      * 玩家注册时初始化
      */
     public function initialize() {
         $this->boxes = GameConfig::primordial_data()->User_Store_boxes;
-        //array('701001' => 0, '702002' => 0, '703003' => 0, '704004' => 0);
         $this->taskcards = ObjectInit();
         $this->items = JsonUtil::decode(GameConfig::primordial_data()->User_Store_items);         # 初始含有一张黄金通知书
         $this->equipment = JsonUtil::decode(GameConfig::primordial_data()->User_Store_equipment); # 装备初始化数据
         $this->yanling = JsonUtil::decode(GameConfig::primordial_data()->User_Store_yanling);     # 言灵初始化数据
         $this->segement = JsonUtil::decode(GameConfig::primordial_data()->User_Store_segment);    # 碎片
-//        $this->stones = ObjectInit();
-//        $this->element = GameConfig::primordial_data()->User_Store_element;
-        //array('388001' => 0, '388002' => 0, '388003' => 0, '388004' => 0, '388005' => 0, '388006' => 0, '388007' => 0);
     }
 
     /**

+ 1 - 1
Gameserver/Amfphp/process/EmailProc.php

@@ -29,7 +29,7 @@ class enum_Mail_Type extends Enum {
 /**
  * 邮件模块
  * @author gwang
- * @version 2.0.0 言灵世界2改版邮件系统 2020.8.13
+ * @version 2.0.0 言灵世界2》业务改版邮件系统 2020.8.13
  *           1.0.1 经过分析, 邮件系统有性能问题. 当邮件数量较多的时候, 如何优雅的处理,
  *             代码中无解决方案.
  *           1.0.0 created 邮件系统.

+ 0 - 0
Gameserver/Amfphp/process/PayProc/WebPayProc.php → Gameserver/Amfphp/process/PayProc/del_WebPayProc.php


+ 0 - 0
Gameserver/Amfphp/process/PayProc/YYBPay.php → Gameserver/Amfphp/process/PayProc/del_YYBPay.php


+ 1 - 1
Gameserver/Amfphp/process/TaskProc.php

@@ -37,7 +37,7 @@ class TaskProc {
         }
     }
 
-    // <editor-fold defaultstate="collapsed" desc="任务卡接口">
+    // <editor-fold defaultstate="collapsed" desc="  任务卡接口">
     // 
     /**
      * [6210]剧情对话-触发任务卡结束条件检测(中间某个step结束,进入下一个step)

+ 0 - 0
Gameserver/Amfphp/process/HeroDiscussProc.php → Gameserver/Amfphp/process/del_HeroDiscussProc.php


+ 6 - 6
Gameserver/Amfphp/test.php

@@ -16,9 +16,9 @@ echoLine("phpver: " . PHP_VERSION . PHP_EOL);
 //var_dump(GameConfig::primordial_data());
 
 
-test(function() {
-    $key = "test";
-    $v = gMem()->get($key);
-//    var_dump($v);
-    gMem()->set($key, \loyalsoft\TimeUtil::dtCurrent());
-}, 100);
+//test(function() {
+//    $key = "test";
+//    $v = gMem()->get($key);
+////    var_dump($v);
+//    gMem()->set($key, \loyalsoft\TimeUtil::dtCurrent());
+//}, 100);

+ 8 - 0
Gameserver/Docs/改进记录.md

@@ -1,6 +1,14 @@
 ## 改进记录
 
 
+## 2020.12.10 调整Model目录下文件命名规律.  
+  > author: gwang  
+  > digest: 学习自minipet项目组.  
+  1. 添加前缀规则.  
+    1.1 Data_前缀: 代表一个大的数据组织结构,比如玩家数据.  
+    1.2 Info_前缀: 代表一个模块级别的数据组织结构,比如仓库或者是baseInfo等.  
+    1.3 Ins_前缀:  代表是一个实例数据组织结构,比如一封邮件, 一把刀或者是一个英雄.  
+
 ## 2020-11-30 调整目录结构.删掉内嵌的PHPRedisAdmin代码. -gwang 
 
 ## 2020年11月24日 这次改动值得记录一下.

+ 9 - 1
Gameserver/nbproject/private/private.xml

@@ -12,7 +12,15 @@
     </editor-bookmarks>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
-            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/main.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/test.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/Services/AppServer.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/model/User/EnumTaskType.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/base/ErrCode.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/index.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/process/TaskProc.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/model/User/Info_Store.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/util/CRedisUtil.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/model/User/Data_UserGame.php</file>
         </group>
     </open-files>
 </project-private>