配置表更新

bin/json/LocalizeConfig_CN.json

@@ -3354,5 +3354,77 @@
   {
     "key": "opencond_prompt_10003",
     "text_cn": "开服第2天开启且通关2-14后开启"
+  },
+  {
+    "key": "num_1001",
+    "text_cn": "主线入口"
+  },
+  {
+    "key": "num_1002",
+    "text_cn": "招募"
+  },
+  {
+    "key": "num_1003",
+    "text_cn": "剧情副本"
+  },
+  {
+    "key": "num_1004",
+    "text_cn": "武馆入口"
+  },
+  {
+    "key": "num_1005",
+    "text_cn": "主题活动入口"
+  },
+  {
+    "key": "num_1006",
+    "text_cn": "迷雾岛屿"
+  },
+  {
+    "key": "num_1007",
+    "text_cn": "维京远征"
+  },
+  {
+    "key": "num_1008",
+    "text_cn": "心魔塔"
+  },
+  {
+    "key": "num_1009",
+    "text_cn": "捕羊大赛"
+  },
+  {
+    "key": "num_1010",
+    "text_cn": "黑暗料理大赛"
+  },
+  {
+    "key": "num_1011",
+    "text_cn": "地下角斗场"
+  },
+  {
+    "key": "num_1012",
+    "text_cn": "疯狂竞技赛"
+  },
+  {
+    "key": "num_1013",
+    "text_cn": "五侠擂台"
+  },
+  {
+    "key": "num_1014",
+    "text_cn": "藏书馆"
+  },
+  {
+    "key": "num_1015",
+    "text_cn": "篝火舞会"
+  },
+  {
+    "key": "num_1016",
+    "text_cn": "商队"
+  },
+  {
+    "key": "num_1017",
+    "text_cn": "美食馆"
+  },
+  {
+    "key": "num_1018",
+    "text_cn": "戈伯铁匠铺"
   }
 ]

bin/json/LocalizeConfig_EN.json

@@ -3354,5 +3354,77 @@
   {
     "key": "opencond_prompt_10003",
     "text_en": ""
+  },
+  {
+    "key": "num_1001",
+    "text_en": "TRIALS"
+  },
+  {
+    "key": "num_1002",
+    "text_en": "MOON"
+  },
+  {
+    "key": "num_1003",
+    "text_en": "STORY"
+  },
+  {
+    "key": "num_1004",
+    "text_en": "KONG FU"
+  },
+  {
+    "key": "num_1005",
+    "text_en": "EVENT"
+  },
+  {
+    "key": "num_1006",
+    "text_en": "Misty Island"
+  },
+  {
+    "key": "num_1007",
+    "text_en": "Viking expedition"
+  },
+  {
+    "key": "num_1008",
+    "text_en": "Heart demon tower"
+  },
+  {
+    "key": "num_1009",
+    "text_en": "Catch sheep"
+  },
+  {
+    "key": "num_1010",
+    "text_en": "Dark cuisine"
+  },
+  {
+    "key": "num_1011",
+    "text_en": "Underground Arena"
+  },
+  {
+    "key": "num_1012",
+    "text_en": "Crazy competition"
+  },
+  {
+    "key": "num_1013",
+    "text_en": "Five heroes challenge"
+  },
+  {
+    "key": "num_1014",
+    "text_en": "Library"
+  },
+  {
+    "key": "num_1015",
+    "text_en": "Bonfire Dance"
+  },
+  {
+    "key": "num_1016",
+    "text_en": "Caravan"
+  },
+  {
+    "key": "num_1017",
+    "text_en": "Gourmet restaurant"
+  },
+  {
+    "key": "num_1018",
+    "text_en": "Gober blacksmith shop"
   }
 ]

bin/json/LocalizeConfig_TW.json

