ios

2020-07-26 12:46:05 +08:00
parent 53e9c8d4ce
commit 3d9e4130fa
61 changed files with 1574 additions and 1362 deletions
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/mine/IOS/phone.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/mine/IOS/phone.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/mine/IOS/phone.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/mine/IOS/phone.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 2fcfadc87ecb649edb8c35c5e1647da6
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/mine/IOS/sms.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/mine/IOS/sms.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/mine/IOS/sms.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/mine/IOS/sms.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 1ef28325ae7bd4282ae778778219405c
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/IOS/icon_1.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/IOS/icon_1.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/IOS/icon_1.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/IOS/icon_1.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: f29ee3751f2b04d7faf829429978e6e3
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/IOS/icon_2.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/IOS/icon_2.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/IOS/icon_2.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/IOS/icon_2.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: ebf831487efb5407d9f0d846a432bb86
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/IOS/icon_3.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/IOS/icon_3.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/IOS/icon_3.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/IOS/icon_3.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: cec605792750048c8a093facbba6fe53
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/IOS/icon_4.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/IOS/icon_4.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/IOS/icon_4.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/IOS/icon_4.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: c6fb09c375a554812a075f65f80f0aef
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/IOS/icon_5.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/IOS/icon_5.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/IOS/icon_5.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/IOS/icon_5.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: da12f8b33eee14104a4faddac0f47a3f
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/IOS/icon_6.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/IOS/icon_6.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/IOS/icon_6.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/IOS/icon_6.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: b75ba200549ed4ba4bf5134df3c998de
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/IOS/sort.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/IOS/sort.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/IOS/sort.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/IOS/sort.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: f3e457e830241474b892393e5a05def9
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/IOS/xuanze.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/IOS/xuanze.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/IOS/xuanze.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/IOS/xuanze.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: da9ad42e044504405b79c8bc643aecb7
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/IOS/xuanze_bg.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/IOS/xuanze_bg.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/IOS/xuanze_bg.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/IOS/xuanze_bg.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: fe19bc9fb8db1403db8b360ecc917fe2
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/priority/atlas/IOS/atlasAllReal.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/atlas/IOS/atlasAllReal.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/other/IOS/InputDate.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/other/IOS/InputDate.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/other/IOS/InputTime.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/other/IOS/InputTime.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/other/IOS/InputTime.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/other/IOS/InputTime.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 710e33ea3078e413d979b5772ca40b63
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelBindPhone.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelBindPhone.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelBindPhone.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelBindPhone.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: ff25ce6c16fb643f5aa4c4e64c0f8aea
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelCalender.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelCalender.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelComFilter.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelComFilter.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelCustDetail.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelCustDetail.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelFollowFilter.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelFollowFilter.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelFollowFilter.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelFollowFilter.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 8b77ba9b7e365497aa6fc185a1f63ae8
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelFollowList.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelFollowList.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelModifyFiled.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelModifyFiled.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelOrderDetail.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelOrderDetail.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelOrderDetail.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelOrderDetail.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 400c29331f0af4a55a85c90b9889861a
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelOrderList.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelOrderList.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelPopList.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelPopList.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelPopTime.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelPopTime.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelPopTime.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelPopTime.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 0e23147de662146db8c4b1fe9024d078
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelProductDetail.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelProductDetail.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelProductDetail.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelProductDetail.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 6faa27508196b41e5bb1ae7058de2f7f
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelProductList.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelProductList.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelProductList.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelProductList.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: c35093429349744cf809936bc04b69f0
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelResetPasswordStep1.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelResetPasswordStep1.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelResetPasswordStep2.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelResetPasswordStep2.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelResetPasswordStep3.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelResetPasswordStep3.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelSelectProduct.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelSelectProduct.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelSetting.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelSetting.unity3d
--- a/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/IOS/VerCtl.ver
+++ b/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/IOS/VerCtl.ver
@@ -1 +1 @@
-r8	$trCRM/resVer/IOS/VerCtl/priority.ver8,847a8ce6143c0ee141d3afef6fa6d3ce8	!trCRM/resVer/IOS/VerCtl/other.ver8,fbc232352dcc6d6c42b7d0a63bc488c5
+r8	$trCRM/resVer/IOS/VerCtl/priority.ver8,dd941d37ef700af2561ceffb7157551b8	!trCRM/resVer/IOS/VerCtl/other.ver8,fb6820ccb7e90d226406e632ade2a489
--- a/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/IOS/VerCtl/other.ver
+++ b/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/IOS/VerCtl/other.ver
--- a/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/IOS/VerCtl/priority.ver
+++ b/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/IOS/VerCtl/priority.ver