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

bin/json/game_coin.json

@@ -5,12 +5,8 @@
     "color": 1,
     "effects": "",
     "access": 123,
-    "star": 0,
-    "race": 0,
     "img": "wp_icon_10035",
-    "ico": "wp_icon_10035",
+    "intr": "Currency used to purchase goods"
-    "intr": "Currency used to purchase goods",
-    "tipstxt": "Insufficient gold coins"
   },
   {
     "key": "diamond",
@@ -18,12 +14,8 @@
     "color": 2,
     "effects": "",
     "access": 158,
-    "star": 0,
-    "race": 0,
     "img": "wp_icon_10036",
-    "ico": "wp_icon_10036",
+    "intr": "Currency used to purchase goods"
-    "intr": "Currency used to purchase goods",
-    "tipstxt": "Diamond shortage"
   },
   {
     "key": "exp",
@@ -31,12 +23,8 @@
     "color": 3,
     "effects": "",
     "access": 113,
-    "star": 0,
-    "race": 0,
     "img": "icon_hy",
-    "ico": "icon_hy",
+    "intr": "Currency used to purchase goods"
-    "intr": "Currency used to purchase goods",
-    "tipstxt": "Lack of experience"
   },
   {
     "key": "friendPoint",
@@ -44,12 +32,8 @@
     "color": 1,
     "effects": "",
     "access": 115,
-    "star": 0,
-    "race": 0,
     "img": "wp_icon_10014",
-    "ico": "wp_icon_10014",
+    "intr": "Currency used to purchase goods"
-    "intr": "Currency used to purchase goods",
-    "tipstxt": "Insufficient friendship points"
   },
   {
     "key": "palyexp",
@@ -57,12 +41,8 @@
     "color": 3,
     "effects": "",
     "access": 113,
-    "star": 0,
-    "race": 0,
     "img": "wp_icon_0002",
-    "ico": "wp_icon_0002",
+    "intr": "Currency used to purchase goods"
-    "intr": "Currency used to purchase goods",
-    "tipstxt": "Lack of experience"
   },
   {
     "key": "guildexp",
@@ -70,12 +50,8 @@
     "color": 1,
     "effects": "",
     "access": 157,
-    "star": 0,
-    "race": 0,
     "img": "wp_icon_10024",
-    "ico": "wp_icon_10024",
+    "intr": "Currency used to purchase goods"
-    "intr": "Currency used to purchase goods",
-    "tipstxt": "Lack of guildexp"
   },
   {
     "key": "guildactive",
@@ -83,12 +59,8 @@
     "color": 1,
     "effects": "",
     "access": 157,
-    "star": 0,
-    "race": 0,
     "img": "wp_icon_0001",
-    "ico": "wp_icon_0001",
+    "intr": "Currency used to purchase goods"
-    "intr": "Currency used to purchase goods",
-    "tipstxt": "Insufficient guildactive"
   },
   {
     "key": "guildcoin",
@@ -96,12 +68,8 @@
     "color": 3,
     "effects": "",
     "access": 157,
-    "star": 0,
-    "race": 0,
     "img": "wp_icon_10017",
-    "ico": "wp_icon_10017",
+    "intr": "Currency used to purchase goods"
-    "intr": "Currency used to purchase goods",
-    "tipstxt": "Insufficient guildcoin"
   },
   {
     "key": "starcoin",
@@ -109,12 +77,8 @@
     "color": 3,
     "effects": "",
     "access": 158,
-    "star": 0,
-    "race": 0,
     "img": "wp_icon_10017",
-    "ico": "wp_icon_10017",
+    "intr": "Currency used to purchase goods"
-    "intr": "Currency used to purchase goods",
-    "tipstxt": "Insufficient guildcoin"
   },
   {
     "key": "vipexp",
@@ -122,12 +86,8 @@
     "color": 3,
     "effects": "",
     "access": 158,
-    "star": 0,
-    "race": 0,
     "img": "wp_icon_0002",
-    "ico": "wp_icon_0002",
+    "intr": "Currency used to purchase goods"
-    "intr": "Currency used to purchase goods",
-    "tipstxt": "Lack of experience"
   },
   {
     "key": "arenacoin",
@@ -135,12 +95,8 @@
     "color": 3,
     "effects": "",
     "access": 156,
-    "star": 0,
-    "race": 0,
     "img": "icon_ry",
-    "ico": "icon_ry",
+    "intr": "Currency used to purchase goods"
-    "intr": "Currency used to purchase goods",
-    "tipstxt": "Lack of experience"
   },
   {
     "key": "ps",
@@ -148,12 +104,8 @@
     "color": 3,
     "effects": "",
     "access": 156,
-    "star": 0,
-    "race": 0,
     "img": "wp_icon_0002",
-    "ico": "wp_icon_0002",
+    "intr": "Currency used to purchase goods"
-    "intr": "Currency used to purchase goods",
-    "tipstxt": "Lack of experience"
   },
   {
     "key": "heroexp",
@@ -161,12 +113,8 @@
     "color": 3,
     "effects": "",
     "access": 0,
-    "star": 0,
-    "race": 0,
     "img": "wp_icon_10009",
-    "ico": "wp_icon_10009",
+    "intr": "Currency used to purchase goods"
-    "intr": "Currency used to purchase goods",
-    "tipstxt": "Lack of experience"
   },
   {
     "key": "moongold",
@@ -174,11 +122,7 @@
     "color": 5,
     "effects": "",
     "access": 107,
-    "star": 0,
-    "race": 0,
     "img": "wp_icon_10009",
-    "ico": "wp_icon_10009",
+    "intr": "Currency used to purchase goods"
-    "intr": "Currency used to purchase goods",
-    "tipstxt": "Lack of experience"
   }
 ]

