فهرست منبع

任务卡,战斗,创建账号流程修改.

gwang 4 سال پیش
والد
کامیت
1216c65a83

+ 17 - 1
Gameserver/Amfphp/model/Const/GameConfig.php

@@ -4,7 +4,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2021-02-04 17:30:36
+ // 日期: 2021-02-08 09:54:47
 ////////////////////
 
 /**
@@ -695,6 +695,22 @@ class GameConfig {
         return self::get_hash_item('segment_byPinzhi', $quailty)->$itemType;
     }
     /**
+    * 
+    * @return \npc
+    */
+    public static function npc()
+    { 
+        static $a = null; 
+        return self::initValue($a, 'npc');
+    }
+    /**
+    * @return \sm_npc npc item数据 
+    */
+    public static function npc_getItem($itemid)
+    { 
+        return self::get_hash_item('npc', $itemid);
+    }
+    /**
     * 活动: 在线礼包
     * @return \activity_onlinegift
     */

+ 1 - 1
Gameserver/Amfphp/model/Const/sm_item_taskcard.php

@@ -4,7 +4,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2021-02-04 16:21:24
+ // 日期: 2021-02-05 15:31:35
 ////////////////////
 
 

+ 68 - 0
Gameserver/Amfphp/model/Const/sm_npc.php

@@ -0,0 +1,68 @@
+<?php
+
+////////////////////
+ // 由CodeGenerator创建。
+ // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
+ // author: gwang 
+ // 日期: 2021-02-08 09:53:27
+////////////////////
+
+
+/**
+ * Static Model npc 
+ */
+class sm_npc
+{
+
+    /**
+    * @var Int32 NPC ID  
+    */
+    public $npcId;
+
+    /**
+    * @var String NPC名称  
+    */
+    public $name;
+
+    /**
+    * @var Int32 地图关卡ID  
+    */
+    public $scene_node;
+
+    /**
+    * @var String 前置触发条件,查询任务背包  
+    */
+    public $taskId;
+
+    /**
+    * @var String 3D资源路径  
+    */
+    public $res_3D;
+
+    /**
+    * @var String 2D资源路径  
+    */
+    public $res_2D;
+
+    /**
+    * @var String icon资源路径  
+    */
+    public $res_icon;
+
+    /**
+    * @var String 欢迎语  
+    */
+    public $content;
+
+    /**
+    * @var String 功能名称  
+    */
+    public $functionName;
+
+    /**
+    * @var String 功能界面  
+    */
+    public $functionPanel;
+
+}
+

+ 1 - 1
Gameserver/Amfphp/model/Const/sm_taskcard_shop.php

@@ -4,7 +4,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2020-12-30 19:17:11
+ // 日期: 2021-02-05 15:33:23
 ////////////////////
 
 

+ 1 - 1
Gameserver/Amfphp/process/FightProc/SweepGatesProc.php

