Browse Source

ios

master
chenbin 4 years ago
parent
commit
38a377534b

+ 749
- 751
Assets/CoolapeFrameData/verControl/.resModifyDate.v
File diff suppressed because it is too large
View File


BIN
Assets/CoolapeFrameData/verControl/IOS/ver4DevelopeMd5.v View File


+ 4
- 4
Assets/CoolapeFrameData/verControl/IOS/ver4Upgrade.v View File

@@ -1,4 +1,4 @@
1
-trCRM/upgradeRes/priority/ui/panel/IOS/PanelSysMsgList.unity3d,3d0a1fd9c4b5d05b268bb73d3c810127
1
+trCRM/upgradeRes/priority/ui/panel/IOS/PanelSysMsgList.unity3d,8ce8dfb07984dce420e962223c6fcf32
2 2
 trCRM/upgradeRes/priority/lua/ui/cell/TRCellExtendField.lua,dba644a81c6214e4804eaebc0931382f
3 3
 trCRM/upgradeRes/priority/lua/public/CLLIncludeBase.lua,4820cbe7f1f16ec63ed1dd8426533483
4 4
 trCRM/upgradeRes/priority/lua/ui/panel/CSPMain.lua,24f616b9384dc0eefa9955fabb1d05f1
@@ -40,7 +40,6 @@ trCRM/upgradeRes/other/uiAtlas/order/IOS/ipt_bg.unity3d,b1698fd4a965642b0908672f
40 40
 trCRM/upgradeRes/priority/ui/panel/IOS/PanelSceneManager.unity3d,7c9a53dc83974a6cab329f0987511428
41 41
 trCRM/upgradeRes/priority/ui/panel/IOS/PanelFollowFilter.unity3d,cc3fedaa66097cf230aaf9b3767e6766
42 42
 trCRM/upgradeRes/other/uiAtlas/work/IOS/work_icon_1.unity3d,0ce47cb41a1c039d116f0a1176ffdc82
43
-trCRM/upgradeRes/other/uiAtlas/cust/IOS/peo.unity3d,0d912c6c28bf962b0e1f28ac4f76d2ba
44 43
 trCRM/upgradeRes/priority/lua/ui/panel/CLLPSplash.lua,6418723ac66fc8ab625db8d61cd2c07d
45 44
 trCRM/upgradeRes/priority/ui/panel/IOS/PanelBindPhone.unity3d,58f85410d5d614196793a0ce1eceb800
46 45
 trCRM/upgradeRes/priority/lua/ui/cell/CLLCellWWWProgress.lua,ec0258e77f76c8b681d0f02e7a5ff342
@@ -53,6 +52,7 @@ trCRM/upgradeRes/other/uiAtlas/public/IOS/radio.unity3d,0c43a7ba6ffa8229a8639635
53 52
 trCRM/upgradeRes/other/uiAtlas/cust/IOS/right.unity3d,3d5aa57f1b9a4c63ceac9f3f8e9a588a
54 53
 trCRM/upgradeRes/priority/ui/panel/IOS/PanelLogin.unity3d,68658d870bfd42c01e8ef7f0c5438644
55 54
 trCRM/upgradeRes/other/uiAtlas/public/IOS/_empty.unity3d,8e127e3490c9651f0756f621dc2fb1a6
55
+trCRM/upgradeRes/priority/lua/toolkit/curve.lua,f97735ed6c39accb55cdae44b62b5b38
56 56
 trCRM/upgradeRes/priority/lua/ui/panel/TRPSetting.lua,3f0976bdbc070d9cebc936e5c21735f1
57 57
 trCRM/upgradeRes/priority/lua/ui/panel/TRPNewOrder.lua,6e2e45005c89570bae55b3df5a0148f7
58 58
 trCRM/upgradeRes/priority/lua/toolkit/CLLVerManager.lua,39b154e796d60c2c40ebcc427a5c05e8
@@ -258,7 +258,7 @@ trCRM/upgradeRes/priority/lua/json/rpc.lua,28c2f09ceb729d01052d8408eed0b57a
258 258
 trCRM/upgradeRes/other/uiAtlas/coolape/IOS/button.unity3d,c8009be975691b21cac9fdc55f343cc3
259 259
 trCRM/upgradeRes/other/uiAtlas/cust/IOS/get.unity3d,e15371fcae70c8c9ea93baab3f7cf286
260 260
 trCRM/upgradeRes/priority/ui/panel/IOS/PanelMyInfor.unity3d,c6640ed473b69f3c72d9f4639cf66eb6
