Merge branch 'develop' of http://8.134.253.64:3000/huangjinghao/FishConfig into develop

GameConfig/CFG.check

@@ -1,6 +1,6 @@
 D:\git\newWork\Config\GameConfig\M_game_battle_field.xls:1511108716
 D:\git\newWork\Config\GameConfig\M_monster.xls:1846396672
-D:\git\newWork\Config\GameConfig\M_i18n.xls:-1915081204
+D:\git\newWork\Config\GameConfig\M_i18n.xls:-2146822812
 D:\git\newWork\Config\GameConfig\M_un_lock_battle.xls:84348074
 D:\git\newWork\Config\GameConfig\M_everyday_task.xls:949185213
 D:\git\newWork\Config\GameConfig\M_vip_config.xls:1878630432

GameConfig/Lua/M_i18n.lua

@@ -61,6 +61,7 @@ function M_i18n:init()
 	self.datas["3000028"] = {ID = "3000028", zh = "正在连接服务器...", en = "Connect Server..."}
 	self.datas["3000029"] = {ID = "3000029", zh = "正在获取用户信息...", en = "Get Role Info..."}
 	self.datas["3000030"] = {ID = "3000030", zh = "正在进入游戏...", en = "Enter Game..."}
+	self.datas["3000031"] = {ID = "3000031", zh = "未解锁", en = "Lock"}
 end
 
 M_i18n:init()

GameConfig/Xml/M_i18n.xml

@@ -52,4 +52,5 @@
 	<Data ID="3000028" zh="正在连接服务器..." en="Connect Server..." />
 	<Data ID="3000029" zh="正在获取用户信息..." en="Get Role Info..." />
 	<Data ID="3000030" zh="正在进入游戏..." en="Enter Game..." />
+	<Data ID="3000031" zh="未解锁" en="Lock" />
 </Root>

GameConfig/json/M_i18n.json

@@ -102,4 +102,6 @@
 
 ,"3000030":{"ID":"3000030","zh":"正在进入游戏...","en":"Enter Game..."}
 
+,"3000031":{"ID":"3000031","zh":"未解锁","en":"Lock"}
+
 }

GameConfig/ts/M_i18n.ts

@@ -106,6 +106,8 @@ export default class M_i18n {
 
       ,"3000030":{"ID":"3000030","zh":"正在进入游戏...","en":"Enter Game..."}
 
+      ,"3000031":{"ID":"3000031","zh":"未解锁","en":"Lock"}
+
       }// ID:参数编号, zh:中文, en:英文