This commit is contained in:
2020-08-05 07:50:01 +08:00
parent 39cc943b6e
commit 38a377534b
11 changed files with 896 additions and 763 deletions

File diff suppressed because it is too large Load Diff

View File

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

File diff suppressed because one or more lines are too long

View File

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

View File

@@ -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}}} {"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}}}

View File

@@ -618,11 +618,11 @@ MonoBehaviour:
mPivot: 4 mPivot: 4
mWidth: 1126 mWidth: 1126
mHeight: 2173 mHeight: 2173
mDepth: -1 mDepth: -3
autoResizeBoxCollider: 0 autoResizeBoxCollider: 0
hideIfOffScreen: 0 hideIfOffScreen: 0
keepAspectRatio: 0 keepAspectRatio: 0
aspectRatio: 0.491274 aspectRatio: 0.5181776
mType: 1 mType: 1
mFillDirection: 4 mFillDirection: 4
mFillAmount: 1 mFillAmount: 1
@@ -835,7 +835,7 @@ MonoBehaviour:
anchorOffset: 0 anchorOffset: 0
softBorderPadding: 1 softBorderPadding: 1
renderQueue: 0 renderQueue: 0
startingRenderQueue: 3001 startingRenderQueue: 3003
mClipTexture: {fileID: 0} mClipTexture: {fileID: 0}
mAlpha: 1 mAlpha: 1
mClipping: 3 mClipping: 3
@@ -1154,6 +1154,7 @@ Transform:
- {fileID: 2492881819208053989} - {fileID: 2492881819208053989}
- {fileID: 9125076384738364936} - {fileID: 9125076384738364936}
- {fileID: 1153702329487857720} - {fileID: 1153702329487857720}
- {fileID: 715763578686176692}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1628,3 +1629,137 @@ MonoBehaviour:
isAppendEndingString: 1 isAppendEndingString: 1
AppendString: '...' AppendString: '...'
fontName: EmptyFont fontName: EmptyFont
--- !u!1001 &8532130438695951606
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 981640191715017145}
m_Modifications:
- target: {fileID: 1334497085766210663, guid: 28d8b703197554a599420a748208eaeb,
type: 3}
propertyPath: mAtlas
value:
objectReference: {fileID: 8379920634462272047, guid: 9aea3d2b5a77f4e84bd921688ff9ca99,
type: 3}
- target: {fileID: 1675113163761975778, guid: 28d8b703197554a599420a748208eaeb,
type: 3}
propertyPath: m_Size.x
value: 1125
objectReference: {fileID: 0}
- target: {fileID: 2932258586022639957, guid: 28d8b703197554a599420a748208eaeb,
type: 3}
propertyPath: m_Name
value: Frame1
objectReference: {fileID: 0}
- target: {fileID: 2932258586022639957, guid: 28d8b703197554a599420a748208eaeb,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4283754972967156490, guid: 28d8b703197554a599420a748208eaeb,
type: 3}
propertyPath: mWidth
value: 1125
objectReference: {fileID: 0}
- target: {fileID: 4283754972967156490, guid: 28d8b703197554a599420a748208eaeb,
type: 3}
propertyPath: aspectRatio
value: 0.48828125
objectReference: {fileID: 0}
- target: {fileID: 4283754972967156490, guid: 28d8b703197554a599420a748208eaeb,
type: 3}
propertyPath: mAtlas
value:
objectReference: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48,
type: 3}
- target: {fileID: 5008215346691190672, guid: 28d8b703197554a599420a748208eaeb,
type: 3}
propertyPath: m_Size.x
value: 1125
objectReference: {fileID: 0}
- target: {fileID: 5694506429957531626, guid: 28d8b703197554a599420a748208eaeb,
type: 3}
propertyPath: mWidth
value: 1125
objectReference: {fileID: 0}
- target: {fileID: 5694506429957531626, guid: 28d8b703197554a599420a748208eaeb,
type: 3}
propertyPath: aspectRatio
value: 4.2613635
objectReference: {fileID: 0}
- target: {fileID: 5694506429957531626, guid: 28d8b703197554a599420a748208eaeb,
type: 3}
propertyPath: mAtlas
value:
objectReference: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48,
type: 3}
- target: {fileID: 7452284809321955944, guid: 28d8b703197554a599420a748208eaeb,
type: 3}
propertyPath: mFont
value:
objectReference: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138,
type: 3}
- target: {fileID: 9189261077974966594, guid: 28d8b703197554a599420a748208eaeb,
type: 3}
propertyPath: m_LocalPosition.x
value: -1
objectReference: {fileID: 0}
- target: {fileID: 9189261077974966594, guid: 28d8b703197554a599420a748208eaeb,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9189261077974966594, guid: 28d8b703197554a599420a748208eaeb,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9189261077974966594, guid: 28d8b703197554a599420a748208eaeb,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9189261077974966594, guid: 28d8b703197554a599420a748208eaeb,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9189261077974966594, guid: 28d8b703197554a599420a748208eaeb,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9189261077974966594, guid: 28d8b703197554a599420a748208eaeb,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 9189261077974966594, guid: 28d8b703197554a599420a748208eaeb,
type: 3}
propertyPath: m_RootOrder
value: 3
objectReference: {fileID: 0}
- target: {fileID: 9189261077974966594, guid: 28d8b703197554a599420a748208eaeb,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9189261077974966594, guid: 28d8b703197554a599420a748208eaeb,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9189261077974966594, guid: 28d8b703197554a599420a748208eaeb,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 28d8b703197554a599420a748208eaeb, type: 3}
--- !u!4 &715763578686176692 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 9189261077974966594, guid: 28d8b703197554a599420a748208eaeb,
type: 3}
m_PrefabInstance: {fileID: 8532130438695951606}
m_PrefabAsset: {fileID: 0}

View File

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