更新配置

bin/json/game_equipsuit.json

@@ -2,86 +2,103 @@
   {
     "suittype": 0,
     "suitnum": 4,
-    "skill": 100012000
+    "skill": 100012000,
+    "skillintr": ""
   },
   {
     "suittype": 1,
     "suitnum": 4,
-    "skill": 100012000
+    "skill": 100012000,
+    "skillintr": ""
   },
   {
     "suittype": 2,
     "suitnum": 4,
-    "skill": 100012000
+    "skill": 100012000,
+    "skillintr": ""
   },
   {
     "suittype": 3,
     "suitnum": 4,
-    "skill": 100012000
+    "skill": 100012000,
+    "skillintr": ""
   },
   {
     "suittype": 4,
     "suitnum": 4,
-    "skill": 100012000
+    "skill": 100012000,
+    "skillintr": ""
   },
   {
     "suittype": 5,
     "suitnum": 4,
-    "skill": 100012000
+    "skill": 100012000,
+    "skillintr": ""
   },
   {
     "suittype": 6,
     "suitnum": 4,
-    "skill": 100012000
+    "skill": 100012000,
+    "skillintr": ""
   },
   {
     "suittype": 7,
     "suitnum": 4,
-    "skill": 100012000
+    "skill": 100012000,
+    "skillintr": ""
   },
   {
     "suittype": 8,
     "suitnum": 4,
-    "skill": 100012000
+    "skill": 100012000,
+    "skillintr": ""
   },
   {
     "suittype": 9,
     "suitnum": 4,
-    "skill": 100012000
+    "skill": 100012000,
+    "skillintr": ""
   },
   {
     "suittype": 100,
     "suitnum": 2,
-    "skill": 100012000
+    "skill": 100012000,
+    "skillintr": ""
   },
   {
     "suittype": 101,
     "suitnum": 2,
-    "skill": 100012000
+    "skill": 100012000,
+    "skillintr": ""
   },
   {
     "suittype": 102,
     "suitnum": 2,
-    "skill": 100012000
+    "skill": 100012000,
+    "skillintr": ""
   },
   {
     "suittype": 103,
     "suitnum": 2,
-    "skill": 100012000
+    "skill": 100012000,
+    "skillintr": ""
   },
   {
     "suittype": 104,
     "suitnum": 2,
-    "skill": 100012000
+    "skill": 100012000,
+    "skillintr": ""
   },
   {
     "suittype": 105,
     "suitnum": 2,
-    "skill": 100012000
+    "skill": 100012000,
+    "skillintr": ""
   },
   {
     "suittype": 106,
     "suitnum": 2,
-    "skill": 100012000
+    "skill": 100012000,
+    "skillintr": ""
   }
 ]

bin/json/game_skillafteratk.json

