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

bin/json/game_dispatch_lv.json

@@ -2,8 +2,8 @@
   {
     "lv": 1,
     "probability": [
-      80,
+      60,
-      20,
+      40,
       0,
       0
     ],
@@ -12,8 +12,8 @@
   {
     "lv": 2,
     "probability": [
-      70,
+      60,
-      20,
+      30,
       10,
       0
     ],

bin/json/game_global.json

@@ -660,6 +660,7 @@
         "n": 30000
       }
     ],
-    "game_make_TunkNum": 5
+    "game_make_TunkNum": 5,
+    "pandamas_tiguandiaoxiang_cd": 10
   }
 ]

bin/json/game_pandamasmz.json

@@ -63,7 +63,7 @@
       "key": "muzhuang_3",
       "text": "3级木人桩"
     },
-    "pile_appearance": "Level2",
+    "pile_appearance": "Level3",
     "effect": {
       "key": "muzhuang_xiaoguo_3",
       "text": "每分钟提升经验{0}"
@@ -92,7 +92,7 @@
       "key": "muzhuang_4",
       "text": "4级木人桩"
     },
-    "pile_appearance": "Level2",
+    "pile_appearance": "Level4",
     "effect": {
       "key": "muzhuang_xiaoguo_4",
       "text": "每分钟提升经验{0}"
@@ -121,7 +121,7 @@
       "key": "muzhuang_5",
       "text": "5级木人桩"
     },
-    "pile_appearance": "Level2",
+    "pile_appearance": "Level5",
     "effect": {
       "key": "muzhuang_xiaoguo_5",
       "text": "每分钟提升经验{0}"

bin/json/game_pandamastj.json

@@ -32,7 +32,7 @@
       "key": "wuguan_1",
       "text": "图鉴信息描述"
     },
-    "icon": "wg_icon_mz02",
+    "icon": "wg_icon_mz03",
     "atlas_score": 45
   },
   {
@@ -50,7 +50,7 @@
       "key": "wuguan_1",
       "text": "图鉴信息描述"
     },
-    "icon": "wg_icon_mz03",
+    "icon": "wg_icon_mz02",
     "atlas_score": 60
   },
   {

modules/practice/api_info.go

@@ -29,10 +29,13 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.PracticeInfoReq) (c
 
 	if room.Npcstate == 0 && room.Currnpc == 0 {
 		this.module.modelPandata.refreshnpc(room)
+		update["currnpc"] = room.Currnpc
+		update["captain"] = room.Captain
+		update["formation"] = room.Formation
 	}
 
 	for i := 0; i < len(room.Statuers); {
-		if time.Unix(room.Statuers[i].End, 0).After(configure.Now()) { //过期
+		if configure.Now().After(time.Unix(room.Statuers[i].End, 0)) {
 			room.Statuers = append(room.Statuers[:i], room.Statuers[i+1:]...)
 			update["statuers"] = room.Statuers
 		} else {

modules/practice/module.go

@@ -214,7 +214,7 @@ func (this *Practice) ChallengeResults(bid, red, bule string, winSide int32) {
 		keep = false
 		for _, v := range buleroom.Statuers {
 			if v.Uid == red {
-				v.End = configure.Now().Add(time.Minute * 1).Unix()
+				v.End = configure.Now().Add(time.Minute * time.Duration(this.configure.GetGlobalConf().PandamasTiguandiaoxiangCd)).Unix()
 				keep = true
 				break
 			}
@@ -223,7 +223,7 @@ func (this *Practice) ChallengeResults(bid, red, bule string, winSide int32) {
 			buleroom.Statuers = append(buleroom.Statuers, &pb.DBPracticeStatuer{
 				Uid:    red,
 				Figure: reduser.Figure,
-				End:    configure.Now().Add(time.Minute * 1).Unix(),
+				End:    configure.Now().Add(time.Minute * time.Duration(this.configure.GetGlobalConf().PandamasTiguandiaoxiangCd)).Unix(),
 			})
 		}
 
@@ -238,7 +238,7 @@ func (this *Practice) ChallengeResults(bid, red, bule string, winSide int32) {
 		keep = false
 		for _, v := range redroom.Statuers {
 			if v.Uid == bule {
-				v.End = configure.Now().Add(time.Minute * 1).Unix()
+				v.End = configure.Now().Add(time.Minute * time.Duration(this.configure.GetGlobalConf().PandamasTiguandiaoxiangCd)).Unix()
 				keep = true
 				break
 			}
@@ -247,7 +247,7 @@ func (this *Practice) ChallengeResults(bid, red, bule string, winSide int32) {
 			redroom.Statuers = append(redroom.Statuers, &pb.DBPracticeStatuer{
 				Uid:    bule,
 				Figure: buleuser.Figure,
-				End:    configure.Now().Add(time.Minute * 1).Unix(),
+				End:    configure.Now().Add(time.Minute * time.Duration(this.configure.GetGlobalConf().PandamasTiguandiaoxiangCd)).Unix(),
 			})
 		}
 		for i, v := range buleroom.Statuers {

sys/configure/structs/game.globalData.go

@@ -196,6 +196,7 @@ type GameGlobalData struct {
     PandamasRankedBelow50 int32
     MrylFlushed []*Gameatn
     GameMakeTunkNum int32
+    PandamasTiguandiaoxiangCd int32
 }
 
 const TypeId_GameGlobalData = 477542761
@@ -819,6 +820,7 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
             }
 
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["game_make_TunkNum"].(float64); !_ok_ { err = errors.New("game_make_TunkNum error"); return }; _v.GameMakeTunkNum = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pandamas_tiguandiaoxiang_cd"].(float64); !_ok_ { err = errors.New("pandamas_tiguandiaoxiang_cd error"); return }; _v.PandamasTiguandiaoxiangCd = int32(_tempNum_) }
     return
 }