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

bin/json/game_global.json

@@ -155,14 +155,22 @@
     "kungfu_time": 30,
     "dreamland_fightnum": 30,
     "dreamland_recovery": 60,
-    "dreamland_cos": 1,
+    "dreamland_cos": {
+      "a": "item",
+      "t": "100003",
+      "n": 1
+    },
     "dreamland_resettime": 0,
     "dreamland_limit_time": 30,
     "dreamland_share_time": 300,
     "dreamland_triggernum": 20,
     "hunting_num": 10,
     "hunting_recovery": 60,
-    "hunting_cos": 1,
+    "hunting_cos": {
+      "a": "item",
+      "t": "100002",
+      "n": 1
+    },
     "hunting_reset": 1,
     "hunting_cap": [
       25001,
@@ -213,9 +221,17 @@
     "guild_BuildCd": 1,
     "ArenaTicket_max": 10,
     "ArenaTicket_RecoveryTime": 144,
-    "ArenaTicket_cos": 1,
+    "ArenaTicket_cos": {
+      "a": "item",
+      "t": "100004",
+      "n": 1
+    },
     "VikingExpedition_RecoveryTime": 144,
-    "VikingExpedition_cos": 1,
+    "VikingExpedition_cos": {
+      "a": "item",
+      "t": "100001",
+      "n": 1
+    },
     "ArenaTicket_PurchaseRrestrictions": 10,
     "arena_InitiaIntegral": 1000,
     "arena_RecordMax": 10,

comm/const.go

@@ -299,7 +299,12 @@ const (
 const (
 	Gold    int32 = 1 //金币
 	Diamond int32 = 2 //钻石
+)
 
+//门票
+const (
+	ArenaTicket       string = "10001" //竞技场入场券
+	MoonFantasyTicket string = "10002" //梦境场入场券
 )
 
 //红点枚举

sys/configure/structs/game.globalData.go

@@ -78,14 +78,14 @@ type GameGlobalData struct {
     KungfuTime int32
     DreamlandFightnum int32
     DreamlandRecovery int32
-    DreamlandCos int32
+    DreamlandCos *Gameatn
     DreamlandResettime int32
     DreamlandLimitTime int32
     DreamlandShareTime int32
     DreamlandTriggernum int32
     HuntingNum int32
     HuntingRecovery int32
-    HuntingCos int32
+    HuntingCos *Gameatn
     HuntingReset int32
     HuntingCap []int32
     GameTime []int32
@@ -111,9 +111,9 @@ type GameGlobalData struct {
     GuildBuildCd int32
     ArenaTicketMax int32
     ArenaTicketRecoveryTime int32
-    ArenaTicketCos int32
+    ArenaTicketCos *Gameatn
     VikingExpeditionRecoveryTime int32
-    VikingExpeditionCos int32
+    VikingExpeditionCos *Gameatn
     ArenaTicketPurchaseRrestrictions int32
     ArenaInitiaIntegral int32
     ArenaRecordMax int32
@@ -282,14 +282,14 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["kungfu_time"].(float64); !_ok_ { err = errors.New("kungfu_time error"); return }; _v.KungfuTime = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["dreamland_fightnum"].(float64); !_ok_ { err = errors.New("dreamland_fightnum error"); return }; _v.DreamlandFightnum = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["dreamland_recovery"].(float64); !_ok_ { err = errors.New("dreamland_recovery error"); return }; _v.DreamlandRecovery = int32(_tempNum_) }
-    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["dreamland_cos"].(float64); !_ok_ { err = errors.New("dreamland_cos error"); return }; _v.DreamlandCos = int32(_tempNum_) }
+    { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["dreamland_cos"].(map[string]interface{}); !_ok_ { err = errors.New("dreamland_cos error"); return }; if _v.DreamlandCos, err = DeserializeGameatn(_x_); err != nil { return } }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["dreamland_resettime"].(float64); !_ok_ { err = errors.New("dreamland_resettime error"); return }; _v.DreamlandResettime = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["dreamland_limit_time"].(float64); !_ok_ { err = errors.New("dreamland_limit_time error"); return }; _v.DreamlandLimitTime = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["dreamland_share_time"].(float64); !_ok_ { err = errors.New("dreamland_share_time error"); return }; _v.DreamlandShareTime = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["dreamland_triggernum"].(float64); !_ok_ { err = errors.New("dreamland_triggernum error"); return }; _v.DreamlandTriggernum = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hunting_num"].(float64); !_ok_ { err = errors.New("hunting_num error"); return }; _v.HuntingNum = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hunting_recovery"].(float64); !_ok_ { err = errors.New("hunting_recovery error"); return }; _v.HuntingRecovery = int32(_tempNum_) }
-    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hunting_cos"].(float64); !_ok_ { err = errors.New("hunting_cos error"); return }; _v.HuntingCos = int32(_tempNum_) }
+    { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["hunting_cos"].(map[string]interface{}); !_ok_ { err = errors.New("hunting_cos error"); return }; if _v.HuntingCos, err = DeserializeGameatn(_x_); err != nil { return } }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hunting_reset"].(float64); !_ok_ { err = errors.New("hunting_reset error"); return }; _v.HuntingReset = int32(_tempNum_) }
      {
                 var _arr_ []interface{}
@@ -393,9 +393,9 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["guild_BuildCd"].(float64); !_ok_ { err = errors.New("guild_BuildCd error"); return }; _v.GuildBuildCd = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ArenaTicket_max"].(float64); !_ok_ { err = errors.New("ArenaTicket_max error"); return }; _v.ArenaTicketMax = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ArenaTicket_RecoveryTime"].(float64); !_ok_ { err = errors.New("ArenaTicket_RecoveryTime error"); return }; _v.ArenaTicketRecoveryTime = int32(_tempNum_) }
-    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ArenaTicket_cos"].(float64); !_ok_ { err = errors.New("ArenaTicket_cos error"); return }; _v.ArenaTicketCos = int32(_tempNum_) }
+    { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["ArenaTicket_cos"].(map[string]interface{}); !_ok_ { err = errors.New("ArenaTicket_cos error"); return }; if _v.ArenaTicketCos, err = DeserializeGameatn(_x_); err != nil { return } }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["VikingExpedition_RecoveryTime"].(float64); !_ok_ { err = errors.New("VikingExpedition_RecoveryTime error"); return }; _v.VikingExpeditionRecoveryTime = int32(_tempNum_) }
-    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["VikingExpedition_cos"].(float64); !_ok_ { err = errors.New("VikingExpedition_cos error"); return }; _v.VikingExpeditionCos = int32(_tempNum_) }
+    { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["VikingExpedition_cos"].(map[string]interface{}); !_ok_ { err = errors.New("VikingExpedition_cos error"); return }; if _v.VikingExpeditionCos, err = DeserializeGameatn(_x_); err != nil { return } }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ArenaTicket_PurchaseRrestrictions"].(float64); !_ok_ { err = errors.New("ArenaTicket_PurchaseRrestrictions error"); return }; _v.ArenaTicketPurchaseRrestrictions = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["arena_InitiaIntegral"].(float64); !_ok_ { err = errors.New("arena_InitiaIntegral error"); return }; _v.ArenaInitiaIntegral = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["arena_RecordMax"].(float64); !_ok_ { err = errors.New("arena_RecordMax error"); return }; _v.ArenaRecordMax = int32(_tempNum_) }