Merge branch 'master' of http://10.108.64.190:3000/gfg/client

# Conflicts:
#	GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes

GameClient/Assets/Game/HotUpdate/Views/CommonGame/GoodsItemTipsView.cs

@@ -73,7 +73,14 @@ namespace GFGGame
 
         private void UpdateBase()
         {
-            _ui.m_comTipsBase.m_txtName.text = itemCfg.name;
+            if (LauncherConfig.netType == LauncherConfig.EnumNetType.LOCAL)
+            {
+                _ui.m_comTipsBase.m_txtName.text = string.Format("{0}  _{1}", itemCfg.name, itemCfg.id);
+            }
+            else
+            {
+                _ui.m_comTipsBase.m_txtName.text = itemCfg.name;
+            }
             _ui.m_comTipsBase.m_txtOwned.SetVar("count", "" + ItemDataManager.GetItemNum(itemCfg.id)).FlushVars();
             _ui.m_comTipsBase.m_txtDesc.text = string.IsNullOrEmpty(itemCfg.desc) ? "暂无描述" : itemCfg.desc;
             _ui.m_comTipsBase.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/GMPanelView.cs

@@ -69,10 +69,19 @@ namespace GFGGame
 
             int itemId = int.Parse(infos[0]);
             int itemNum = int.Parse(infos[1]);
-            if (itemId > 0 && itemNum > 0)
+            if (itemId > 0)
             {
-                string messageSuc = "ÒÑ»ñµÃÎïÆ·" + itemId + "*" + itemNum;
-                GMController.SendGMCommand("getItem " + content, messageSuc).Coroutine();
+                string messageSuc;
+                if (itemNum > 0)
+                {
+                    messageSuc = "ÒÑ»ñµÃÎïÆ·" + itemId + "*" + itemNum;
+                    GMController.SendGMCommand("getItem " + content, messageSuc).Coroutine();
+                }
+                else if (itemNum < 0)
+                {
+                    messageSuc = "ÒÑ¿Û³ýÎïÆ·" + itemId + "*" + itemNum;
+                    GMController.SendGMCommand("getItem " + content, messageSuc).Coroutine();
+                }
             }
             else
             {