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

bin/json/game_loading.json

@@ -286,11 +286,11 @@
     "icon": "loading_icon_fc",
     "title": {
       "key": "loading_Sheet1_title_20",
-      "text": "「主线第2章」"
+      "text": "「原始人聚集地」"
     },
     "prompt": {
       "key": "loading_Sheet1_prompt_20",
-      "text": "想学会功夫，必须要先相信。相信自我，相信爱，相信它们一直都在。"
+      "text": "见到咕噜一家之前，中轴城的学者们用了很多手段，来研究这片原野上有没有人类居住。</br>后来……如果不是盖来到中轴城，这里还是一片自然保护区。"
     }
   },
   {
@@ -300,11 +300,11 @@
     "icon": "loading_icon_fc",
     "title": {
       "key": "loading_Sheet1_title_21",
-      "text": "「主线第3章」"
+      "text": "「罪恶都市」"
     },
     "prompt": {
       "key": "loading_Sheet1_prompt_21",
-      "text": "当尾巴开始不由自主地摆动，便代表一颗善心开始苏醒。"
+      "text": "最多的坏人……最近好像都变成了好人？最严密的监狱……最近好像一直被越狱？</br>好吧，或许这座城市该换个名字了。"
     }
   },
   {
@@ -314,11 +314,11 @@
     "icon": "loading_icon_fc",
     "title": {
       "key": "loading_Sheet1_title_22",
-      "text": "「主线第4章」"
+      "text": "「童话王国」"
     },
     "prompt": {
       "key": "loading_Sheet1_prompt_22",
-      "text": "许多人爱慕美丽的容颜，而我独爱虔诚善良的心。"
+      "text": "有公主和王子，有反派和丑角；有英雄救美，有佳偶天成；善良就会美满，作恶总有报应……</br>什么？门票？不不，不好意思，我们不是迪士尼。"
     }
   },
   {

bin/json/game_mainstage.json

@@ -917,7 +917,7 @@
     ],
     "helphero": [],
     "banhero": [
-      "24008"
+      "33005"
     ],
     "star": [
       1,
@@ -9713,7 +9713,7 @@
     "buried": 0,
     "grouptype": [],
     "Episodetype": 5,
-    "stage_param": 10002,
+    "stage_param": 60001,
     "inherit": 0,
     "battle_fail": 0,
     "venturemodelspeed": 0,
@@ -10311,7 +10311,7 @@
     "buried": 0,
     "grouptype": [],
     "Episodetype": 5,
-    "stage_param": 10003,
+    "stage_param": 70001,
     "inherit": 0,
     "battle_fail": 0,
     "venturemodelspeed": 0,

bin/json/game_msgdistrib.json

@@ -166,5 +166,11 @@
     "open": true,
     "routrules": "~/worker",
     "describe": "犬兔大战"
+  },
+  {
+    "msgid": "catchbugs",
+    "open": true,
+    "routrules": "~/worker",
+    "describe": "捉虫子"
   }
 ]

modules/catchbugs/rooms.go

@@ -27,9 +27,9 @@ func (this *roomsComp) queryRoom(rid string) (room *Room, err error) {
 	var (
 		ok bool
 	)
-	this.lock.Lock()
+	this.lock.RLock()
 	room, ok = this.rooms[rid]
-	this.lock.Unlock()
+	this.lock.RUnlock()
 	if !ok {
 		err = fmt.Errorf("no found room:%s", rid)
 		return