Merge branch 'master' of https://git.17pkmj.com:3000/sunhengwei/xmmg_1

配置表/guide/guide.json

@@ -61,6 +61,9 @@
         {"ID":2001,"type":20,"des":"lang13002001","param":""},
         {"ID":2002,"type":20,"des":"lang13002002","param":""},
         {"ID":2003,"type":20,"des":"lang13002003","param":""},
-        {"ID":2004,"type":20,"des":"lang13002004","param":""}
+        {"ID":2004,"type":20,"des":"lang13002004","param":""},
+        {"ID":2101,"type":21,"des":"lang13002101","param":""},
+        {"ID":2102,"type":21,"des":"lang13002102","param":""},
+        {"ID":2103,"type":21,"des":"lang13002103","param":""}
     ]
 }

配置表/i18n/zh.json

@@ -5472,6 +5472,9 @@
         {"id":"adGain0019","text":"是否观看广告，让设施立即送到"},
         {"id":"mini_game_003","text":"双倍奖励"},
         {"id":"menuui_012","text":"兑换已研发的菜谱"},
-        {"id":"toast_game_0019","text":"升级失败,面馆评价未达到条件"}
+        {"id":"toast_game_0019","text":"升级失败,面馆评价未达到条件"},
+        {"id":"lang13002101","text":"先前往主界面"},
+        {"id":"lang13002102","text":"前往研究界面"},
+        {"id":"lang13002103","text":"玩合成小游戏获得阳光"}
     ]
 }