261
-trCRM/upgradeRes/priority/ui/other/IOS/Frame1.unity3d,e0760bb76b26b81b295e4a1d55cacd65
261
+trCRM/upgradeRes/priority/ui/other/IOS/Frame1.unity3d,d9bf0935b8e4359d4ef3fef28ee6979d
262 262
 trCRM/upgradeRes/priority/lua/ui/panel/CLLPPopList.lua,896c4b35a6cd0d4f86ed5c0ba532ea00
263 263
 trCRM/upgradeRes/priority/lua/ui/cell/TRCellReportform2.lua,e62a82bcc9fb817a4460e82b6351e18f
264 264
 trCRM/upgradeRes/priority/ui/panel/IOS/PanelStart.unity3d,f86ac64b15f6d871f734ed7ac5a145a7
@@ -280,7 +280,7 @@ trCRM/upgradeRes/priority/lua/ui/panel/TRPCustList.lua,bcebb5a35d387e2bb40771169
280 280
 trCRM/upgradeRes/other/uiAtlas/logo/IOS/logo2.unity3d,41c5912127597703a9c1ab2848c89ff6
281 281
 trCRM/upgradeRes/other/uiAtlas/cust/IOS/del.unity3d,d2c4a7e271dac1f816115acd9caf6873
282 282
 trCRM/upgradeRes/priority/lua/cfg/DBCfg.lua,3d0e60dbcdaa61b8553eee17f4d68b32
283
-trCRM/upgradeRes/priority/lua/toolkit/curve.lua,f97735ed6c39accb55cdae44b62b5b38
283
+trCRM/upgradeRes/other/uiAtlas/cust/IOS/peo.unity3d,0d912c6c28bf962b0e1f28ac4f76d2ba
284 284
 trCRM/upgradeRes/priority/lua/db/DBRoot.lua,3b2f7f6d066a93d94754334c6b0b8ba3
285 285
 trCRM/upgradeRes/other/uiAtlas/work/IOS/work_ranking.unity3d,d6ec636ccfbf0c4525703871069765c5
286 286
 trCRM/upgradeRes/other/uiAtlas/cust/IOS/oean.unity3d,2220377e30d7a40b551ff00531cde4b0

+ 1
- 1
Assets/CoolapeFrameData/verControl/IOS/ver4UpgradeList.v
File diff suppressed because it is too large
View File


+ 2
- 2
Assets/CoolapeFrameData/verControl/IOS/ver4UpgradeMd5.v View File

@@ -1,4 +1,4 @@
1
-trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelSysMsgList.unity3d,3d0a1fd9c4b5d05b268bb73d3c810127
1
+trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelSysMsgList.unity3d,8ce8dfb07984dce420e962223c6fcf32
2 2
 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendField.lua,dba644a81c6214e4804eaebc0931382f
3 3
 trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelNewCust.unity3d,dab39d6090cd685f97211dbdf1f36a7b
4 4
 trCRM/upgradeRes4Publish/priority/lua/public/CLLIncludeBase.lua,4820cbe7f1f16ec63ed1dd8426533483
@@ -260,7 +260,7 @@ trCRM/upgradeRes4Publish/priority/lua/json/rpc.lua,28c2f09ceb729d01052d8408eed0b
260 260
 trCRM/upgradeRes4Publish/other/uiAtlas/coolape/IOS/button.unity3d,c8009be975691b21cac9fdc55f343cc3
261 261
 trCRM/upgradeRes4Publish/other/uiAtlas/cust/IOS/get.unity3d,e15371fcae70c8c9ea93baab3f7cf286
262 262
 trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelMyInfor.unity3d,c6640ed473b69f3c72d9f4639cf66eb6
263
-trCRM/upgradeRes4Publish/priority/ui/other/IOS/Frame1.unity3d,e0760bb76b26b81b295e4a1d55cacd65
263
+trCRM/upgradeRes4Publish/priority/ui/other/IOS/Frame1.unity3d,d9bf0935b8e4359d4ef3fef28ee6979d
264 264
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPPopList.lua,896c4b35a6cd0d4f86ed5c0ba532ea00
265 265
 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellReportform2.lua,e62a82bcc9fb817a4460e82b6351e18f
266 266
 trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelStart.unity3d,f86ac64b15f6d871f734ed7ac5a145a7

+ 1
- 1
Assets/trCRM/serversCfg/servers.json View File

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

+ 138
- 3
Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSysMsgList.prefab View File

@@ -618,11 +618,11 @@ MonoBehaviour:
618 618
   mPivot: 4
619 619
   mWidth: 1126
620 620
   mHeight: 2173
621
-  mDepth: -1
621
+  mDepth: -3
622 622
   autoResizeBoxCollider: 0
623 623
   hideIfOffScreen: 0
