update

2020-08-02 08:47:44 +08:00
parent 4435098171
commit f3ecc018ff
11 changed files with 232 additions and 89 deletions
--- a/Assets/trCRM/_scene/Main.unity
+++ b/Assets/trCRM/_scene/Main.unity
@@ -1668,7 +1668,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 5e28cad2f718f443db7bef1ef8b01221, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  appUniqueID: 0
+  appUniqueID: 1000
  isContBorrowSpriteTimes: 0
  isNotEditorMode: 0
  isEncodeLua: 1
--- a/Assets/trCRM/serversCfg.meta
+++ b/Assets/trCRM/serversCfg.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5fd029f572e644f84a572d1a6a556ff1
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/serversCfg/servers.json
+++ b/Assets/trCRM/serversCfg/servers.json
@@ -0,0 +1,32 @@
+{
+  "appid": "2020158",
+  "servers": {
+    "1": {
+      "id": "1",
+      "name": "正式服",
+      "host": "app.ttf-cti.com",
+      "port": 29004,
+      "isDev": 0,
+      "iosVer": "",
+      "androidVer": ""
+    },
+    "2": {
+      "id": "2",
+      "name": "测试服",
+      "host": "app.ttf-cti.com",
+      "port": 29004,
+      "isDev": 1,
+      "iosVer": "",
+      "androidVer": ""
+    },
+    "3": {
+      "id": "3",
+      "name": "本地测试",
+      "host": "192.168.1.11",
+      "port": 29000,
+      "isDev": 1,
+      "iosVer": "",
+      "androidVer": ""
+    }
+  }
+}
--- a/Assets/trCRM/serversCfg/servers.json.meta
+++ b/Assets/trCRM/serversCfg/servers.json.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 5c43957f94ee14dd7b78de24712d9c6c
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/net/NetProto.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/net/NetProto.lua
@@ -13,23 +13,10 @@ local port = 29004
 local baseUrl = joinStr("http://", host, ":", port, "/open_api/")
 local socketUrl = joinStr("ws://", host, ":", port, "/tr_socket/websocket/")

-NetProto.setSeverPublish = function()
-    host = "app.ttf-cti.com"
-    port = 29004
-    baseUrl = joinStr("http://", host, ":", port, "/open_api/")
-    socketUrl = joinStr("ws://", host, ":", port, "/tr_socket/websocket/")
-end

-NetProto.setSeverDev = function()
-    host = "app.ttf-cti.com"
-    port = 29000
-    baseUrl = joinStr("http://", host, ":", port, "/open_api/")
-    socketUrl = joinStr("ws://", host, ":", port, "/tr_socket/websocket/")
-end
-
-NetProto.setSeverLocal = function()
-    host = "192.168.1.11"
-    port = 29000
+NetProto.setSever = function(_host, _port)
+    host = _host
+    port = _port
    baseUrl = joinStr("http://", host, ":", port, "/open_api/")
    socketUrl = joinStr("ws://", host, ":", port, "/tr_socket/websocket/")
 end
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLLCellServer.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLLCellServer.lua
@@ -1,48 +1,36 @@
 -- xx单元
-do
-    local _cell = {}
-    local csSelf = nil;
-    local transform = nil;
-    local mData = nil;
-    local uiobjs = {}
+local _cell = {}
+local csSelf = nil
+local transform = nil
+local mData = nil
+local uiobjs = {}

