ios

2020-07-28 21:13:10 +08:00
parent 8c38fea011
commit d6735bd7fa
32 changed files with 887 additions and 843 deletions
--- a/Assets/trCRM/Resources/Atlas/EmptyAtlas.prefab
+++ b/Assets/trCRM/Resources/Atlas/EmptyAtlas.prefab
@@ -46,7 +46,7 @@ MonoBehaviour:
  material: {fileID: 0}
  mSprites: []
  mPixelSize: 1
-  mReplacement: {fileID: 0}
+  mReplacement: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
  mCoordinates: 0
  sprites: []
  _isBorrowSpriteMode: 1
--- a/Assets/trCRM/upgradeRes4Publish/other/txt/IOS.meta
+++ b/Assets/trCRM/upgradeRes4Publish/other/txt/IOS.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 577e94e3fe74a47aab2271b9d6f6c024
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/other/txt/IOS/serviceProto.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/other/txt/IOS/serviceProto.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/other/txt/IOS/serviceProto.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/other/txt/IOS/serviceProto.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: ddb64678f2d164297b577def73769e9f
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- 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/InputPoplist.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/other/IOS/InputPoplist.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/panel/IOS/PanelAbout.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelAbout.unity3d
--- 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/PanelMine.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelMine.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelMoreProc4Cust.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelMoreProc4Cust.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelOceanList.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelOceanList.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelOceanList.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelOceanList.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: ae1833c66f7bc4e4fae787fb11e5de18
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- 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/PanelOrderList.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelOrderList.unity3d
--- 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/PanelSelectProduct.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelSelectProduct.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelSelectServer.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelSelectServer.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelSelectServer.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelSelectServer.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 3e22ce685334e49f1a6d0b668379b132
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelSetting.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelSetting.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelSysMsgDetail.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelSysMsgDetail.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,1053ccf33dd0febd0656772a424709b48	!trCRM/resVer/IOS/VerCtl/other.ver8,fb6820ccb7e90d226406e632ade2a489
+r8	$trCRM/resVer/IOS/VerCtl/priority.ver8,8d222215e457b60ba5f6a349ffb594398	!trCRM/resVer/IOS/VerCtl/other.ver8,25c5acc3c09b15e1b8d4ad52fd91159f
--- 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