@@ -3354,5 +3354,77 @@
   {
     "key": "opencond_prompt_10003",
     "text_tw": ""
+  },
+  {
+    "key": "num_1001",
+    "text_tw": ""
+  },
+  {
+    "key": "num_1002",
+    "text_tw": ""
+  },
+  {
+    "key": "num_1003",
+    "text_tw": ""
+  },
+  {
+    "key": "num_1004",
+    "text_tw": ""
+  },
+  {
+    "key": "num_1005",
+    "text_tw": ""
+  },
+  {
+    "key": "num_1006",
+    "text_tw": ""
+  },
+  {
+    "key": "num_1007",
+    "text_tw": ""
+  },
+  {
+    "key": "num_1008",
+    "text_tw": ""
+  },
+  {
+    "key": "num_1009",
+    "text_tw": ""
+  },
+  {
+    "key": "num_1010",
+    "text_tw": ""
+  },
+  {
+    "key": "num_1011",
+    "text_tw": ""
+  },
+  {
+    "key": "num_1012",
+    "text_tw": ""
+  },
+  {
+    "key": "num_1013",
+    "text_tw": ""
+  },
+  {
+    "key": "num_1014",
+    "text_tw": ""
+  },
+  {
+    "key": "num_1015",
+    "text_tw": ""
+  },
+  {
+    "key": "num_1016",
+    "text_tw": ""
+  },
+  {
+    "key": "num_1017",
+    "text_tw": ""
+  },
+  {
+    "key": "num_1018",
+    "text_tw": ""
   }
 ]

bin/json/game_extservers.json

@@ -22,5 +22,13 @@
     },
     "ips": "10.0.0.138:7891",
     "debug": true
+  },
+  {
+    "name": {
+      "key": "debug_server_02",
+      "text": "mxf"
+    },
+    "ips": "10.0.0.85:7891",
+    "debug": true
   }
 ]

bin/json/game_language.json

@@ -322,5 +322,113 @@
       "key": "tips_1002",
       "text": "tips_1002"
     }
+  },
+  {
+    "keycode": {
+      "key": "num_1001",
+      "text": "num_1001"
+    }
+  },
+  {
+    "keycode": {
+      "key": "num_1002",
+      "text": "num_1002"
+    }
+  },
+  {
+    "keycode": {
+      "key": "num_1003",
+      "text": "num_1003"
+    }
+  },
+  {
+    "keycode": {
+      "key": "num_1004",
+      "text": "num_1004"
+    }
+  },
+  {
+    "keycode": {
+      "key": "num_1005",
+      "text": "num_1005"
+    }
+  },
+  {
+    "keycode": {
+      "key": "num_1006",
+      "text": "num_1006"
+    }
+  },
+  {
+    "keycode": {
+      "key": "num_1007",
+      "text": "num_1007"
+    }
+  },
+  {
+    "keycode": {
+      "key": "num_1008",
+      "text": "num_1008"
+    }
+  },
+  {
+    "keycode": {
+      "key": "num_1009",
+      "text": "num_1009"
+    }
+  },
+  {
+    "keycode": {
+      "key": "num_1010",
+      "text": "num_1010"
+    }
+  },
+  {
+    "keycode": {
+      "key": "num_1011",
+      "text": "num_1011"
+    }
+  },
+  {
+    "keycode": {
+      "key": "num_1012",
+      "text": "num_1012"
+    }
+  },
+  {
+    "keycode": {
+      "key": "num_1013",
+      "text": "num_1013"
+    }
+  },
+  {
+    "keycode": {
+      "key": "num_1014",
+      "text": "num_1014"
+    }
+  },
+  {
+    "keycode": {
+      "key": "num_1015",
+      "text": "num_1015"
+    }
+  },
+  {
+    "keycode": {
+      "key": "num_1016",
+      "text": "num_1016"
+    }
+  },
+  {
+    "keycode": {
+      "key": "num_1017",
+      "text": "num_1017"
+    }
+  },
+  {
+    "keycode": {
+      "key": "num_1018",
+      "text": "num_1018"
+    }
   }
 ]

bin/json/game_ui.json

@@ -682,5 +682,29 @@
     "packagename": "roledetails",
     "comname": "equistrengthen",
     "des": "装备强化"
+  },
+  {
+    "id": "strengthenup",
+    "file": "StrengthenUpWindow",
+    "unloadpkg": 5,
+    "loadtype": 1,
+    "full": 0,
+    "blur": 1,
+    "package": "roledetails/roledetails",
+    "packagename": "roledetails",
+    "comname": "strengthen",
+    "des": "英雄升级升星详情"
+  },
+  {
+    "id": "croppingwindow",
+    "file": "CroppingWindow",
+    "unloadpkg": 0,
+    "loadtype": 1,
+    "full": 2,
+    "blur": 0,
+    "package": "zhandou/zhandou",
+    "packagename": "zhandou",
+    "comname": "cropping",
+    "des": "遮幅"
   }
 ]

modules/hero/api_strengthenUpStar.go