-    -- 初始化，只调用一次
-    function _cell.init (csObj)
-        csSelf = csObj;
-        transform = csSelf.transform;
-        --[[
+-- 初始化，只调用一次
+function _cell.init(csObj)
+    csSelf = csObj
+    transform = csSelf.transform
+    --[[
        上的组件：getChild(transform, "offset", "Progress BarHong"):GetComponent("UISlider");
        --]]
-        uiobjs.Background = getCC(transform, "Background", "UISprite")
-        uiobjs.Label = getCC(transform, "Label", "UILabel")
-        uiobjs.LabelStat = getCC(transform, "LabelStat", "UILabel")
-        uiobjs.LabelNew = getCC(transform, "LabelNew", "UILabel")
-    end
-
-    -- 显示，
-    -- 注意，c#侧不会在调用show时，调用refresh
-    function _cell.show ( go, data )
-        mData = data;
-        uiobjs.Label.text = mData.name
-        local stateDesc = ""
-        local status = bio2number(mData.status)
-        if status == 2 then
-            stateDesc = joinStr("[00ffff]", LGet("StateCrowded"),"[-]")
-        elseif status == 3 then
-            stateDesc = LGet("StateMaintain")
-            stateDesc = joinStr("[ff0000]", LGet("StateMaintain"),"[-]")
-        else
-            stateDesc = joinStr("[00ff00]", LGet("StateNomal"),"[-]")
-        end
-        uiobjs.LabelStat.text = stateDesc
-        SetActive(uiobjs.LabelNew.gameObject, mData.isnew and true or false)
-    end
-
-    -- 取得数据
-    function _cell.getData ( )
-        return mData;
-    end
-
-    --------------------------------------------
-    return _cell;
+    uiobjs.Label = getCC(transform, "Label", "UILabel")
 end
+
+-- 显示，
+-- 注意，c#侧不会在调用show时，调用refresh
+function _cell.show(go, data)
+    mData = data
+    uiobjs.Label.text = mData.name
+    if mData.isDev == 1 then
+        uiobjs.Label.color = Color.red
+    else
+        uiobjs.Label.color = Color.white
+    end
+end
+
+-- 取得数据
+function _cell.getData()
+    return mData
+end
+
+--------------------------------------------
+return _cell
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPSplash.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPSplash.lua
@@ -190,8 +190,12 @@ function CLLPSplash.updateRes()
            CLLPSplash.selectServer(
                function(result)
                    server = result
-                    Prefs.setCurrServer(json.encode(server))
-                    CLLPSplash.checkHotUpgrade()
+                    if server == nil then
+                        CLUIUtl.showConfirm("未取得服务器，请联系管理员！", nil)
+                    else
+                        Prefs.setCurrServer(json.encode(server))
+                        CLLPSplash.checkHotUpgrade()
+                    end
                end
            )
        end
@@ -201,23 +205,29 @@ end
 CLLPSplash.selectServer = function(callback)
    local onGetServers = function(content, orgs)
        local content = json.decode(content)
-
+        local servers = content[CLCfgBase.self.appUniqueID] or {}
        local userName = Prefs.getUserName()
        DBUser.isWhiteUser(
            userName,
            function(iswhite)
                if iswhite then
-                    getPanelAsy("PanelSelectServer", onLoadedPanelTT, {servers = content.data, callback = callback})
+                    getPanelAsy("PanelSelectServer", onLoadedPanelTT, {servers = servers, callback = callback})
                else
-                    --//TODO:取得正式环境的信息
-                    Utl.doCallback(callback)
+                    --取得正式环境的信息
+                    local server
+                    for key, v in pairs(servers) do
+                        if v.isDev == 0 then
+                            server = v
+                        end
+                    end
+                    Utl.doCallback(callback, server)
                end
            end
        )
    end
-    local url = "" --//TODO:不要token验证，传appid，以便可以区分服务器
+    local url = joinStr(CLVerManager.self.baseUrl, "/servers.json")
    WWWEx.get(
-        url,
+        Utl.urlAddTimes(url),
        nil,
        CLAssetType.text,
        onGetServers,
@@ -408,7 +418,7 @@ function CLLPSplash.goNext()
    if CLCfgBase.self.isDirectEntry then
        CLCfgBase.self.isDirectEntry = false
    end
-    CLPanelManager.getPanelAsy("PanelStart", onLoadedPanel, {user, server})
+    CLPanelManager.getPanelAsy("PanelStart", onLoadedPanel, {server = server})
 end

 -- 当按了返回键时，关闭自己（返值为true时关闭）
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPStart.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPStart.lua
@@ -90,12 +90,11 @@ function CLLPStart.setLuasAtBegainning()
 end

 function CLLPStart.setData(pars)
-    user = pars[1]
-    selectedServer = pars[2]
+    selectedServer = pars.server
 end

 function CLLPStart.show()
-    --CLLPStart.createPanel()
+    NetProto.setSever(selectedServer.host, selectedServer.port)
 end

 -- 刷新页面
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSelectServer.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSelectServer.prefab
@@ -166,6 +166,7 @@ GameObject:
  - component: {fileID: 630664255065274416}
  - component: {fileID: 2706568950277189029}
  - component: {fileID: 5016178426459801864}
+  - component: {fileID: 5182567377838306484}
  m_Layer: 5
  m_Name: 00000
  m_TagString: Untagged
@@ -288,6 +289,21 @@ MonoBehaviour:
  mSpriteName: public_button
  mFillCenter: 1
  isGrayMode: 0
+--- !u!114 &5182567377838306484
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6320771060119039048}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 575f113ee96624a30ab2ca1af1303112, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  isPause: 0
+  luaPath: trCRM/upgradeRes/priority/lua/ui/cell/CLLCellServer.lua
+  isNeedResetAtlase: 1
 --- !u!1 &8005951734287196268
 GameObject:
  m_ObjectHideFlags: 0