Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

bin/json/game_item.json

@@ -10854,7 +10854,7 @@
     "reddottype": 0,
     "effects": "effect_ui_bagwindow_2",
     "modelName": "",
-    "box_id": 17111960,
+    "box_id": 17111040,
     "synthetize_num": 0,
     "synthetize_deplete": [],
     "synthetize_get": [],
@@ -10887,7 +10887,7 @@
     "reddottype": 0,
     "effects": "effect_ui_bagwindow_2",
     "modelName": "",
-    "box_id": 17111860,
+    "box_id": 17111040,
     "synthetize_num": 0,
     "synthetize_deplete": [],
     "synthetize_get": [],
@@ -10920,7 +10920,7 @@
     "reddottype": 0,
     "effects": "effect_ui_bagwindow_2",
     "modelName": "",
-    "box_id": 17111860,
+    "box_id": 17111040,
     "synthetize_num": 0,
     "synthetize_deplete": [],
     "synthetize_get": [],

bin/json/game_opencond.json

@@ -606,7 +606,7 @@
     "main": [
       {
         "key": 1,
-        "param": 1
+        "param": 9999
       }
     ],
     "wkqbx": 2,
@@ -1532,7 +1532,7 @@
     "main": [
       {
         "key": 1,
-        "param": 10
+        "param": 6
       }
     ],
     "wkqbx": 0,
@@ -1557,7 +1557,7 @@
     "main": [
       {
         "key": 1,
-        "param": 20
+        "param": 10
       }
     ],
     "wkqbx": 0,

bin/json/game_pandamasjs.json

@@ -4,7 +4,7 @@
     "unlock_condition": 20010,
     "unlock_conditiondes": {
       "key": "pandamas_pandamas_js_unlock_conditiondes_1",
-      "text": "完成主线任务“这是哪里”后解锁"
+      "text": "等级1解锁"
     }
   },
   {
@@ -12,7 +12,7 @@
     "unlock_condition": 20010,
     "unlock_conditiondes": {
       "key": "pandamas_pandamas_js_unlock_conditiondes_2",
-      "text": "完成主线任务“初来乍到”后解锁"
+      "text": "等级6解锁"
     }
   },
   {
@@ -20,7 +20,7 @@
     "unlock_condition": 20020,
     "unlock_conditiondes": {
       "key": "pandamas_pandamas_js_unlock_conditiondes_3",
-      "text": "完成主线任务“事件开端”后解锁"
+      "text": "等级10解锁"
     }
   }
 ]

modules/equipment/modelEquipment.go

@@ -131,6 +131,9 @@ func (this *modelEquipmentComp) AddEquipments(session comm.IUserSession, cIds ma
 					change = append(change, equipment)
 				}
 			}
+		} else {
+			//err = fmt.Errorf("cfg.Game_equipment not found equip id %s", k)  // 太多地方配置无效装备 这地方暂时只打印错误日志
+			this.module.Errorf("cfg.Game_equipment not found equip id %s", k)
 		}
 	}
 

modules/user/module.go

@@ -536,23 +536,13 @@ func (this *User) change(session comm.IUserSession, attr string, add int32) (cha
 				}
 				return
 			}
-			//体力消耗，增加玩家经验
-			// exp := int32(math.Abs(float64(add))) * ggd.FightPs
-			// user.Exp += int64(exp)
-		}
-
-		if change.Ps >= ggd.PsUl {
-			errdata = &pb.ErrorData{
-				Code:  pb.ErrorCode_UserVitLimit,
-				Title: pb.ErrorCode_UserVitLimit.ToString(),
+		} else {
+			change.Ps += add
+			if change.Ps > ggd.PsUl {
+				change.Ps = ggd.PsUl
 			}
+		}
 
-			return
-		}
-		change.Ps += add
-		if change.Ps > ggd.PsUl {
-			change.Ps = ggd.PsUl
-		}
 	case comm.Talent1:
 		if add < 0 {
 			if user.Talent1+add < 0 {