@@ -2,11 +2,16 @@
   {
     "Id": 200011101,
     "Desc": "对敌方1个目标造成攻击力80%",
-    "Target": "",
+    "From": 4,
-    "EmitPR": 0,
+    "Limit": 1,
+    "Where": [],
+    "Order": [
+      "Type=rand"
+    ],
+    "EmitPR": 1000,
     "Type": "tongyongshanghai",
     "Argu": [
-      "DoVal=1,ProSou1=0,Pro1=Total_Atk,ProPar1=800,"
+      "DoVal=1,ProSou1=0,Pro1=Total_Atk,ProPar1=800"
     ],
     "AddEffect": false,
     "FollowSK": [],
@@ -16,9 +21,14 @@
   },
   {
     "Id": 200012101,
-    "Desc": "对全体1个目标造成攻击力80%以及防御力120%的伤害",
+    "Desc": "对敌方全体造成攻击力80%以及防御力120%的伤害",
-    "Target": "",
+    "From": 2,
-    "EmitPR": 0,
+    "Limit": 5,
+    "Where": [],
+    "Order": [
+      "Type=rand"
+    ],
+    "EmitPR": 1000,
     "Type": "tongyongshanghai",
     "Argu": [
       "DoVal=1,ProSou1=0,Pro1=Total_Atk,ProPar1=800,ProSou2=0,Pro2=Total_Def,ProPar2=1200"
@@ -31,12 +41,17 @@
   },
   {
     "Id": 200013101,
-    "Desc": "对全体攻击小于自身的目标造成攻击力80%的伤害",
+    "Desc": "对敌方全体攻击小于自身的目标造成攻击力80%的伤害",
-    "Target": "Action=ProJudge,JudgeType=0,Key=Total_Atk,Op=0",
+    "From": 2,
+    "Limit": 5,
+    "Where": [
+      "Type=ProJudge,JudgeType=0,Key=Total_Atk,Op=1"
+    ],
+    "Order": [],
     "EmitPR": 1000,
     "Type": "tongyongshanghai",
     "Argu": [
-      "DoVal=1,ProSou1=0,Pro1=Total_Atk,ProPar1=800,"
+      "DoVal=1,ProSou1=0,Pro1=Total_Atk,ProPar1=800"
     ],
     "AddEffect": false,
     "FollowSK": [],

bin/json/game_skillatk.json

@@ -99,7 +99,7 @@
     "Id": 100013000,
     "Name": "",
     "Type": 1,
-    "Desc": "对全体攻击小于自身的目标造成攻击力80%的伤害",
+    "Desc": "对敌方全体攻击小于自身的目标造成攻击力80%的伤害",
     "MaxLV": 6,
     "CD": [
       4,

comm/const.go

@@ -38,6 +38,7 @@ const (
 	SM_EquipmentModule core.M_Modules = "equipment" //装备模块
 	SM_HeroModule      core.M_Modules = "hero"      //英雄模块
 	SM_ForumModule     core.M_Modules = "forum"     //论坛模块
+	SM_ItemsModule     core.M_Modules = "item"
 )
 
 //RPC服务接口定义处

modules/hero/model_hero.go

@@ -36,7 +36,7 @@ func (this *ModelHero) initHero(uid string, heroCfgId int32) *pb.DB_HeroData {
 	newHero := &pb.DB_HeroData{
 		Id:          objId,
 		Uid:         uid,
-		HeroID:      heroCfg.Hid,
+		HeroID:      heroCfg.Id,
 		Star:        heroCfg.Star,
 		Lv:          1, //初始等级
 		NormalSkill: []*pb.SkillData{},

sys/configure/structs/Tables.go

@@ -1,3 +1,4 @@
+
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -11,6 +12,7 @@ package cfg
 type JsonLoader func(string) ([]map[string]interface{}, error)
 
 type Tables struct {
+    hero *Game_hero
     ui *Game_ui
     skill *Game_skill
     plot *Game_plot
@@ -25,6 +27,11 @@ type Tables struct {
     heroLevelgrow *Game_heroLevelgrow
     heroStarup *Game_heroStarup
     heroLevelup *Game_heroLevelup
+    equip *Game_equip
+    equipAttrlibrary *Game_equipAttrlibrary
+    equipSuit *Game_equipSuit
+    equipIntensify *Game_equipIntensify
+    item *Game_item
 }
 
 func NewTables(loader JsonLoader) (*Tables, error) {
@@ -32,7 +39,12 @@ func NewTables(loader JsonLoader) (*Tables, error) {
     var buf []map[string]interface{}
 
     tables := &Tables{}
-
+    if buf, err = loader("game_hero") ; err != nil {
+        return nil, err
+    }
+    if tables.hero, err = NewGame_hero(buf) ; err != nil {
+        return nil, err
+    }
     if buf, err = loader("game_ui") ; err != nil {
         return nil, err
     }
@@ -117,5 +129,35 @@ func NewTables(loader JsonLoader) (*Tables, error) {
     if tables.heroLevelup, err = NewGame_heroLevelup(buf) ; err != nil {
         return nil, err
     }
+    if buf, err = loader("game_equip") ; err != nil {
+        return nil, err
+    }
+    if tables.equip, err = NewGame_equip(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_equipattrlibrary") ; err != nil {
+        return nil, err
+    }
+    if tables.equipAttrlibrary, err = NewGame_equipAttrlibrary(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_equipsuit") ; err != nil {
+        return nil, err
+    }
+    if tables.equipSuit, err = NewGame_equipSuit(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_equipintensify") ; err != nil {
+        return nil, err
+    }
+    if tables.equipIntensify, err = NewGame_equipIntensify(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_item") ; err != nil {
+        return nil, err
+    }
+    if tables.item, err = NewGame_item(buf) ; err != nil {
+        return nil, err
+    }
     return tables, nil
 }

sys/configure/structs/game.atn.go

@@ -1,3 +1,4 @@
+
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -21,28 +22,8 @@ func (Game_atn) GetTypeId() int {
 
 func NewGame_atn(_buf map[string]interface{}) (_v *Game_atn, err error) {
     _v = &Game_atn{}
-	{
+    { var _ok_ bool; if _v.A, _ok_ = _buf["a"].(string); !_ok_ { err = errors.New("a error"); return } }
-		var _ok_ bool
+    { var _ok_ bool; if _v.T, _ok_ = _buf["t"].(string); !_ok_ { err = errors.New("t error"); return } }
-		if _v.A, _ok_ = _buf["a"].(string); !_ok_ {
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["n"].(float64); !_ok_ { err = errors.New("n error"); return }; _v.N = int32(_tempNum_) }
-			err = errors.New("a error")
-			return
-		}
-	}
-	{
-		var _ok_ bool
-		if _v.T, _ok_ = _buf["t"].(string); !_ok_ {
-			err = errors.New("t error")
-			return
-		}
-	}
-	{
-		var _ok_ bool
-		var _tempNum_ float64
-		if _tempNum_, _ok_ = _buf["n"].(float64); !_ok_ {
-			err = errors.New("n error")
-			return
-		}
-		_v.N = int32(_tempNum_)
-	}
     return
 }

sys/configure/structs/game.equipAttrlibraryData.go

@@ -15,6 +15,7 @@ type Game_equipAttrlibraryData struct {
     Libraryid int32
     Attr []string
     Probability int32
+    Addition []int32
 }
 
 func (Game_equipAttrlibraryData) GetTypeId() int {
@@ -40,5 +41,19 @@ func NewGame_equipAttrlibraryData(_buf map[string]interface{}) (_v *Game_equipAt
             }
 
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["probability"].(float64); !_ok_ { err = errors.New("probability error"); return }; _v.Probability = int32(_tempNum_) }
+     {
+                var _arr_ []interface{}
+                var _ok_ bool
+                if _arr_, _ok_ = _buf["Addition"].([]interface{}); !_ok_ { err = errors.New("Addition error"); return }
+
+                _v.Addition = 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.Addition = append(_v.Addition, _list_v_)
+                }
+            }
+
     return
 }

sys/configure/structs/game.equipSuitData.go

@@ -14,6 +14,7 @@ type Game_equipSuitData struct {
     Suittype int32
     Suitnum int32
     Skill int32
+    Skillintr string
 }
 
 func (Game_equipSuitData) GetTypeId() int {
@@ -25,5 +26,6 @@ func NewGame_equipSuitData(_buf map[string]interface{}) (_v *Game_equipSuitData,
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["suittype"].(float64); !_ok_ { err = errors.New("suittype error"); return }; _v.Suittype = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["suitnum"].(float64); !_ok_ { err = errors.New("suitnum error"); return }; _v.Suitnum = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skill"].(float64); !_ok_ { err = errors.New("skill error"); return }; _v.Skill = int32(_tempNum_) }
+    { var _ok_ bool; if _v.Skillintr, _ok_ = _buf["skillintr"].(string); !_ok_ { err = errors.New("skillintr error"); return } }
     return
 }

sys/configure/structs/game.heroLevelupData.go

@@ -12,7 +12,8 @@ import "errors"
 
 type Game_heroLevelupData struct {
     Level int32
-    Heroexp int32
+    Heroexp []*Game_atn
+    Gold []*Game_atn
     Hp float32
     Atk float32
     Def float32
@@ -25,7 +26,34 @@ func (Game_heroLevelupData) GetTypeId() int {
 func NewGame_heroLevelupData(_buf map[string]interface{}) (_v *Game_heroLevelupData, err error) {
     _v = &Game_heroLevelupData{}
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["level"].(float64); !_ok_ { err = errors.New("level error"); return }; _v.Level = int32(_tempNum_) }
-    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["heroexp"].(float64); !_ok_ { err = errors.New("heroexp error"); return }; _v.Heroexp = int32(_tempNum_) }
+     {
+                var _arr_ []interface{}
+                var _ok_ bool
+                if _arr_, _ok_ = _buf["heroexp"].([]interface{}); !_ok_ { err = errors.New("heroexp error"); return }
+
+                _v.Heroexp = make([]*Game_atn, 0, len(_arr_))
+                
+                for _, _e_ := range _arr_ {
+                    var _list_v_ *Game_atn
+                    { 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_atn(_x_); err != nil { return } }
+                    _v.Heroexp = append(_v.Heroexp, _list_v_)
+                }
+            }
+
+     {
+                var _arr_ []interface{}
+                var _ok_ bool
+                if _arr_, _ok_ = _buf["gold"].([]interface{}); !_ok_ { err = errors.New("gold error"); return }
+
+                _v.Gold = make([]*Game_atn, 0, len(_arr_))
+                
+                for _, _e_ := range _arr_ {
+                    var _list_v_ *Game_atn
+                    { 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_atn(_x_); err != nil { return } }
+                    _v.Gold = append(_v.Gold, _list_v_)
+                }
+            }
+
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hp"].(float64); !_ok_ { err = errors.New("hp error"); return }; _v.Hp = float32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["atk"].(float64); !_ok_ { err = errors.New("atk error"); return }; _v.Atk = float32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["def"].(float64); !_ok_ { err = errors.New("def error"); return }; _v.Def = float32(_tempNum_) }

sys/configure/structs/game.heroStargrow.go

@@ -21,7 +21,7 @@ func NewGame_heroStargrow(_buf []map[string]interface{}) (*Game_heroStargrow, er
 			return nil, err2
 		} else {
 			_dataList = append(_dataList, _v)
-			dataMap[_v.Color] = _v
+			dataMap[_v.Star] = _v
 		}
 	}
 	return &Game_heroStargrow{_dataList:_dataList, _dataMap:dataMap}, nil

sys/configure/structs/game.heroStargrowData.go

@@ -11,7 +11,8 @@ package cfg
 import "errors"
 
 type Game_heroStargrowData struct {
-    Color int32
+    Star int32
+    Level int32
     StarupHp float32
     StarupAtk float32
     StarupDef float32
@@ -24,7 +25,8 @@ func (Game_heroStargrowData) GetTypeId() int {
 
 func NewGame_heroStargrowData(_buf map[string]interface{}) (_v *Game_heroStargrowData, err error) {
     _v = &Game_heroStargrowData{}
-    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["color"].(float64); !_ok_ { err = errors.New("color error"); return }; _v.Color = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["star"].(float64); !_ok_ { err = errors.New("star error"); return }; _v.Star = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["level"].(float64); !_ok_ { err = errors.New("level error"); return }; _v.Level = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["starup_hp"].(float64); !_ok_ { err = errors.New("starup_hp error"); return }; _v.StarupHp = float32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["starup_atk"].(float64); !_ok_ { err = errors.New("starup_atk error"); return }; _v.StarupAtk = float32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["starup_def"].(float64); !_ok_ { err = errors.New("starup_def error"); return }; _v.StarupDef = float32(_tempNum_) }

sys/configure/structs/game.heroStarupData.go

@@ -21,6 +21,7 @@ type Game_heroStarupData struct {
     Needrace []int32
     Needracestar int32
     Needracenum int32
+    Gold int32
 }
 
 func (Game_heroStarupData) GetTypeId() int {
@@ -52,5 +53,6 @@ func NewGame_heroStarupData(_buf map[string]interface{}) (_v *Game_heroStarupDat
 
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["needracestar"].(float64); !_ok_ { err = errors.New("needracestar error"); return }; _v.Needracestar = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["needracenum"].(float64); !_ok_ { err = errors.New("needracenum error"); return }; _v.Needracenum = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["gold"].(float64); !_ok_ { err = errors.New("gold error"); return }; _v.Gold = int32(_tempNum_) }
     return
 }

sys/configure/structs/game.newHero.go

@@ -21,7 +21,7 @@ func NewGame_newHero(_buf []map[string]interface{}) (*Game_newHero, error) {
 			return nil, err2
 		} else {
 			_dataList = append(_dataList, _v)
-			dataMap[_v.Id] = _v
+			dataMap[_v.Hid] = _v
 		}
 	}
 	return &Game_newHero{_dataList:_dataList, _dataMap:dataMap}, nil

sys/configure/structs/game.newHeroData.go

@@ -12,7 +12,7 @@ import "errors"
 import "bright/math"
 
 type Game_newHeroData struct {
-    Id int32
+    Hid int32
     Name string
     Star int32
     Color int32
@@ -40,7 +40,7 @@ func (Game_newHeroData) GetTypeId() int {
 
 func NewGame_newHeroData(_buf map[string]interface{}) (_v *Game_newHeroData, err error) {
     _v = &Game_newHeroData{}
-    { 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 _tempNum_ float64; if _tempNum_, _ok_ = _buf["hid"].(float64); !_ok_ { err = errors.New("hid error"); return }; _v.Hid = int32(_tempNum_) }
     { var _ok_ bool; if _v.Name, _ok_ = _buf["name"].(string); !_ok_ { err = errors.New("name error"); return } }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["star"].(float64); !_ok_ { err = errors.New("star error"); return }; _v.Star = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["color"].(float64); !_ok_ { err = errors.New("color error"); return }; _v.Color = int32(_tempNum_) }

sys/configure/structs/game.skillAfteratkData.go

@@ -13,7 +13,10 @@ import "errors"
 type Game_skillAfteratkData struct {
     Id int32
     Desc string
-    Target string
+    From int32
+    Limit int32
+    Where []string
+    Order []string
     EmitPR int32
     Type string
     Argu []string
@@ -32,7 +35,36 @@ func NewGame_skillAfteratkData(_buf map[string]interface{}) (_v *Game_skillAfter
     _v = &Game_skillAfteratkData{}
     { 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; if _v.Desc, _ok_ = _buf["Desc"].(string); !_ok_ { err = errors.New("Desc error"); return } }
-    { var _ok_ bool; if _v.Target, _ok_ = _buf["Target"].(string); !_ok_ { err = errors.New("Target error"); return } }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["From"].(float64); !_ok_ { err = errors.New("From error"); return }; _v.From = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Limit"].(float64); !_ok_ { err = errors.New("Limit error"); return }; _v.Limit = int32(_tempNum_) }
+     {
+                var _arr_ []interface{}
+                var _ok_ bool
+                if _arr_, _ok_ = _buf["Where"].([]interface{}); !_ok_ { err = errors.New("Where error"); return }
+
+                _v.Where = make([]string, 0, len(_arr_))
+                
+                for _, _e_ := range _arr_ {
+                    var _list_v_ string
+                    {  if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } }
+                    _v.Where = append(_v.Where, _list_v_)
+                }
+            }
+
+     {
+                var _arr_ []interface{}
+                var _ok_ bool
+                if _arr_, _ok_ = _buf["Order"].([]interface{}); !_ok_ { err = errors.New("Order error"); return }
+
+                _v.Order = make([]string, 0, len(_arr_))
+                
+                for _, _e_ := range _arr_ {
+                    var _list_v_ string
+                    {  if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } }
+                    _v.Order = append(_v.Order, _list_v_)
+                }
+            }
+
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["EmitPR"].(float64); !_ok_ { err = errors.New("EmitPR error"); return }; _v.EmitPR = int32(_tempNum_) }
     { var _ok_ bool; if _v.Type, _ok_ = _buf["Type"].(string); !_ok_ { err = errors.New("Type error"); return } }
      {