@@ -39,8 +39,6 @@ func (this *apiComp) StrengthenUpStar(session comm.IUserSession, req *pb.HeroStr
 		_hero             *pb.DBHero               // 目标英雄
 		tagHero           *pb.DBHero               // 消耗指定英雄
 		mapCostHero       map[string]int32         // 所有消耗英雄分类
-		bCheckNeedhero    bool                     // 指定英雄校验
-		bCheckRacehero    bool                     // 种族英雄校验
 		chanegCard        []*pb.DBHero             // 变化的英雄数据
 		CostHeroObj       map[string]*pb.DBHero    // 所有消耗英雄分类
 	)
@@ -95,6 +93,8 @@ func (this *apiComp) StrengthenUpStar(session comm.IUserSession, req *pb.HeroStr
 		code = pb.ErrorCode_ReqParameterError
 		return
 	}
+	costNeedHeroCount = 0
+	costRaceHeroCount = 0
 	// 遍历所有消耗英雄
 	for k, v := range mapCostHero {
 		if tagHero, code = this.module.GetHeroByObjID(session.GetUserId(), k); code != pb.ErrorCode_Success { // 没有这个英雄
@@ -110,7 +110,7 @@ func (this *apiComp) StrengthenUpStar(session comm.IUserSession, req *pb.HeroStr
 			}
 
 			if tagHero.HeroID == target.Needhero && tagHero.Star == target.Needherostar && tagHero.SameCount >= target.Needheronum {
-				bCheckNeedhero = true
+				costNeedHeroCount += v
 			}
 
 			for _, value := range target.Needrace { // 阵营校验
@@ -118,19 +118,22 @@ func (this *apiComp) StrengthenUpStar(session comm.IUserSession, req *pb.HeroStr
 				cfg := this.module.configure.GetHero(tagHero.HeroID)
 				if cfg != nil {
 					if cfg.Race == value {
-						bCheckRacehero = true
+						costRaceHeroCount += v
-						break
 					}
 				}
 			}
-			this.module.Debugf("指定英雄校验结果:%b,种族英雄校验结果:%b", bCheckNeedhero, bCheckRacehero)
 		}
 		CostHeroObj[k] = tagHero
 	}
-	if !bCheckRacehero || !bCheckNeedhero {
+
+	if target.Needheronum <= costNeedHeroCount || target.Needracenum <= costRaceHeroCount {
 		code = pb.ErrorCode_ReqParameterError
-		return // 校验失败
+		return
 	}
+	// if !bCheckRacehero || !bCheckNeedhero {
+	// 	code = pb.ErrorCode_ReqParameterError
+	// 	return // 校验失败
+	// }
 
 	// 金币消耗判断
 	curGold := this.module.ModuleUser.QueryAttributeValue(session.GetUserId(), "gold")

sys/configure/structs/Tables.go

@@ -1,3 +1,4 @@
+
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -22,7 +23,7 @@ type Tables struct {
     skillAfteratk *Game_skillAfteratk
     skillBuff *Game_skillBuff
     skillPassive *Game_skillPassive
-	newHero                   *Game_hero
+    hero *Game_hero
     heroStargrow *Game_heroStargrow
     heroLevelgrow *Game_heroLevelgrow
     heroStarup *Game_heroStarup
@@ -44,7 +45,7 @@ type Tables struct {
     activeReward *Game_activeReward
     serverList *Game_serverList
     com *Game_com
-	newSkill                  *Game_newSkill
+    skill *Game_skill
     model *Game_model
     mainlineChapter *Game_mainlineChapter
     mainlineEasy *Game_mainlineEasy
@@ -146,7 +147,7 @@ func NewTables(loader JsonLoader) (*Tables, error) {
     if buf, err = loader("game_hero") ; err != nil {
         return nil, err
     }
-	if tables.newHero, err = NewGame_hero(buf); err != nil {
+    if tables.hero, err = NewGame_hero(buf) ; err != nil {
         return nil, err
     }
     if buf, err = loader("game_herostargrow") ; err != nil {
@@ -275,10 +276,10 @@ func NewTables(loader JsonLoader) (*Tables, error) {
     if tables.com, err = NewGame_com(buf) ; err != nil {
         return nil, err
     }
-	if buf, err = loader("game_newskill"); err != nil {
+    if buf, err = loader("game_skill") ; err != nil {
         return nil, err
     }
-	if tables.newSkill, err = NewGame_newSkill(buf); err != nil {
+    if tables.skill, err = NewGame_skill(buf) ; err != nil {
         return nil, err
     }
     if buf, err = loader("game_model") ; err != nil {

sys/configure/structs/game.equipIntensify.go

@@ -1,3 +1,4 @@
+
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -37,3 +38,5 @@ func (table *Game_equipIntensify) GetDataList() []*Game_equipIntensifyData {
 func (table *Game_equipIntensify) Get(key int32) *Game_equipIntensifyData {
     return table._dataMap[key]
 }
+
+

sys/configure/structs/game.skill.go

@@ -0,0 +1,42 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+package cfg
+
+type Game_skill struct {
+    _dataMap map[int32]*Game_skillData
+    _dataList []*Game_skillData
+}
+
+func NewGame_skill(_buf []map[string]interface{}) (*Game_skill, error) {
+	_dataList := make([]*Game_skillData, 0, len(_buf))
+	dataMap := make(map[int32]*Game_skillData)
+	for _, _ele_ := range _buf {
+		if _v, err2 := NewGame_skillData(_ele_); err2 != nil {
+			return nil, err2
+		} else {
+			_dataList = append(_dataList, _v)
+			dataMap[_v.Id] = _v
+		}
+	}
+	return &Game_skill{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *Game_skill) GetDataMap() map[int32]*Game_skillData {
+    return table._dataMap
+}
+
+func (table *Game_skill) GetDataList() []*Game_skillData {
+    return table._dataList
+}
+
+func (table *Game_skill) Get(key int32) *Game_skillData {
+    return table._dataMap[key]
+}
+
+

sys/configure/structs/game.skillData.go

@@ -0,0 +1,77 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+package cfg
+
+import "errors"
+
+type Game_skillData struct {
+    Id int32
+    Name string
+    Ico string
+    Act string
+    Type int32
+    MaxLV int32
+    CD []int32
+    Target int32
+    ChildSkill []*Game_ChildSkills
+    Desc1 string
+    Desc2 string
+    Desc3 string
+    Desc4 string
+    Desc5 string
+}
+
+func (Game_skillData) GetTypeId() int {
+    return -1600555361
+}
+
+func NewGame_skillData(_buf map[string]interface{}) (_v *Game_skillData, err error) {
+    _v = &Game_skillData{}
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Id"].(float64); !_ok_ { err = errors.New("Id error"); return }; _v.Id = int32(_tempNum_) }
+    {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["Name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+    { var _ok_ bool; if _v.Ico, _ok_ = _buf["ico"].(string); !_ok_ { err = errors.New("ico error"); return } }
+    { var _ok_ bool; if _v.Act, _ok_ = _buf["act"].(string); !_ok_ { err = errors.New("act error"); return } }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Type"].(float64); !_ok_ { err = errors.New("Type error"); return }; _v.Type = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["MaxLV"].(float64); !_ok_ { err = errors.New("MaxLV error"); return }; _v.MaxLV = int32(_tempNum_) }
+     {
+                var _arr_ []interface{}
+                var _ok_ bool
+                if _arr_, _ok_ = _buf["CD"].([]interface{}); !_ok_ { err = errors.New("CD error"); return }
+
+                _v.CD = make([]int32, 0, len(_arr_))
+                
+                for _, _e_ := range _arr_ {
+                    var _list_v_ int32
+                    { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
+                    _v.CD = append(_v.CD, _list_v_)
+                }
+            }
+
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Target"].(float64); !_ok_ { err = errors.New("Target error"); return }; _v.Target = int32(_tempNum_) }
+     {
+                var _arr_ []interface{}
+                var _ok_ bool
+                if _arr_, _ok_ = _buf["ChildSkill"].([]interface{}); !_ok_ { err = errors.New("ChildSkill error"); return }
+
+                _v.ChildSkill = make([]*Game_ChildSkills, 0, len(_arr_))
+                
+                for _, _e_ := range _arr_ {
+                    var _list_v_ *Game_ChildSkills
+                    { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = NewGame_ChildSkills(_x_); err != nil { return } }
+                    _v.ChildSkill = append(_v.ChildSkill, _list_v_)
+                }
+            }
+
+    {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["Desc1"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Desc1 error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Desc1, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+    {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["Desc2"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Desc2 error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Desc2, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+    {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["Desc3"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Desc3 error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Desc3, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+    {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["Desc4"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Desc4 error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Desc4, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+    {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["Desc5"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Desc5 error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Desc5, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+    return
+}

sys/db/init_test.go

@@ -26,6 +26,7 @@ func TestMain(m *testing.M) {
 	defer os.Exit(m.Run())
 }
 func TestMail(t *testing.T) {
+
 	mail := &pb.DBMailData{}
 	err := db.mgo.FindOneAndUpdate(
 		"mail",