@@ -62,7 +62,7 @@ class SweepGatesProc {
         $redis_key = MemKey_User::temp_arenas_pre_reward_md5_str($req->zoneid, $req->uid);
         $md5 = md5($gateId . $difficulty . $_rewards);
         gMem()->set($redis_key, $md5, 86400);                                   # 有效期一天,有新的就覆盖
-        return Resp::ok(array("r" => $_rewards));                                             # 返回奖励字符串
+        return Resp::ok(array("r" => $_rewards));                               # 返回奖励字符串
 // 生成奖励串, 写入redis一个md5(过期时间1day)
 // 奖励串返回客户端
 // 客户端根据奖励串展示奖励

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

@@ -292,7 +292,7 @@ class TaskProc {
 
         my_Assert($taskCard->state <= Enum_TaskCardStateType::notopen, ErrCode::taskCard_state); # 任务卡状态异常 
         my_Assert(true != self::FindSameIngCard($taskCard->typeId), ErrCode::taskCard_active_multi); # 不可激活多张任务卡
-        my_Assert(self::FindIngCardCount() <= self::TaskCard_ActiveMax, $err);
+        my_Assert(self::FindIngCardCount() <= self::TaskCard_ActiveMax, ErrCode::taskCard_active_max); # 激活数量上限
         $taskCard->state = Enum_TaskCardStateType::ing;
         NormalEventProc::OnTaskCard_Actived($taskCardUID, null);                # 带入事件
         foreach ($taskCard->curSteps as &$tsp) {                                # 初期里面只有一个任务

+ 2 - 1
Gameserver/Amfphp/process/UserProc.php

@@ -201,6 +201,8 @@ class UserProc {
     public static function RegisterNewRole($req) {
         $userID = $req->uid;
         list($rolename, $gender, $profile_img) = $req->paras;                   # 参数: 昵称,性别,头像
+        $id = gMem()->increment(MemKey_GameRun::Stat_UserCountByZone_int($req->zoneid));   # 增加玩家数量计数
+        $rolename = "No." . sprintf("%07d", $id);
         if (self::checkRoleNameNotExist($rolename)) {                           # 记录玩家
             $userinfo = self::createUser($req, $rolename, $gender, $profile_img);
             if (1 == self::regRole($req->zoneid, $userID, $rolename, $gender, $profile_img, $userinfo->getPlatStr())) {
@@ -434,7 +436,6 @@ class UserProc {
         UserProc::updateUserInfo();                                         # 回存用户数据
 //        FriendProc::Init($req);
 //        StatProc::                                                            ...
-        gMem()->increment(MemKey_GameRun::Stat_UserCountByZone_int($req->zoneid));   # 增加玩家数量计数
 //        GoalsDailyProc::dealDailyLogin($mem, $req, $resp);                   # 每日登录任务
 
         return $userInfo;

+ 15 - 12
Gameserver/Amfphp/test.php

@@ -9,20 +9,23 @@ echoLine("phpver: " . PHP_VERSION . PHP_EOL);
 //set_time_limit(15);                                                           # 设置执行超时时间
 //
 
+$id = 233;
 
-$arr = array("name" => "王刚",
-    "sex" => "male",
-);
-$url = "https://siapcn.galaxyappstore.com/samsung/coupon-merch/player/login_check";
-$par = '{"applyNo":"5000951584","uid":"54337601","sign":"bnECLDsKKI3n3jBEPHfVvOuoQH\/n8QlVnbfeS5Rk3+jt6WqtMjMDzIZtEaL0TCaxssz0wa5YJ8TxnFe+3smElIYc1jSYzKpGFZi15w8iWk6wyVn4az15HXzNc66ImSFq1RAgkoe8BAMVWUfhr2Jz2c+k4dZuZ+c5vG6miZTznWY="}';
-$resp = HttpUtil::makeRequest($url, $par, array(), array('Content-type: application/json;charset=utf-8'));
+var_dump(sprintf("%07d", $id));
 
-var_dump($resp);
-
-$url = "http://192.168.10.86/PetMulti/Gameserver/Amfphp/service_call/pay/samsung/login_samsung_dy.php";
-$par = "appid=5000951584&signature=1c30d675131e7af135ead2ca8f6a20a3&uid=54337601&signMethod=MD5&";
-$resp = HttpUtil::makeRequest($url, $par);
-var_dump($resp);
+//$arr = array("name" => "王刚",
+//    "sex" => "male",
+//);
+//$url = "https://siapcn.galaxyappstore.com/samsung/coupon-merch/player/login_check";
+//$par = '{"applyNo":"5000951584","uid":"54337601","sign":"bnECLDsKKI3n3jBEPHfVvOuoQH\/n8QlVnbfeS5Rk3+jt6WqtMjMDzIZtEaL0TCaxssz0wa5YJ8TxnFe+3smElIYc1jSYzKpGFZi15w8iWk6wyVn4az15HXzNc66ImSFq1RAgkoe8BAMVWUfhr2Jz2c+k4dZuZ+c5vG6miZTznWY="}';
+//$resp = HttpUtil::makeRequest($url, $par, array(), array('Content-type: application/json;charset=utf-8'));
+//
+//var_dump($resp);
+//
+//$url = "http://192.168.10.86/PetMulti/Gameserver/Amfphp/service_call/pay/samsung/login_samsung_dy.php";
+//$par = "appid=5000951584&signature=1c30d675131e7af135ead2ca8f6a20a3&uid=54337601&signMethod=MD5&";
+//$resp = HttpUtil::makeRequest($url, $par);
+//var_dump($resp);
 //
 //test(function() {
 //    $key = "test";

+ 5 - 2
Gameserver/nbproject/private/private.xml

@@ -14,16 +14,19 @@
         <group>
             <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/process/del_MissProc.php</file>
             <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/model/User/Enum_TaskCmdType.php</file>
-            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/model/User/Ins_TaskEventArgs.php</file>
             <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/process/FightProc.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/model/User/Enum_TaskCardStateType.php</file>
-            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/base/CmdCode.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/process/StoreProc.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/Enum_PropelType.php</file>
             <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/process/FightProc/SweepGatesProc.php</file>
             <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/model/User/Ins_TaskCard.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/main.php</file>
             <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/model/User/Ins_TaskStep.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/model/User/Ins_TaskEventArgs.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/process/ShopProc.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/base/CmdCode.php</file>
         </group>
     </open-files>
 </project-private>