ios

Assets/trCRM/serversCfg/servers.json

@@ -1 +1 @@
-{"2020158":{"2":{"id":"2", "host":"app.ttf-cti.com", "name":"\u6d4b\u8bd5\u670d\u52a1\u5668", "iosVer":"548ff6dfae5542ce8141633822af86f3", "port":29006, "androidVer":"b1dd5a258abaa65e62c6e70070379eca", "isDev":1}, "3":{"id":"3", "host":"192.168.1.11", "name":"\u672c\u5730\u6d4b\u8bd5", "iosVer":"548ff6dfae5542ce8141633822af86f3", "port":29000, "androidVer":"b1dd5a258abaa65e62c6e70070379eca", "isDev":1}, "1":{"id":"1", "host":"app.ttf-cti.com", "name":"\u6b63\u5f0f\u670d\u52a1\u5668", "iosVer":"548ff6dfae5542ce8141633822af86f3", "port":29004, "androidVer":"b1dd5a258abaa65e62c6e70070379eca", "isDev":0}}}
+{"2020158":{"2":{"id":"2", "host":"app.ttf-cti.com", "name":"\u6d4b\u8bd5\u670d\u52a1\u5668", "iosVer":"b0fe536cc62b96acaca5e7dfc643fc79", "port":29006, "androidVer":"b1dd5a258abaa65e62c6e70070379eca", "isDev":1}, "3":{"id":"3", "host":"192.168.1.11", "name":"\u672c\u5730\u6d4b\u8bd5", "iosVer":"b0fe536cc62b96acaca5e7dfc643fc79", "port":29000, "androidVer":"b1dd5a258abaa65e62c6e70070379eca", "isDev":1}, "1":{"id":"1", "host":"app.ttf-cti.com", "name":"\u6b63\u5f0f\u670d\u52a1\u5668", "iosVer":"b0fe536cc62b96acaca5e7dfc643fc79", "port":29004, "androidVer":"b1dd5a258abaa65e62c6e70070379eca", "isDev":0}}}

Assets/trCRM/upgradeRes4Dev/priority/lua/net/NetProto.lua

@@ -114,7 +114,9 @@ end
 
 -- 上传头像
 NetProto.uploadUserHeadIcon = function(path, finishCallback)
-    NetProto._uploadFile("updateUserImg", path, "", MyUtl.CompressImage(path, 512), finishCallback)
+    -- 把文件名转成jpg
+    local _path = joinStr( Path.GetPathRoot(path), Path.GetFileNameWithoutExtension(path), ".jpg")
+    NetProto._uploadFile("updateUserImg", _path, "", MyUtl.CompressImage(path, 512), finishCallback)
 end
 
 NetProto.uploadFile = function(path, uploadPath, finishCallback)

Assets/trCRM/upgradeRes4Publish/other/uiAtlas/work/IOS/img-icon.unity3d.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: ab18867489b07411cb1a18bf4eef8ce8
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/trCRM/upgradeRes4Publish/other/uiAtlas/work/IOS/wenjian-icon.unity3d.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 6c198727306ed4c4790a549f8f9b3be8
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/trCRM/upgradeRes4Publish/other/uiAtlas/work/IOS/xiazai-icon.unity3d.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: adb7e7a582e114e6389379300d263ae8
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelFollowList4Cust.unity3d.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 837df485e3f3541ef83aaf05a20c3e87
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelTaskList4Cust.unity3d.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 78bf8a08cfc194b93b571b02210d829e
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/trCRM/upgradeRes4Ver/trCRM/resVer/IOS/VerCtl.ver

@@ -1 +1 @@
-r8	$trCRM/resVer/IOS/VerCtl/priority.ver8,b31a730784bbbfa610688be4a5098d028	!trCRM/resVer/IOS/VerCtl/other.ver8,2efa8efe3ddf6e5b86622aa228dcbbbc
+r8	$trCRM/resVer/IOS/VerCtl/priority.ver8,09df1180d27a5f77bfd97db244b61fda8	!trCRM/resVer/IOS/VerCtl/other.ver8,62728fec0546980ac4d5f4ec9806a711