bin/json/game_pandamasjx.json

@@ -12,7 +12,6 @@
     "access": 0,
     "heroid": "13002",
     "img": "sbkp_js_13002",
-    "ico": "",
     "intr": {
       "key": "shirenyu10001",
       "text": "作为教习，食人鱼一直秉承着严厉的教习态度，在他手下训练的英雄可以获得巨大提升"
@@ -41,7 +40,6 @@
     "access": 0,
     "heroid": "13001",
     "img": "sbkp_js_13001",
-    "ico": "",
     "intr": {
       "key": "shirenyu10002",
       "text": "闪闪"
@@ -70,7 +68,6 @@
     "access": 0,
     "heroid": "44002",
     "img": "sbkp_js_44002",
-    "ico": "",
     "intr": {
       "key": "shirenyu10003",
       "text": "蛇先生"
@@ -99,7 +96,6 @@
     "access": 0,
     "heroid": "24005",
     "img": "sbkp_js_24005",
-    "ico": "",
     "intr": {
       "key": "shirenyu10004",
       "text": "金猴"
@@ -139,7 +135,6 @@
     "access": 0,
     "heroid": "14005",
     "img": "sbkp_js_14005",
-    "ico": "",
     "intr": {
       "key": "shirenyu10005",
       "text": "鹤大师"
@@ -168,7 +163,6 @@
     "access": 0,
     "heroid": "44006",
     "img": "sbkp_js_44006",
-    "ico": "",
     "intr": {
       "key": "shirenyu10006",
       "text": "悍娇虎"
@@ -197,7 +191,6 @@
     "access": 0,
     "heroid": "43001",
     "img": "sbkp_js_43001",
-    "ico": "",
     "intr": {
       "key": "shirenyu10007",
       "text": "盖"
@@ -226,7 +219,6 @@
     "access": 0,
     "heroid": "35002",
     "img": "sbkp_js_35002",
-    "ico": "",
     "intr": {
       "key": "shirenyu10008",
       "text": "希卡普"
@@ -255,7 +247,6 @@
     "access": 0,
     "heroid": "45004",
     "img": "sbkp_js_45004",
-    "ico": "",
     "intr": {
       "key": "shirenyu10009",
       "text": "穿靴猫"
@@ -295,7 +286,6 @@
     "access": 0,
     "heroid": "35001",
     "img": "sbkp_js_35001",
-    "ico": "",
     "intr": {
       "key": "shirenyu10010",
       "text": "师父"
@@ -335,7 +325,6 @@
     "access": 0,
     "heroid": "25001",
     "img": "sbkp_js_25001",
-    "ico": "",
     "intr": {
       "key": "shirenyu10011",
       "text": "阿宝"
@@ -375,7 +364,6 @@
     "access": 0,
     "heroid": "45001",
     "img": "sbkp_js_45001",
-    "ico": "",
     "intr": {
       "key": "shirenyu10012",
       "text": "乌龟大师"
@@ -415,7 +403,6 @@
     "access": 0,
     "heroid": "",
     "img": "wg_icon_ss",
-    "ico": "",
     "intr": {
       "key": "shirenyu20001",
       "text": "石锁，传闻是师父在训练阿宝时经常使用到的道具"
@@ -455,7 +442,6 @@
     "access": 0,
     "heroid": "",
     "img": "wg_icon_kz",
-    "ico": "",
     "intr": {
       "key": "shirenyu20002",
       "text": "双头空竹"
@@ -484,7 +470,6 @@
     "access": 0,
     "heroid": "",
     "img": "wg_icon_pj",
-    "ico": "",
     "intr": {
       "key": "shirenyu20003",
       "text": "木爬架"
@@ -513,7 +498,6 @@
     "access": 0,
     "heroid": "",
     "img": "wg_icon_bdw",
-    "ico": "",
     "intr": {
       "key": "shirenyu20004",
       "text": "不倒翁"
@@ -542,7 +526,6 @@
     "access": 0,
     "heroid": "",
     "img": "wg_icon_pc",
-    "ico": "",
     "intr": {
       "key": "shirenyu20005",
       "text": "棒槌"
@@ -571,7 +554,6 @@
     "access": 0,
     "heroid": "",
     "img": "wg_icon_tl",
-    "ico": "",
     "intr": {
       "key": "shirenyu20006",
       "text": "铜铃"
@@ -600,7 +582,6 @@
     "access": 0,
     "heroid": "",
     "img": "wg_icon_tj",
-    "ico": "",
     "intr": {
       "key": "shirenyu20007",
       "text": "尖刺吊环"
@@ -629,7 +610,6 @@
     "access": 0,
     "heroid": "",
     "img": "wg_icon_tj01",
-    "ico": "",
     "intr": {
       "key": "shirenyu20008",
       "text": "陀螺"
@@ -658,7 +638,6 @@
     "access": 0,
     "heroid": "",
     "img": "wg_icon_zl",
-    "ico": "",
     "intr": {
       "key": "shirenyu20009",
       "text": "大转轮"
@@ -698,7 +677,6 @@
     "access": 0,
     "heroid": "",
     "img": "wg_icon_mp",
-    "ico": "",
     "intr": {
       "key": "shirenyu20010",
       "text": "木头牌"
@@ -738,7 +716,6 @@
     "access": 0,
     "heroid": "",
     "img": "wg_icon_sjg",
-    "ico": "",
     "intr": {
       "key": "shirenyu20011",
       "text": "双节棍"
@@ -778,7 +755,6 @@
     "access": 0,
     "heroid": "",
     "img": "wg_icon_yd",
-    "ico": "",
     "intr": {
       "key": "shirenyu20012",
       "text": "练功带"
@@ -818,7 +794,6 @@
     "access": 0,
     "heroid": "",
     "img": "wg_icon_tj",
-    "ico": "",
     "intr": {
       "key": "shirenyu20013",
       "text": "七彩花棍"
@@ -858,7 +833,6 @@
     "access": 0,
     "heroid": "",
     "img": "wg_icon_fb",
-    "ico": "",
     "intr": {
       "key": "shirenyu20014",
       "text": "流星飞镖"
@@ -887,7 +861,6 @@
     "access": 0,
     "heroid": "",
     "img": "wg_icon_mxl",
-    "ico": "",
     "intr": {
       "key": "shirenyu20015",
       "text": "冥想锣"
@@ -916,7 +889,6 @@
     "access": 0,
     "heroid": "",
     "img": "wg_icon_ct",
-    "ico": "",
     "intr": {
       "key": "shirenyu20016",
       "text": "彩条龙"
@@ -945,7 +917,6 @@
     "access": 0,
     "heroid": "",
     "img": "wg_icon_kqms",
-    "ico": "",
     "intr": {
       "key": "shirenyu20017",
       "text": "孔雀毛扇"
@@ -983,7 +954,6 @@
     "access": 0,
     "heroid": "",
     "img": "wg_icon_ph",
-    "ico": "",
     "intr": {
       "key": "shirenyu20018",
       "text": "平衡木"
@@ -1021,7 +991,6 @@
     "access": 0,
     "heroid": "",
     "img": "wg_icon_th",
-    "ico": "",
     "intr": {
       "key": "shirenyu20019",
       "text": "铁环"
@@ -1059,7 +1028,6 @@
     "access": 0,
     "heroid": "",
     "img": "wg_icon_tj",
-    "ico": "",
     "intr": {
       "key": "shirenyu20020",
       "text": "太极球"

sys/configure/structs/Game.PandamasJxData.go

@@ -20,7 +20,6 @@ type GamePandamasJxData struct {
     Access int32
     Heroid string
     Img string
-    Ico string
     Intr string
     Description string
     Duration int32
@@ -47,7 +46,6 @@ func (_v *GamePandamasJxData)Deserialize(_buf map[string]interface{}) (err error
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["access"].(float64); !_ok_ { err = errors.New("access error"); return }; _v.Access = int32(_tempNum_) }
     { var _ok_ bool; if _v.Heroid, _ok_ = _buf["heroid"].(string); !_ok_ { err = errors.New("heroid error"); return } }
     { var _ok_ bool; if _v.Img, _ok_ = _buf["img"].(string); !_ok_ { err = errors.New("img error"); return } }
-    { var _ok_ bool; if _v.Ico, _ok_ = _buf["ico"].(string); !_ok_ { err = errors.New("ico error"); return } }
     {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["intr"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Intr error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Intr, _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["description"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Description error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Description, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["duration"].(float64); !_ok_ { err = errors.New("duration error"); return }; _v.Duration = int32(_tempNum_) }

sys/configure/structs/game.coinData.go

@@ -16,12 +16,8 @@ type GameCoinData struct {
     Color int32
     Effects string
     Access int32
-    Star int32
-    Race int32
     Img string
-    Ico string
     Intr string
-    Tipstxt string
 }
 
 const TypeId_GameCoinData = 1416227927
@@ -36,12 +32,8 @@ func (_v *GameCoinData)Deserialize(_buf map[string]interface{}) (err error) {
     { 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; if _v.Effects, _ok_ = _buf["effects"].(string); !_ok_ { err = errors.New("effects error"); return } }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["access"].(float64); !_ok_ { err = errors.New("access error"); return }; _v.Access = 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["race"].(float64); !_ok_ { err = errors.New("race error"); return }; _v.Race = int32(_tempNum_) }
     { var _ok_ bool; if _v.Img, _ok_ = _buf["img"].(string); !_ok_ { err = errors.New("img error"); return } }
-    { var _ok_ bool; if _v.Ico, _ok_ = _buf["ico"].(string); !_ok_ { err = errors.New("ico error"); return } }
     { var _ok_ bool; if _v.Intr, _ok_ = _buf["intr"].(string); !_ok_ { err = errors.New("intr error"); return } }
-    { var _ok_ bool; if _v.Tipstxt, _ok_ = _buf["tipstxt"].(string); !_ok_ { err = errors.New("tipstxt error"); return } }
     return
 }
 

sys/configure/structs/game.itemData.go

@@ -19,23 +19,18 @@ type GameItemData struct {
     Index int32
     SpecialType int32
     Time int32
+    Reddottype int32
     Effects string
     BoxId int32
     SynthetizeNum int32
     Access []int32
     UseSkip int32
     UpperLimit int32
-    Uselv int32
-    Isani int32
-    Star int32
-    Race int32
     Img string
-    Ico string
     Intr string
     Sale []*Gameatn
     SynthetizeDeplete []*Gameatn
     DecomposeDeplete []*Gameatn
-    Tipstxt string
 }
 
 const TypeId_GameItemData = -984700967
@@ -53,6 +48,7 @@ func (_v *GameItemData)Deserialize(_buf map[string]interface{}) (err error) {
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["index"].(float64); !_ok_ { err = errors.New("index error"); return }; _v.Index = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["special_type"].(float64); !_ok_ { err = errors.New("special_type error"); return }; _v.SpecialType = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["time"].(float64); !_ok_ { err = errors.New("time error"); return }; _v.Time = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["reddottype"].(float64); !_ok_ { err = errors.New("reddottype error"); return }; _v.Reddottype = int32(_tempNum_) }
     { var _ok_ bool; if _v.Effects, _ok_ = _buf["effects"].(string); !_ok_ { err = errors.New("effects error"); return } }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["box_id"].(float64); !_ok_ { err = errors.New("box_id error"); return }; _v.BoxId = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["synthetize_num"].(float64); !_ok_ { err = errors.New("synthetize_num error"); return }; _v.SynthetizeNum = int32(_tempNum_) }
@@ -72,12 +68,7 @@ func (_v *GameItemData)Deserialize(_buf map[string]interface{}) (err error) {
 
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["use_skip"].(float64); !_ok_ { err = errors.New("use_skip error"); return }; _v.UseSkip = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["upper_limit"].(float64); !_ok_ { err = errors.New("upper_limit error"); return }; _v.UpperLimit = int32(_tempNum_) }
-    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["uselv"].(float64); !_ok_ { err = errors.New("uselv error"); return }; _v.Uselv = int32(_tempNum_) }
-    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["isani"].(float64); !_ok_ { err = errors.New("isani error"); return }; _v.Isani = 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["race"].(float64); !_ok_ { err = errors.New("race error"); return }; _v.Race = int32(_tempNum_) }
     { var _ok_ bool; if _v.Img, _ok_ = _buf["img"].(string); !_ok_ { err = errors.New("img error"); return } }
-    { var _ok_ bool; if _v.Ico, _ok_ = _buf["ico"].(string); !_ok_ { err = errors.New("ico error"); return } }
     {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["intr"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Intr error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Intr, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
      {
                 var _arr_ []interface{}
@@ -121,7 +112,6 @@ func (_v *GameItemData)Deserialize(_buf map[string]interface{}) (err error) {
                 }
             }
 
-    {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["tipstxt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Tipstxt error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Tipstxt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
     return
 }