624 624
   keepAspectRatio: 0
625
-  aspectRatio: 0.491274
625
+  aspectRatio: 0.5181776
626 626
   mType: 1
627 627
   mFillDirection: 4
628 628
   mFillAmount: 1
@@ -835,7 +835,7 @@ MonoBehaviour:
835 835
   anchorOffset: 0
836 836
   softBorderPadding: 1
837 837
   renderQueue: 0
838
-  startingRenderQueue: 3001
838
+  startingRenderQueue: 3003
839 839
   mClipTexture: {fileID: 0}
840 840
   mAlpha: 1
841 841
   mClipping: 3
@@ -1154,6 +1154,7 @@ Transform:
1154 1154
   - {fileID: 2492881819208053989}
1155 1155
   - {fileID: 9125076384738364936}
1156 1156
   - {fileID: 1153702329487857720}
1157
+  - {fileID: 715763578686176692}
1157 1158
   m_Father: {fileID: 0}
1158 1159
   m_RootOrder: 0
1159 1160
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1628,3 +1629,137 @@ MonoBehaviour:
1628 1629
   isAppendEndingString: 1
1629 1630
   AppendString: '...'
1630 1631
   fontName: EmptyFont
1632
+--- !u!1001 &8532130438695951606
1633
+PrefabInstance:
1634
+  m_ObjectHideFlags: 0
1635
+  serializedVersion: 2
1636
+  m_Modification:
1637
+    m_TransformParent: {fileID: 981640191715017145}
1638
+    m_Modifications:
1639
+    - target: {fileID: 1334497085766210663, guid: 28d8b703197554a599420a748208eaeb,
1640
+        type: 3}
1641
+      propertyPath: mAtlas
1642
+      value: 
1643
+      objectReference: {fileID: 8379920634462272047, guid: 9aea3d2b5a77f4e84bd921688ff9ca99,
1644
+        type: 3}
1645
+    - target: {fileID: 1675113163761975778, guid: 28d8b703197554a599420a748208eaeb,
1646
+        type: 3}
1647
+      propertyPath: m_Size.x
1648
+      value: 1125
1649
+      objectReference: {fileID: 0}
1650
+    - target: {fileID: 2932258586022639957, guid: 28d8b703197554a599420a748208eaeb,
1651
+        type: 3}
1652
+      propertyPath: m_Name
1653
+      value: Frame1
1654
+      objectReference: {fileID: 0}
1655
+    - target: {fileID: 2932258586022639957, guid: 28d8b703197554a599420a748208eaeb,
1656
+        type: 3}
1657
+      propertyPath: m_IsActive
1658
+      value: 1
1659
+      objectReference: {fileID: 0}
1660
+    - target: {fileID: 4283754972967156490, guid: 28d8b703197554a599420a748208eaeb,
1661
+        type: 3}
1662
+      propertyPath: mWidth
1663
+      value: 1125
1664
+      objectReference: {fileID: 0}
1665
+    - target: {fileID: 4283754972967156490, guid: 28d8b703197554a599420a748208eaeb,
1666
+        type: 3}
1667
+      propertyPath: aspectRatio
1668
+      value: 0.48828125
1669
+      objectReference: {fileID: 0}
1670
+    - target: {fileID: 4283754972967156490, guid: 28d8b703197554a599420a748208eaeb,
1671
+        type: 3}
1672
+      propertyPath: mAtlas
1673
+      value: 
1674
+      objectReference: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48,
1675
+        type: 3}
1676
+    - target: {fileID: 5008215346691190672, guid: 28d8b703197554a599420a748208eaeb,
1677
+        type: 3}
1678
+      propertyPath: m_Size.x
1679
+      value: 1125
1680
+      objectReference: {fileID: 0}
1681
+    - target: {fileID: 5694506429957531626, guid: 28d8b703197554a599420a748208eaeb,
1682
+        type: 3}
1683
+      propertyPath: mWidth
1684
+      value: 1125
1685
+      objectReference: {fileID: 0}
1686
+    - target: {fileID: 5694506429957531626, guid: 28d8b703197554a599420a748208eaeb,
1687
+        type: 3}
1688
+      propertyPath: aspectRatio
1689
+      value: 4.2613635
1690
+      objectReference: {fileID: 0}
1691
+    - target: {fileID: 5694506429957531626, guid: 28d8b703197554a599420a748208eaeb,
1692
+        type: 3}
1693
+      propertyPath: mAtlas
1694
+      value: 
1695
+      objectReference: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48,
1696
+        type: 3}
1697
+    - target: {fileID: 7452284809321955944, guid: 28d8b703197554a599420a748208eaeb,
1698
+        type: 3}
1699
+      propertyPath: mFont
1700
+      value: 
1701
+      objectReference: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138,
1702
+        type: 3}
1703
+    - target: {fileID: 9189261077974966594, guid: 28d8b703197554a599420a748208eaeb,
1704
+        type: 3}
1705
+      propertyPath: m_LocalPosition.x
1706
+      value: -1
1707
+      objectReference: {fileID: 0}
1708
+    - target: {fileID: 9189261077974966594, guid: 28d8b703197554a599420a748208eaeb,
1709
+        type: 3}
1710
+      propertyPath: m_LocalPosition.y
1711
+      value: 0
1712
+      objectReference: {fileID: 0}
1713
+    - target: {fileID: 9189261077974966594, guid: 28d8b703197554a599420a748208eaeb,
1714
+        type: 3}
1715
+      propertyPath: m_LocalPosition.z
1716
+      value: 0
1717
+      objectReference: {fileID: 0}
1718
+    - target: {fileID: 9189261077974966594, guid: 28d8b703197554a599420a748208eaeb,
1719
+        type: 3}
1720
+      propertyPath: m_LocalRotation.x
1721
+      value: 0
1722
+      objectReference: {fileID: 0}
1723
+    - target: {fileID: 9189261077974966594, guid: 28d8b703197554a599420a748208eaeb,
1724
+        type: 3}
1725
+      propertyPath: m_LocalRotation.y
1726
+      value: 0
1727
+      objectReference: {fileID: 0}
1728
+    - target: {fileID: 9189261077974966594, guid: 28d8b703197554a599420a748208eaeb,
1729
+        type: 3}
1730
+      propertyPath: m_LocalRotation.z
1731
+      value: 0
1732
+      objectReference: {fileID: 0}
1733
+    - target: {fileID: 9189261077974966594, guid: 28d8b703197554a599420a748208eaeb,
1734
+        type: 3}
1735
+      propertyPath: m_LocalRotation.w
1736
+      value: 1
1737
+      objectReference: {fileID: 0}
1738
+    - target: {fileID: 9189261077974966594, guid: 28d8b703197554a599420a748208eaeb,
1739
+        type: 3}
1740
+      propertyPath: m_RootOrder
1741
+      value: 3
1742
+      objectReference: {fileID: 0}
1743
+    - target: {fileID: 9189261077974966594, guid: 28d8b703197554a599420a748208eaeb,
1744
+        type: 3}
1745
+      propertyPath: m_LocalEulerAnglesHint.x
1746
+      value: 0
1747
+      objectReference: {fileID: 0}
1748
+    - target: {fileID: 9189261077974966594, guid: 28d8b703197554a599420a748208eaeb,
1749
+        type: 3}
1750
+      propertyPath: m_LocalEulerAnglesHint.y
1751
+      value: 0
1752
+      objectReference: {fileID: 0}
1753
+    - target: {fileID: 9189261077974966594, guid: 28d8b703197554a599420a748208eaeb,
1754
+        type: 3}
1755
+      propertyPath: m_LocalEulerAnglesHint.z
1756
+      value: 0
1757
+      objectReference: {fileID: 0}
1758
+    m_RemovedComponents: []
1759
+  m_SourcePrefab: {fileID: 100100000, guid: 28d8b703197554a599420a748208eaeb, type: 3}
1760
+--- !u!4 &715763578686176692 stripped
1761
+Transform:
1762
+  m_CorrespondingSourceObject: {fileID: 9189261077974966594, guid: 28d8b703197554a599420a748208eaeb,
1763
+    type: 3}
1764
+  m_PrefabInstance: {fileID: 8532130438695951606}
1765
+  m_PrefabAsset: {fileID: 0}

BIN
Assets/trCRM/upgradeRes4Publish/priority/ui/other/IOS/Frame1.unity3d View File


BIN
Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelSysMsgList.unity3d View File


+ 1
- 1
Assets/trCRM/upgradeRes4Ver/trCRM/resVer/IOS/VerCtl.ver View File

@@ -1 +1 @@
1
-r8	$trCRM/resVer/IOS/VerCtl/priority.ver8,7e334608c249d5580f7a39489d3821ce8	!trCRM/resVer/IOS/VerCtl/other.ver8,bfef43eb4efe0ec902574a9109157ff9
1
+r8	$trCRM/resVer/IOS/VerCtl/priority.ver8,2002d07f128a626024d0b09968f634e88	!trCRM/resVer/IOS/VerCtl/other.ver8,bfef43eb4efe0ec902574a9109157ff9

BIN
Assets/trCRM/upgradeRes4Ver/trCRM/resVer/IOS/VerCtl/priority.ver View File


Loading…
Cancel
Save