chenbin/tianrunCRM
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

upgrade

Browse Source
This commit is contained in:
陈彬
2021-03-31 22:22:59 +08:00
parent e913caa8f8
commit bf55cc7e54
41 changed files with 2182 additions and 1013 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/3rd/AndroidOpener/Plugins/release.aar
View File

Binary file not shown.

1652
Assets/CoolapeFrameData/verControl/.resModifyDate.v
View File

File diff suppressed because it is too large Load Diff

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

Binary file not shown.

90
Assets/CoolapeFrameData/verControl/android/ver4Upgrade.v
View File

@@ -1,5 +1,7 @@
trCRM/upgradeRes/priority/lua/ui/cell/TRCellExtendField.lua,ad36b1df99250176f457b3cf9be575f5
trCRM/upgradeRes/other/uiAtlas/order/Android/system.unity3d,570fa72b2d385d604cc7c9f7516965da
trCRM/upgradeRes/priority/ui/panel/Android/PanelOrderDetail.unity3d,3caa401eb431f21b9ee4e610c93dfd33
trCRM/upgradeRes/priority/lua/ui/panel/TRPMoreProc4Cust.lua,3ed4e7289bc339620e19a8d48807d388
trCRM/upgradeRes/other/uiAtlas/public/Android/on_off.unity3d,69b1b8dfdfc0afecdd9fdd9dbd5fb98a
trCRM/upgradeRes/other/uiAtlas/icon/Android/icon_26_no.unity3d,c16242cb394b0720d1c2e1e0289c1c4a
trCRM/upgradeRes/other/uiAtlas/logo/Android/logo.unity3d,849e7b3d08491890c6e021896c8ec39c
@@ -9,7 +11,6 @@ trCRM/upgradeRes/other/uiAtlas/order/Android/icon_5.unity3d,b6c45607f279eff0f963
trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_5.unity3d,7edfb781be444c18d010e53386334015
trCRM/upgradeRes/other/uiAtlas/cust/Android/limt.unity3d,d48f498211748b192a7b10a932aec8be
trCRM/upgradeRes/priority/lua/toolkit/BitUtl.lua,82e46240625342d5afe8ea68a609c9cb
trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustList.lua,3c927618bc036253a99d5932fe22ed08
trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustFilterGroup.lua,93cdb67f51a62110b38e133b065f8f85
trCRM/upgradeRes/priority/ui/panel/Android/PanelConfirm.unity3d,a87cc779c52b9efb2268b00587a35ebd
trCRM/upgradeRes/other/uiAtlas/work/Android/img-icon.unity3d,13944f7af226165a21ba0524262b0de8
@@ -19,17 +20,19 @@ trCRM/upgradeRes/priority/atlas/Android/atlasAllReal.unity3d,39dd429081917b7cc5c
trCRM/upgradeRes/priority/ui/panel/Android/PanelSysMsgDetail.unity3d,4ebb6aa9b3c61fc11d8b07aea9e57743
trCRM/upgradeRes/priority/ui/other/Android/InputMultText.unity3d,6e48b92fb900d09a2f5111b01a15821a
trCRM/upgradeRes/priority/ui/panel/Android/PanelPopTime.unity3d,a07ebf15db9eb6f77473491afcd95a57
trCRM/upgradeRes/priority/ui/other/Android/EmptySpace.unity3d,b9f173d21c2bc1854fb84e50f11dbed8
trCRM/upgradeRes/other/uiAtlas/login/Android/log_people.unity3d,7ff36c94c74e4a8e09e1896978c13381
trCRM/upgradeRes/other/uiAtlas/order/Android/icon_3.unity3d,4107b5fcc1b5ad0d073bf480cf35383b
trCRM/upgradeRes/other/uiAtlas/main/Android/icon_tel.unity3d,586649082835fac6de0aed41a685e106
trCRM/upgradeRes/priority/ui/panel/Android/PanelOrderList.unity3d,0c0875362af4cd5a6a35cef8ac9d74e2
trCRM/upgradeRes/priority/lua/db/DBRoot.lua,97e2c26781603147d6e63b2b39f7643e
trCRM/upgradeRes/other/uiAtlas/public/Android/choose.unity3d,e31379a28ab86046414db1fb23cd2bf6
trCRM/upgradeRes/other/uiAtlas/cust/Android/position.unity3d,e60132eb1d8cfbc71046611111fd3099
trCRM/upgradeRes/other/uiAtlas/news/Android/news_3.unity3d,5f130cc66d813a2b339757e8a31cee8c
trCRM/upgradeRes/other/uiAtlas/cust/Android/bg.unity3d,37a58d5a79d3691b2c32a74422721ee7
trCRM/upgradeRes/priority/ui/panel/Android/PanelMsg.unity3d,5b0bc7852800d78eb83b002f38742783
trCRM/upgradeRes/priority/lua/ui/cell/CLToastRoot.lua,5809bbdd4b059a64e8129c55b146b514
trCRM/upgradeRes/other/uiAtlas/news/Android/new2_notice.unity3d,8ccab8900911e68fc8e0b46f6c1e0372
trCRM/upgradeRes/priority/lua/ui/panel/TRPResetPasswordStep2.lua,a4f5e647fddd396eb8781f71325d89b4
trCRM/upgradeRes/other/uiAtlas/order/Android/close.unity3d,1b49cc4db64de50d13ee029447a3d49d
trCRM/upgradeRes/other/uiAtlas/order/Android/xuanze.unity3d,2e0769c464e38c238cbf8e734f45303d
trCRM/upgradeRes/other/uiAtlas/mine/Android/img_authenticated.unity3d,a8f23a9c17d56c9441913e4977e3006b
@@ -45,17 +48,17 @@ trCRM/upgradeRes/priority/lua/toolkit/CLLVerManager.lua,39b154e796d60c2c40ebcc42
trCRM/upgradeRes/other/uiAtlas/coolape/Android/button.unity3d,efe93bdf676ef2d5195d52abe42ab833
trCRM/upgradeRes/priority/ui/other/Android/InputToggles.unity3d,847a6d2cbf79b767094155404ef708b1
trCRM/upgradeRes/priority/lua/ui/panel/CLLPPopList2.lua,fb99342ba99217d194b5bd4665a2f15a
trCRM/upgradeRes/other/uiAtlas/public/Android/radio_full.unity3d,299e73e63c854e9d88dc63f1c19a45f9
trCRM/upgradeRes/priority/lua/ui/cell/CLLCellWWWProgress.lua,ec0258e77f76c8b681d0f02e7a5ff342
trCRM/upgradeRes/priority/lua/ui/cell/TRCellProccessHis.lua,aa71710425778f3c33471a2cc00e5d7b
trCRM/upgradeRes/priority/lua/public/CLLPool.lua,3e6a97eb07cfdff7c399eb3e956ba77c
trCRM/upgradeRes/priority/ui/panel/Android/PanelProductDetail.unity3d,44dc779e7b05ed8c29719f679317e058
trCRM/upgradeRes/priority/ui/other/Android/InputTime.unity3d,0fec115941a2a08726c319b5316dd3fe
trCRM/upgradeRes/other/uiAtlas/work/Android/xiazai-icon.unity3d,8a7af096d5e511c34f6b01235b57d13e
trCRM/upgradeRes/other/uiAtlas/cust/Android/msg.unity3d,7f98a936769044c856c6082beb3559e3
trCRM/upgradeRes/other/uiAtlas/news/Android/new2_bg_20.unity3d,8e81d4a650273e24b7f129d1f814f5fa
trCRM/upgradeRes/other/uiAtlas/cust/Android/play.unity3d,ae412dff53c914bcfcd0ca92255bb33e
trCRM/upgradeRes/priority/ui/other/Android/Frame1.unity3d,b554ca58c719e83ae8d0a32d5d6f1b9b
trCRM/upgradeRes/other/uiAtlas/mine/Android/myset_check.unity3d,d9092d78af855e769abff1223f650a9d
trCRM/upgradeRes/other/uiAtlas/order/Android/ipt_bg.unity3d,89541a2aaed40069c1f0ce363c5a8e2a
trCRM/upgradeRes/priority/lua/ui/panel/TRPSetting.lua,31c864befca4b564b72543d834a329fe
trCRM/upgradeRes/other/uiAtlas/main/Android/icon_news2.unity3d,a35e85b68569bf1adc16bdee3a609fdd
trCRM/upgradeRes/priority/ui/other/Android/AlertRoot.unity3d,c30044a6e7bf14ddb7a87c4f51d1f073
@@ -72,16 +75,19 @@ trCRM/upgradeRes/other/uiAtlas/cust/Android/important.unity3d,17f0d1ab4133e3a654
trCRM/upgradeRes/priority/lua/ui/cell/TRCellReportform1.lua,3b291f38637590e0fca816cae521a4f0
trCRM/upgradeRes/other/uiAtlas/order/Android/gongsi.unity3d,204e3a238141978b021bf4ffbc73620a
trCRM/upgradeRes/priority/lua/ui/panel/TRPConfirm2.lua,bd0ea9f50708dedd598b517c1dfc739f
trCRM/upgradeRes/priority/lua/ui/panel/TRPFollowFilter.lua,f436c880f71e048db7b82de41e881b8f
trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_4.unity3d,d1cf8069716943cc112a2946b22efddd
trCRM/upgradeRes/other/uiAtlas/cust/Android/suc.unity3d,0ec570e88b0dfc2b82a4f8e5bb84edc0
trCRM/upgradeRes/other/uiAtlas/hotwheel/Android/loading.unity3d,2f74f17f1282c12ab63108377b4798e0
trCRM/upgradeRes/priority/lua/ui/panel/TRPSelectServer.lua,50a46489d0d704df26d61ae9a2f5d5fe
trCRM/upgradeRes/priority/ui/panel/Android/PanelLogin.unity3d,5cac11a5557933d49c37a554c76a730f
trCRM/upgradeRes/other/uiAtlas/cust/Android/cus_followup.unity3d,a722ae8374cf3aa0fd87fc6d74ddabfd
trCRM/upgradeRes/priority/lua/ui/panel/TRPNewCust.lua,d235e6198245d1c693b5437d86b68f75
trCRM/upgradeRes/other/uiAtlas/login/Android/log_invisible.unity3d,e1a5814af01e17e83e9939c9f1839524
trCRM/upgradeRes/priority/ui/panel/Android/PanelEditPrice.unity3d,5c87cd598efd9c145911e50a14fc193e
trCRM/upgradeRes/other/uiAtlas/login/Android/log_sms.unity3d,8677ba455b4c85e5f1230986ff1032cf
trCRM/upgradeRes/priority/lua/ui/panel/TRPConnect.lua,7b8af1171623fd14f26c2bf974b42ab8
trCRM/upgradeRes/priority/lua/ui/panel/CLLPStart.lua,53603d0905af2504030aaaa54cd0f313
trCRM/upgradeRes/priority/lua/ui/panel/TRPConnect.lua,21cb1977b7fe7cdedd9069d021cfd3e6
trCRM/upgradeRes/priority/lua/ui/panel/CLLPStart.lua,9b5df40e237fec33868826e1f12e2772
trCRM/upgradeRes/other/uiAtlas/call/Android/icon_dial.unity3d,6d400188377a2dd6f04dd1737719cb1c
trCRM/upgradeRes/other/uiAtlas/work/Android/work_bg_noshadow.unity3d,4aee082b48104519ba82bad6aac83cf3
trCRM/upgradeRes/other/uiAtlas/icon/Android/company_1.unity3d,8ba9f20b736fb17e2f6ee414df072492
@@ -90,7 +96,7 @@ trCRM/upgradeRes/other/uiAtlas/work/Android/wenjian-icon.unity3d,780e57115babb2c
trCRM/upgradeRes/other/uiAtlas/work/Android/work_ranking.unity3d,9a0b0f94d60e9ff144193c83915b21fa
trCRM/upgradeRes/other/uiAtlas/order/Android/xuanze_bg.unity3d,5f13e0f57914e2a06fd8f53e20d1106f
trCRM/upgradeRes/other/uiAtlas/mine/Android/myset_password.unity3d,04bebaa914245dd4d2376f9ded0ad15f
trCRM/upgradeRes/other/uiAtlas/login/Android/log_visible.unity3d,884f69f0dd0c2a58af5ad891f23e985e
trCRM/upgradeRes/other/uiAtlas/main/Android/icon_work2.unity3d,eca0bd19a59ce72be19d7cdcbf9c5dac
trCRM/upgradeRes/priority/ui/other/Android/reportform2.unity3d,de5097255fc8126d368e9693106347dc
trCRM/upgradeRes/priority/lua/ui/panel/CLLPSceneManager.lua,b1b848791df37e59bdf7d5acf9cb9273
trCRM/upgradeRes/other/uiAtlas/cust/Android/full_star.unity3d,6f6aa242a0a793b6eea6edc8c8de437d
@@ -116,7 +122,6 @@ trCRM/upgradeRes/priority/lua/ui/panel/TRPResetPasswordStep1.lua,d3819b5019a9b8b
trCRM/upgradeRes/other/uiAtlas/cust/Android/kuang.unity3d,a6ce8e74b0631e79ce2e03f2fed3baea
trCRM/upgradeRes/priority/ui/panel/Android/PanelCustDetailSimple.unity3d,2d5672aefad3bded93f2d268fea9cfa8
trCRM/upgradeRes/other/uiAtlas/logo/Android/logo2.unity3d,1bddae3d3fe67d91fc6b5c6f9dbb0bea
trCRM/upgradeRes/priority/lua/ui/cell/CLLUICellPoplist.lua,18d47301d459fd66ed63b902546e8619
trCRM/upgradeRes/other/uiAtlas/mine/Android/sms.unity3d,9d63dc8f82de2f772e544b8c8518021b
trCRM/upgradeRes/other/uiAtlas/main/Android/icon_me.unity3d,b6060c4f6b1cf669b21b5d4f8b23efbe
trCRM/upgradeRes/priority/ui/panel/Android/PanelPlaySoundRecord.unity3d,1c45c795755a9f792896aa905f78af85
@@ -135,13 +140,13 @@ trCRM/upgradeRes/other/uiAtlas/main/Android/icon_me2.unity3d,6efa661cb74e62dfdc7
trCRM/upgradeRes/priority/ui/panel/Android/PanelStart.unity3d,50cfab21f360ee339c94b1111be09fef
trCRM/upgradeRes/other/uiAtlas/cust/Android/write.unity3d,cbf2cca163ccc6839cf9154547edd6f8
trCRM/upgradeRes/other/uiAtlas/cust/Android/star.unity3d,f9684ea4b4e3a4206fc898bc6e4651ab
trCRM/upgradeRes/other/uiAtlas/mine/Android/myset_data.unity3d,70dd24370cd051acb45bab65464459ee
trCRM/upgradeRes/priority/lua/toolkit/curve-families.png,d0b6b9b8a623a188aeae2fb688a8a0e5
trCRM/upgradeRes/other/uiAtlas/order/Android/gou.unity3d,003393d384b7c8d6d0221b2e160bbb3e
trCRM/upgradeRes/priority/ui/panel/Android/PanelWWWProgress.unity3d,d9cbe9d08670eedbee77ba97330f4118
trCRM/upgradeRes/priority/lua/ui/cell/TRCellComFilterGroup.lua,8c33f89953c402f43b47022a71064cde
trCRM/upgradeRes/other/uiAtlas/order/Android/ipt.unity3d,68e98b41456c62324871a1c86caefafc
trCRM/upgradeRes/other/uiAtlas/order/Android/icon_4.unity3d,cb33f3103d8fb3c77e2f1683b1c89a3d
trCRM/upgradeRes/other/uiAtlas/mine/Android/img_unauthorized.unity3d,2364907c4a676d92020083979d028c2e
trCRM/upgradeRes/priority/ui/panel/Android/PanelPopList.unity3d,1683cd2993884b1b11244d1f5ee700f4
trCRM/upgradeRes/priority/lua/ui/panel/CSPMain.lua,0fec8598fddcc7b54f4794f16eaa59d8
trCRM/upgradeRes/priority/ui/panel/Android/PanelConnect.unity3d,f80a29df002dc606e21fd69fbea40021
@@ -150,18 +155,18 @@ trCRM/upgradeRes/other/uiAtlas/news/Android/news_bg.unity3d,b13e253b3a1689bf665e
trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustFilter.lua,2fb22f9248e4af86ab42482151a5b141
trCRM/upgradeRes/other/uiAtlas/coolape/Android/input.unity3d,b3ad3f57c51c02ff798a50a37d6c9cab
trCRM/upgradeRes/priority/ui/panel/Android/PanelMakeCall.unity3d,a54467df24ee0ddec4db2840b8c3248e
trCRM/upgradeRes/priority/ui/panel/Android/PanelNewOrder.unity3d,9a6d3e61d449a2c1e42dfb76aab1c295
trCRM/upgradeRes/priority/ui/panel/Android/PanelNewOrder.unity3d,4ce7c1fc57b76bd41ebc0a51e78819c5
trCRM/upgradeRes/priority/lua/ui/panel/CSPMine.lua,0be1d92322048e7747b85f824bda77ec
trCRM/upgradeRes/priority/lua/ui/cell/TRCellFollowList.lua,e5cc27c8def2b9a255e47f3b707d8426
trCRM/upgradeRes/other/uiAtlas/cust/Android/follow.unity3d,fffb80792073e4f2849c743d061d685a
trCRM/upgradeRes/priority/ui/panel/Android/PanelResetPasswordStep2.unity3d,f5affe00dd461e9a299bd64ce3fc80bb
trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_2.unity3d,3bcd13c7b2003a1bcf92aaa4d2dbf6fe
trCRM/upgradeRes/priority/lua/ui/panel/TRPNewFollowSimple.lua,c548932040c1620ede94e71a2bb0c8cc
trCRM/upgradeRes/priority/lua/ui/panel/CLLPCalender.lua,06ea21012958c4b42ca8122d1515ed1f
trCRM/upgradeRes/priority/lua/public/CLLQueue.lua,065303c980678b25b11854bfec1690f3
trCRM/upgradeRes/priority/ui/other/Android/Frame2.unity3d,d057ea60bdf5dd821705a9f7e67e5171
trCRM/upgradeRes/other/uiAtlas/hotwheel/Android/hotWheel_bg.unity3d,b5d2bc7180f9d280014726814ec8b9fe
trCRM/upgradeRes/priority/lua/ui/cell/TRCellMessageGroup.lua,14a960604f49e2b34e0c115561bb45a3
trCRM/upgradeRes/other/uiAtlas/call/Android/comingcall.unity3d,aa389eaf18e63450159f362bca58e8fc
trCRM/upgradeRes/priority/lua/ui/cell/TRCellMessageGroup.lua,6f98095a60bb1dc4f35037e6099493b1
trCRM/upgradeRes/priority/ui/panel/Android/PanelFollowList.unity3d,3aff465c0ca7aa53abcaa912a5961060
trCRM/upgradeRes/other/uiAtlas/mine/Android/me_set.unity3d,c53cddeef8f62d67a2a4110447466536
trCRM/upgradeRes/priority/ui/panel/Android/PanelPopCheckBoxs.unity3d,d3a8693784b6cc7ff00ee50fc8625f69
@@ -169,12 +174,12 @@ trCRM/upgradeRes/priority/lua/ui/cell/TRCellOrderList.lua,d4a79966004672384a6647
trCRM/upgradeRes/other/uiAtlas/work/Android/work_bg_shadow.unity3d,10087f2ab389bdfd71cfce8a6c466038
trCRM/upgradeRes/priority/lua/city/CLLCity.lua,b7ee9fffacb28d09ab08728a49dedc8e
trCRM/upgradeRes/priority/lua/ui/panel/TRPComFilter.lua,522e60b5e11321ef12cb2466b5b249d2
trCRM/upgradeRes/priority/lua/ui/panel/TRPOrderList.lua,dad09d99c3d896f7c1ce1c1c854073ea
trCRM/upgradeRes/priority/lua/ui/panel/TRPFollowList.lua,5e57ae6031f9bd40070355f5a203315b
trCRM/upgradeRes/priority/lua/public/CLLStack.lua,579069654d88a15e43c818a6b8079b15
trCRM/upgradeRes/priority/lua/db/DBOrder.lua,7f2087299796c187eb9866c14f4afcf8
trCRM/upgradeRes/priority/lua/ui/panel/CSPMsg.lua,54cb072f797503f7840dbf735852894f
trCRM/upgradeRes/priority/lua/ui/panel/CSPMsg.lua,fae45952e1aa9de137196c40dab2e7b6
trCRM/upgradeRes/priority/lua/ui/panel/TRPCallLogDetail.lua,69ace8f049a97890a1138c1d1d2f51b6
trCRM/upgradeRes/other/uiAtlas/news/Android/news_bg_num1.unity3d,2ed88c277f983b8d1a3dedf73d735239
trCRM/upgradeRes/other/uiAtlas/work/Android/work_head_bg.unity3d,20f535a454df3fff37230bbcc3bc8244
trCRM/upgradeRes/priority/lua/ui/panel/TRPLogin.lua,3cc9a59870684a589fbdb2567cff402d
trCRM/upgradeRes/other/uiAtlas/cust/Android/icon-right2.unity3d,fd76710e32054c40714241fbc6266af3
@@ -183,11 +188,11 @@ trCRM/upgradeRes/priority/lua/ui/cell/CLLUICellPoplist2.lua,b2c461c179b6029994a9
trCRM/upgradeRes/other/uiAtlas/order/Android/icon_2.unity3d,21a6309f8a86dcd7c2f90ece3e525f74
trCRM/upgradeRes/priority/ui/other/Android/InputCheckboxs.unity3d,0cb329c53fbe9ba9c344874774a9c6fd
trCRM/upgradeRes/priority/lua/ui/cell/TRCellGuidPage.lua,7b3c3f567c3e0d92065913101b08ddd0
trCRM/upgradeRes/priority/lua/ui/panel/TRPAbout.lua,1045994ded084ebe67d8083f3ee92ffd
trCRM/upgradeRes/priority/lua/ui/panel/TRPNewOrder.lua,377b7e10166dfb91862f695664c56c4b
trCRM/upgradeRes/priority/lua/ui/panel/CLLPLoginCoolape.lua,5873be60edc8f1407dc9fb53ec567ebf
trCRM/upgradeRes/priority/lua/ui/panel/TRPMyInfor.lua,0bf5726a37d6aaccc3b8f78245aaeac4
trCRM/upgradeRes/priority/lua/bio/BioOutputStream.lua,84fd65eb0d1a166e77447f61254d62b5
trCRM/upgradeRes/priority/lua/db/DBMessage.lua,77841c7eda6d675c5b3f8f8cec7c65ba
trCRM/upgradeRes/priority/lua/db/DBMessage.lua,600a647f8049db82cb19b2c13fea0df9
trCRM/upgradeRes/priority/lua/db/DBStatistics.lua,1f1fe6971f4702b5879e30715fb349e6
trCRM/upgradeRes/priority/lua/ui/panel/TRPCusFilter.lua,f0452e3d6cfa59244dc7b9dd8f5a475d
trCRM/upgradeRes/other/uiAtlas/public/Android/company_bg.unity3d,2153c725242937cf5fce727da9626dad
@@ -195,6 +200,7 @@ trCRM/upgradeRes/priority/lua/public/CLLPrefs.lua,1719d57c97fe0d8f2c9d1596cb6e2a
trCRM/upgradeRes/priority/ui/panel/Android/PanelModifyFiled.unity3d,bba5eea285cdb4d112f91b8c72524093
trCRM/upgradeRes/priority/ui/panel/Android/PanelMyInfor.unity3d,1d9ac53cf8d40f331c9be9a8223a47ce
trCRM/upgradeRes/priority/lua/ui/panel/TRPProductList.lua,58bf1853609c6bd92a81fac50f5e1efc
trCRM/upgradeRes/other/uiAtlas/call/Android/拨号_05.unity3d,5522296c264de7466efb294714946c16
trCRM/upgradeRes/priority/ui/panel/Android/PanelSetting.unity3d,8a6fc79368436f701198d4ffc027cfea
trCRM/upgradeRes/priority/ui/panel/Android/PanelConfirm2.unity3d,d199779b559cef259ebbfe686ba42703
trCRM/upgradeRes/other/uiAtlas/news/Android/new2_peo.unity3d,9c9562e576e93bacb7f2a0d0f08523ee
@@ -202,7 +208,6 @@ trCRM/upgradeRes/priority/lua/bio/BioUtl.lua,f64afdd9ccdf943f5d4ba2fc3c3241ef
trCRM/upgradeRes/other/uiAtlas/order/Android/icon_6.unity3d,8b322b9a8ef8b6d91d677c61eb98ab30
trCRM/upgradeRes/priority/ui/panel/Android/PanelPopList2.unity3d,97cc645e2a1f06137579e1b0312cda11
trCRM/upgradeRes/priority/ui/panel/Android/PanelMask4Panel.unity3d,ed5e0d7cc2ba83e33435bddc760b5f9d
trCRM/upgradeRes/other/uiAtlas/main/Android/icon_work2.unity3d,eca0bd19a59ce72be19d7cdcbf9c5dac
trCRM/upgradeRes/priority/ui/panel/Android/PanelBatchGetCusts.unity3d,0b16be6a28646d9dc972fab628556b57
trCRM/upgradeRes/priority/lua/ui/cell/TRCellExtendFieldRoot.lua,a86cba948b19853abefb86c46bfa7256
trCRM/upgradeRes/priority/ui/panel/Android/PanelCustList.unity3d,c1ee4768e591cf8a7d09574b6c1abf30
@@ -225,12 +230,9 @@ trCRM/upgradeRes/other/uiAtlas/order/Android/upload.unity3d,a7cb722ecba5f405105f
trCRM/upgradeRes/other/uiAtlas/cust/Android/screen.unity3d,b488e337b72f2cd07dadd1e08640243d
trCRM/upgradeRes/other/uiAtlas/mine/Android/me_about.unity3d,3da9c9416127c69bc20c281f44520f6e
trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustStar.lua,ed39330cf68d1e1e062bc8311d1e8d44
trCRM/upgradeRes/priority/lua/ui/cell/TRCellOceanList.lua,911d6edb241c34ee721815622ea707c3
trCRM/upgradeRes/other/uiAtlas/logo/Android/512.unity3d,c51445206c8f94af0fcbbe4befa8ae05
trCRM/upgradeRes/priority/lua/json/rpcserver.lua,48b8f5e53a1141652c38f8a5a8a77928
trCRM/upgradeRes/priority/lua/ui/panel/CLLPSplash.lua,52715f02cef3fe91925d033d1e6dfcdd
trCRM/upgradeRes/other/uiAtlas/main/Android/icon_tel2.unity3d,611e95b0cefc867205c6b9649291ae6c
trCRM/upgradeRes/other/uiAtlas/news/Android/new2_wait.unity3d,4171ead446231d4429305811f6e91fbc
trCRM/upgradeRes/priority/www/baidumap.html,d210e48796dd96343f9c17bc1d230136
trCRM/upgradeRes/priority/lua/ui/panel/CLLPHotWheel.lua,1760aa9933da4b421f1c6093d802cb4f
trCRM/upgradeRes/other/uiAtlas/cust/Android/record.unity3d,afd45ba065ba86f138b8c92b9794c722
@@ -248,13 +250,12 @@ trCRM/upgradeRes/priority/lua/toolkit/MyUtl.lua,456a710e2c874437038aa83ec308057f
trCRM/upgradeRes/other/uiAtlas/cust/Android/right.unity3d,b991891eb2939a880c223d677605faf4
trCRM/upgradeRes/other/uiAtlas/public/Android/button.unity3d,ff51e79201ecbd61247f8db792009aff
trCRM/upgradeRes/other/uiAtlas/call/Android/call_03.unity3d,96fd044db59b5e361a3e88132956b312
trCRM/upgradeRes/priority/lua/ui/panel/CLLPSendSms.lua,21ca579fc9f873db363be7a45cfc115f
trCRM/upgradeRes/priority/lua/ui/cell/TRCellEmptySpace.lua,a009d0f2c20eb5239f430d2b30ecef40
trCRM/upgradeRes/priority/lua/ui/cell/TRCellReportform3.lua,8f055265d33f40a2278e159a8ebf2b56
trCRM/upgradeRes/priority/lua/ui/cell/TRCellReportform3.lua,23b6659f9239c4c4565cce015fc9ce13
trCRM/upgradeRes/priority/ui/panel/Android/PanelTaskList.unity3d,f2733549013073ee749f42f274b342de
trCRM/upgradeRes/other/uiAtlas/mine/Android/myset_remind.unity3d,99a50a17b34f464693ac84d1c6f38966
trCRM/upgradeRes/priority/lua/ui/panel/TRPNewFollow.lua,430a3b167553c0fb2cb3f34c62065040
trCRM/upgradeRes/priority/lua/ui/panel/TRPSysMsgList.lua,121d472a9c63850e668a9eebbc6fc413
trCRM/upgradeRes/priority/lua/ui/panel/TRPSysMsgList.lua,d93794a14279492785d6b0e1e1184d0c
trCRM/upgradeRes/other/uiAtlas/mine/Android/phone.unity3d,8a7c9fe465edfd39de5ac774c6795b19
trCRM/upgradeRes/priority/ui/panel/Android/PanelSendSms.unity3d,339c862d9669bdd70e9e04c6a610cb9a
trCRM/upgradeRes/priority/ui/panel/Android/PanelBindPhone.unity3d,a63b7e106584f699fad374ec6043d0aa
@@ -267,9 +268,9 @@ trCRM/upgradeRes/priority/lua/ui/cell/CSCellBottomBtn.lua,f6b401c59ed10b8b0d2d72
trCRM/upgradeRes/other/uiAtlas/coolape/Android/user.unity3d,dc5411391ea0beae4ecc9a4541f1cb21
trCRM/upgradeRes/priority/lua/ui/panel/TRPResetPasswordStep3.lua,0d3be662e0a236b709d8f1f9d6b3321e
trCRM/upgradeRes/other/uiAtlas/order/Android/sort.unity3d,76c7bda76e065beeb8fd930e8f7d2fc8
trCRM/upgradeRes/other/uiAtlas/call/Android/comingcall.unity3d,aa389eaf18e63450159f362bca58e8fc
trCRM/upgradeRes/other/uiAtlas/login/Android/log_visible.unity3d,884f69f0dd0c2a58af5ad891f23e985e
trCRM/upgradeRes/priority/lua/ui/panel/CSPTasks.lua,a6dc405916d51c97422bf1862f3a8f5b
trCRM/upgradeRes/priority/lua/ui/panel/TRPResetPasswordStep2.lua,a4f5e647fddd396eb8781f71325d89b4
trCRM/upgradeRes/priority/lua/ui/cell/CLLUICellPoplist.lua,18d47301d459fd66ed63b902546e8619
trCRM/upgradeRes/priority/lua/ui/panel/TRPNewFollowTask.lua,4d6d237f3fc86b4fcf87eece0236c212
trCRM/upgradeRes/priority/ui/panel/Android/PanelSceneManager.unity3d,c83769673e1c0793d88547c05d20a82e
trCRM/upgradeRes/other/uiAtlas/cust/Android/funnel.unity3d,cb6f2a2b14c53ed86c122a4da2c3984b
@@ -280,7 +281,7 @@ trCRM/upgradeRes/other/uiAtlas/mine/Android/me_opinion.unity3d,1935579d226c74003
trCRM/upgradeRes/priority/lua/CLLMainLua.lua,f39b8b592de145c5f8331b30d0ba4d9d
trCRM/upgradeRes/other/uiAtlas/login/Android/log_no.unity3d,2ee604556b4fff6186f2bad067ed8695
trCRM/upgradeRes/priority/lua/ui/panel/TRPCustFilter.lua,450e7e75ebfe83bb65d59beb3ce60782
trCRM/upgradeRes/priority/lua/public/CLLInclude.lua,2afb78b285a8cf6bbbef9f4612effc3d
trCRM/upgradeRes/priority/lua/public/CLLInclude.lua,d84df4859500a5745e7bdb118e5e2443
trCRM/upgradeRes/priority/lua/toolkit/KKLogListener.lua,85784ec79aefde29be3ef308e7b5203b
trCRM/upgradeRes/priority/ui/panel/Android/PanelSplash.unity3d,2691ddc66dff5da22fda3ffe11c897dd
trCRM/upgradeRes/priority/lua/ui/cell/CLLFrame2.lua,e25ce84ca55cd643d527d09cedd6228a
@@ -297,7 +298,7 @@ trCRM/upgradeRes/other/uiAtlas/public/Android/radio.unity3d,4f2c80de666b97ea0208
trCRM/upgradeRes/other/uiAtlas/public/Android/button2.unity3d,1a48080b1d43367921fc09b430fffaf5
trCRM/upgradeRes/other/uiAtlas/cust/Android/play2.unity3d,0b6ede536ea7b5084a1de22265b04840
trCRM/upgradeRes/other/uiAtlas/cust/Android/check.unity3d,aa21836aaae62d8f719a930aefe37ea7
trCRM/upgradeRes/priority/lua/ui/cell/TRCellSysMessageList.lua,1ce46f4b3a1a8b728e447c12e7df1831
trCRM/upgradeRes/priority/lua/ui/cell/TRCellSysMessageList.lua,5386782677bbd283a1008547c4629262
trCRM/upgradeRes/priority/lua/json/rpc.lua,28c2f09ceb729d01052d8408eed0b57a
trCRM/upgradeRes/priority/lua/net/CLLNetSerialize.lua,30c24f11d46d7b887bf32177acb92c81
trCRM/upgradeRes/other/uiAtlas/call/Android/icon_del.unity3d,9439afa65f7071d5bdd7569713570266
@@ -305,12 +306,12 @@ trCRM/upgradeRes/priority/lua/ui/panel/CLLPPopList.lua,17086f0c2296f83f5f407385f
trCRM/upgradeRes/priority/lua/ui/cell/TRCellReportform2.lua,e62a82bcc9fb817a4460e82b6351e18f
trCRM/upgradeRes/priority/ui/panel/Android/PanelTasks.unity3d,1ccaafb32c2b12b3cf5070636dc25009
trCRM/upgradeRes/other/uiAtlas/mine/Android/me_customer.unity3d,5676922ef1749c311285d1a207b8397b
trCRM/upgradeRes/priority/lua/net/NetProto.lua,2b7015f3ccf492969141082fae8d7a15
trCRM/upgradeRes/priority/lua/net/NetProto.lua,9c7edc982eae5989575747d2b8cad7ab
trCRM/upgradeRes/other/uiAtlas/public/Android/tips_3.unity3d,2834e3cc399b70e7621065ad4ddaedf6
trCRM/upgradeRes/priority/localization/Chinese.txt,08ac586b625d0a126a610344a1846e8f
trCRM/upgradeRes/priority/ui/panel/Android/ToastRoot.unity3d,412c3557a187689acaa1d79d7d555836
trCRM/upgradeRes/priority/lua/ui/cell/CLCellToast.lua,6e350721fca8167bd621df86ad982326
trCRM/upgradeRes/other/uiAtlas/mine/Android/myset_data.unity3d,70dd24370cd051acb45bab65464459ee
trCRM/upgradeRes/other/uiAtlas/mine/Android/img_unauthorized.unity3d,2364907c4a676d92020083979d028c2e
trCRM/upgradeRes/priority/ui/panel/Android/PanelNewFollowTask.unity3d,1ed97ae79f7838f8d57f7f05863217cc
trCRM/upgradeRes/priority/lua/toolkit/CLLUpdateUpgrader.lua,bfff3548aa7cd983c3de46e5defae423
trCRM/upgradeRes/other/uiAtlas/news/Android/news_1.unity3d,51120d82352e936df826b05696b89b19
@@ -323,10 +324,9 @@ trCRM/upgradeRes/priority/ui/panel/Android/PanelUserList.unity3d,f0dcb72e82e7dbf
trCRM/upgradeRes/priority/ui/panel/Android/PanelMine.unity3d,39ea724db1c02f72c3a4eba281d6e7bf
trCRM/upgradeRes/priority/lua/cfg/DBCfg.lua,3d0e60dbcdaa61b8553eee17f4d68b32
trCRM/upgradeRes/other/txt/Android/serviceProto.unity3d,f6aeade57bb43fc306fd9371e618297b
trCRM/upgradeRes/priority/lua/ui/panel/TRPNewOrder.lua,377b7e10166dfb91862f695664c56c4b
trCRM/upgradeRes/other/uiAtlas/order/Android/system.unity3d,570fa72b2d385d604cc7c9f7516965da
trCRM/upgradeRes/other/uiAtlas/order/Android/ipt_bg.unity3d,89541a2aaed40069c1f0ce363c5a8e2a
trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_2.unity3d,3bcd13c7b2003a1bcf92aaa4d2dbf6fe
trCRM/upgradeRes/other/uiAtlas/login/Android/log_password.unity3d,6a41f099b79cda5941cf720c1452b5a5
trCRM/upgradeRes/priority/lua/ui/cell/TRCellCompany.lua,2cacaeb6845d8d0a0b16d726048a0216
trCRM/upgradeRes/priority/ui/panel/Android/PanelNewFollow.unity3d,e8e8c2a2a8f7c91ded00896bf6ce2bfb
trCRM/upgradeRes/other/uiAtlas/cust/Android/pause.unity3d,f67cbbc84b61bc281f486e4e18fb177f
trCRM/upgradeRes/priority/lua/ui/panel/CLLPWWWProgress.lua,b713ddf9f0af8602ec48f71162181d6d
@@ -336,7 +336,7 @@ trCRM/upgradeRes/priority/lua/ui/panel/TRPMakeCall.lua,f8fd8e2319261f0952a9438a8
trCRM/upgradeRes/priority/lua/ui/panel/TRPModifyFiled.lua,99b250c386ce8dad9c10c8f4fe9874f1
trCRM/upgradeRes/priority/lua/ui/panel/TRPOrderDetail.lua,c2184a02caa0ca6c8bbf93301c204b26
trCRM/upgradeRes/priority/ui/other/Android/InputText.unity3d,b3278d2927045b007b629d8184db59f9
trCRM/upgradeRes/other/uiAtlas/news/Android/news_3.unity3d,5f130cc66d813a2b339757e8a31cee8c
trCRM/upgradeRes/other/uiAtlas/news/Android/new2_wait.unity3d,4171ead446231d4429305811f6e91fbc
trCRM/upgradeRes/priority/ui/panel/Android/PanelNewCust.unity3d,3847bb19ae8c2c8ead7aea9e881773a5
trCRM/upgradeRes/priority/ui/panel/Android/PanelServers.unity3d,1613390ef03ce766ec3680f99949122b
trCRM/upgradeRes/priority/lua/ui/panel/TRPCustDetail.lua,153a8fc20f3e2143fc487bd943213b73
@@ -345,7 +345,7 @@ trCRM/upgradeRes/other/uiAtlas/cust/Android/del.unity3d,453d38d3af66e108db0d2bb8
trCRM/upgradeRes/priority/lua/ui/panel/CLLPWebView.lua,29c95ef46d9adeb7d310ac073ca4ef26
trCRM/upgradeRes/priority/lua/json/json.lua,a2914572290611d3da35f4a7eec92022
trCRM/upgradeRes/priority/ui/panel/Android/PanelSelectServer.unity3d,b0a074f0b8b0e1e564fe46561e957be8
trCRM/upgradeRes/priority/lua/ui/panel/TRPSelectProduct.lua,73db544d3da38058ab3385f2c3e4f665
trCRM/upgradeRes/priority/lua/ui/panel/TRPSelectProduct.lua,14772ca10ac3036c11c95d3427be516a
trCRM/upgradeRes/other/uiAtlas/cust/Android/get.unity3d,04bf77dfe50c327c85966f9fdd1350c6
trCRM/upgradeRes/other/uiAtlas/cust/Android/more.unity3d,f05eafb34336f1fcb5d614ad30217011
trCRM/upgradeRes/priority/ui/panel/Android/PanelCustListProc.unity3d,5d32d590b8c5383f6c523b06132fb12f
@@ -354,27 +354,27 @@ trCRM/upgradeRes/priority/lua/ui/panel/TRPProductDetail.lua,8b349ca65d41e650ebff
trCRM/upgradeRes/other/uiAtlas/cust/Android/search.unity3d,7420a0a7cc725ff494761009ebe811d7
trCRM/upgradeRes/priority/lua/ui/cell/TRCellTaskList.lua,55dc0892227d9f6f5092548293cdc9d8
trCRM/upgradeRes/other/uiAtlas/news/Android/news_4.unity3d,8c7beff66dc0cfe9f44082bdacc8007c
trCRM/upgradeRes/priority/lua/ui/panel/TRPMoreProc4Cust.lua,3ed4e7289bc339620e19a8d48807d388
trCRM/upgradeRes/other/uiAtlas/work/Android/xiazai-icon.unity3d,8a7af096d5e511c34f6b01235b57d13e
trCRM/upgradeRes/other/uiAtlas/work/Android/work_color.unity3d,043e8a3cdee29da6e5c909432f25d6f8
trCRM/upgradeRes/priority/lua/ui/panel/CLLPPopTime.lua,ffdeaf9996a4aa6dda8f025faccbbe1e
trCRM/upgradeRes/priority/ui/panel/Android/PanelSelectCompany.unity3d,2aa019a477ea5b160780ded080dc82ec
trCRM/upgradeRes/priority/ui/panel/Android/PanelBackplate.unity3d,861c2420c86f0da27dd58a6f73dfb942
trCRM/upgradeRes/priority/ui/panel/Android/PanelHotWheel.unity3d,79adf0809fb5121f0fa306a8d96ae725
trCRM/upgradeRes/priority/ui/panel/Android/PanelProductDetail.unity3d,44dc779e7b05ed8c29719f679317e058
trCRM/upgradeRes/priority/lua/ui/cell/TRCellOceanList.lua,911d6edb241c34ee721815622ea707c3
trCRM/upgradeRes/other/uiAtlas/coolape/Android/password.unity3d,ae473953dbd84c6f9a4e736f5101f4a2
trCRM/upgradeRes/other/uiAtlas/mine/Android/log_bg.unity3d,fd1470749300ec31bcbe7f59686152d7
trCRM/upgradeRes/other/uiAtlas/cust/Android/suc.unity3d,0ec570e88b0dfc2b82a4f8e5bb84edc0
trCRM/upgradeRes/priority/lua/json/rpcserver.lua,48b8f5e53a1141652c38f8a5a8a77928
trCRM/upgradeRes/priority/lua/net/CLLNet.lua,947abdf2c019f44a26211acf6f31e2dd
trCRM/upgradeRes/priority/lua/db/DBAttachment.lua,b4567ff14ac46a7786957d39715fe5b0
trCRM/upgradeRes/other/uiAtlas/coolape/Android/logo.unity3d,c712e48e071a87fb6668333774da19a6
trCRM/upgradeRes/priority/lua/ui/panel/TRPBatchGetCusts.lua,824f77c2486687108fa391a8fb08a405
trCRM/upgradeRes/priority/lua/ui/cell/CLLUICalenderDay.lua,6e7400e2dd535ced93960c1e18fa2458
trCRM/upgradeRes/other/uiAtlas/call/Android/拨号_05.unity3d,5522296c264de7466efb294714946c16
trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustList.lua,3c927618bc036253a99d5932fe22ed08
trCRM/upgradeRes/priority/lua/ui/panel/TRPPopCheckBoxs.lua,508171a924c113573b01a396e8217cc2
trCRM/upgradeRes/other/uiAtlas/news/Android/news_bg_num1.unity3d,2ed88c277f983b8d1a3dedf73d735239
trCRM/upgradeRes/priority/lua/db/DBRoot.lua,bda8f4be66a51defbebe6d7ef6a9884a
trCRM/upgradeRes/priority/ui/panel/Android/PanelFollowList4Cust.unity3d,b423a60a5239bebc95284477374e5f4d
trCRM/upgradeRes/other/uiAtlas/public/Android/check.unity3d,d11f6d5b126c6a0fbf34ced5734cb66f
trCRM/upgradeRes/priority/lua/ui/panel/TRPSysMsgDetail.lua,fd4b28f1cdf003bb4207e7a3064cffb8
trCRM/upgradeRes/priority/lua/ui/panel/TRPSysMsgDetail.lua,69d132613124308f6925704c70afb20d
trCRM/upgradeRes/priority/lua/ui/panel/TRPPlaySoundRecord.lua,c36c7b2d699a8a19abe573e9147e8844
trCRM/upgradeRes/other/uiAtlas/public/Android/check_full.unity3d,282038ef4b24e802b0c936877871200c
trCRM/upgradeRes/priority/ui/panel/Android/PanelTaskList4Cust.unity3d,825e2c96d5e143d6c35f11e4d7b01005
@@ -384,15 +384,15 @@ trCRM/upgradeRes/priority/lua/ui/panel/CLLPBackplate.lua,ae946f1cec5baad680f4e8a
trCRM/upgradeRes/other/uiAtlas/mine/Android/myset_clean_up.unity3d,51e9fd3012fca7d448c3578c281bd15e
trCRM/upgradeRes/other/uiAtlas/mine/Android/me_order.unity3d,26bc3076031940af6069ef5a9143fb5a
trCRM/upgradeRes/priority/ui/panel/Android/PanelSelectProduct.unity3d,360b504982d61fa054c5fde63586c81a
trCRM/upgradeRes/other/uiAtlas/public/Android/radio_full.unity3d,299e73e63c854e9d88dc63f1c19a45f9
trCRM/upgradeRes/priority/lua/ui/panel/TRPEditPrice.lua,ceb906ae12222324b9a61f4b83ec7e58
trCRM/upgradeRes/priority/lua/ui/panel/TRPOrderList.lua,dad09d99c3d896f7c1ce1c1c854073ea
trCRM/upgradeRes/priority/lua/ui/panel/TRPEditPrice.lua,a925a19c2e119783665305efddb682b3
trCRM/upgradeRes/other/uiAtlas/order/Android/icon_1.unity3d,47e903d836aa8bc08317cdc45d61907e
trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_1.unity3d,41ae133fd4da0f2bf01316f91cf67fb8
trCRM/upgradeRes/other/uiAtlas/order/Android/shut.unity3d,7a13d4859459f052143028b0656aef43
trCRM/upgradeRes/priority/lua/toolkit/curve.lua,f97735ed6c39accb55cdae44b62b5b38
trCRM/upgradeRes/priority/lua/ui/panel/TRPFollowFilter.lua,f436c880f71e048db7b82de41e881b8f
trCRM/upgradeRes/priority/ui/panel/Android/PanelEditPrice.unity3d,baa0e7f3e00e62b0d5cb5263d7583000
trCRM/upgradeRes/priority/lua/ui/panel/CLLPSendSms.lua,21ca579fc9f873db363be7a45cfc115f
trCRM/upgradeRes/priority/lua/ui/panel/TRPAbout.lua,1045994ded084ebe67d8083f3ee92ffd
trCRM/upgradeRes/other/uiAtlas/call/Android/拨号_03.unity3d,8bce0927f74079d303bc8354d231bee6
trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_3.unity3d,651d81480c5ea1ff8aa4ccdf7e0a6058
trCRM/upgradeRes/priority/ui/other/Android/EmptySpace.unity3d,b9f173d21c2bc1854fb84e50f11dbed8
trCRM/upgradeRes/priority/lua/ui/cell/TRCellCompany.lua,2cacaeb6845d8d0a0b16d726048a0216
trCRM/upgradeRes/priority/lua/ui/cell/TRCellImage.lua,d7e729ad29ea6cabddfcca355458d9dd

2
Assets/CoolapeFrameData/verControl/android/ver4UpgradeList.v
View File

File diff suppressed because one or more lines are too long

32
Assets/CoolapeFrameData/verControl/android/ver4UpgradeMd5.v
View File

@@ -57,7 +57,7 @@ trCRM/upgradeRes4Publish/priority/ui/other/Android/Frame1.unity3d,b554ca58c719e8
trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/myset_check.unity3d,d9092d78af855e769abff1223f650a9d
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPMyInfor.lua,0bf5726a37d6aaccc3b8f78245aaeac4
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelFollowFilter.unity3d,8ac3bb50fa5c67200331f3bc71f70d30
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewOrder.unity3d,9a6d3e61d449a2c1e42dfb76aab1c295
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewOrder.unity3d,4ce7c1fc57b76bd41ebc0a51e78819c5
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSetting.lua,31c864befca4b564b72543d834a329fe
trCRM/upgradeRes4Publish/other/uiAtlas/main/Android/icon_news2.unity3d,a35e85b68569bf1adc16bdee3a609fdd
trCRM/upgradeRes4Publish/priority/ui/other/Android/AlertRoot.unity3d,c30044a6e7bf14ddb7a87c4f51d1f073
@@ -82,7 +82,7 @@ trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/cus_followup.unity3d,a722ae8
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewCust.lua,d235e6198245d1c693b5437d86b68f75
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOrderList.lua,dad09d99c3d896f7c1ce1c1c854073ea
trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/new2_time.unity3d,16ca1ec9a44b8633ca032c3c8cdf1a9b
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPConnect.lua,7b8af1171623fd14f26c2bf974b42ab8
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPConnect.lua,21cb1977b7fe7cdedd9069d021cfd3e6
trCRM/upgradeRes4Publish/priority/lua/public/CLLIncludeBase.lua,e003af48472fedc090ada0477edf5240
trCRM/upgradeRes4Publish/other/uiAtlas/call/Android/icon_dial.unity3d,6d400188377a2dd6f04dd1737719cb1c
trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_bg_noshadow.unity3d,4aee082b48104519ba82bad6aac83cf3
@@ -117,7 +117,7 @@ trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/kuang.unity3d,a6ce8e74b0631e
trCRM/upgradeRes4Publish/other/uiAtlas/logo/Android/logo2.unity3d,1bddae3d3fe67d91fc6b5c6f9dbb0bea
trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLUICellPoplist.lua,18d47301d459fd66ed63b902546e8619
trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/sms.unity3d,9d63dc8f82de2f772e544b8c8518021b
trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPStart.lua,53603d0905af2504030aaaa54cd0f313
trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPStart.lua,9b5df40e237fec33868826e1f12e2772
trCRM/upgradeRes4Publish/other/uiAtlas/main/Android/icon_me.unity3d,b6060c4f6b1cf669b21b5d4f8b23efbe
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewFollowSimple.unity3d,d0f73f4324743d77717668fdcda14680
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPlaySoundRecord.unity3d,1c45c795755a9f792896aa905f78af85
@@ -142,7 +142,7 @@ trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/gou.unity3d,003393d384b7c8d
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelWWWProgress.unity3d,d9cbe9d08670eedbee77ba97330f4118
trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellComFilterGroup.lua,8c33f89953c402f43b47022a71064cde
trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/ipt.unity3d,68e98b41456c62324871a1c86caefafc
trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellReportform3.lua,8f055265d33f40a2278e159a8ebf2b56
trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellReportform3.lua,23b6659f9239c4c4565cce015fc9ce13
trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/icon_4.unity3d,cb33f3103d8fb3c77e2f1683b1c89a3d
trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/img_unauthorized.unity3d,2364907c4a676d92020083979d028c2e
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPopList.unity3d,1683cd2993884b1b11244d1f5ee700f4
@@ -167,7 +167,7 @@ trCRM/upgradeRes4Publish/priority/lua/public/CLLQueue.lua,065303c980678b25b11854
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPComFilter.lua,522e60b5e11321ef12cb2466b5b249d2
trCRM/upgradeRes4Publish/other/uiAtlas/hotwheel/Android/hotWheel_bg.unity3d,b5d2bc7180f9d280014726814ec8b9fe
trCRM/upgradeRes4Publish/other/uiAtlas/call/Android/comingcall.unity3d,aa389eaf18e63450159f362bca58e8fc
trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellMessageGroup.lua,14a960604f49e2b34e0c115561bb45a3
trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellMessageGroup.lua,6f98095a60bb1dc4f35037e6099493b1
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelFollowList.unity3d,3aff465c0ca7aa53abcaa912a5961060
trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/me_set.unity3d,c53cddeef8f62d67a2a4110447466536
trCRM/upgradeRes4Publish/priority/lua/bio/BioOutputStream.lua,84fd65eb0d1a166e77447f61254d62b5
@@ -178,7 +178,7 @@ trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPopCheckBoxs.unity3d,d3a
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPFollowList.lua,5e57ae6031f9bd40070355f5a203315b
trCRM/upgradeRes4Publish/priority/lua/public/CLLStack.lua,579069654d88a15e43c818a6b8079b15
trCRM/upgradeRes4Publish/priority/lua/db/DBOrder.lua,7f2087299796c187eb9866c14f4afcf8
trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMsg.lua,54cb072f797503f7840dbf735852894f
trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMsg.lua,fae45952e1aa9de137196c40dab2e7b6
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCallLogDetail.lua,69ace8f049a97890a1138c1d1d2f51b6
trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/news_bg_num1.unity3d,2ed88c277f983b8d1a3dedf73d735239
trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_head_bg.unity3d,20f535a454df3fff37230bbcc3bc8244
@@ -192,7 +192,7 @@ trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellGuidPage.lua,7b3c3f567c3e0d9
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewOrder.lua,377b7e10166dfb91862f695664c56c4b
trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPLoginCoolape.lua,5873be60edc8f1407dc9fb53ec567ebf
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPAbout.lua,1045994ded084ebe67d8083f3ee92ffd
trCRM/upgradeRes4Publish/priority/lua/db/DBMessage.lua,77841c7eda6d675c5b3f8f8cec7c65ba
trCRM/upgradeRes4Publish/priority/lua/db/DBMessage.lua,600a647f8049db82cb19b2c13fea0df9
trCRM/upgradeRes4Publish/priority/lua/db/DBStatistics.lua,1f1fe6971f4702b5879e30715fb349e6
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCusFilter.lua,f0452e3d6cfa59244dc7b9dd8f5a475d
trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/company_bg.unity3d,2153c725242937cf5fce727da9626dad
@@ -258,7 +258,7 @@ trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMain.unity3d,a56567b7890
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelTaskList.unity3d,f2733549013073ee749f42f274b342de
trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/myset_remind.unity3d,99a50a17b34f464693ac84d1c6f38966
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollow.lua,430a3b167553c0fb2cb3f34c62065040
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSysMsgList.lua,121d472a9c63850e668a9eebbc6fc413
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSysMsgList.lua,d93794a14279492785d6b0e1e1184d0c
trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/phone.unity3d,8a7c9fe465edfd39de5ac774c6795b19
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSendSms.unity3d,339c862d9669bdd70e9e04c6a610cb9a
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelBindPhone.unity3d,a63b7e106584f699fad374ec6043d0aa
@@ -285,7 +285,7 @@ trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/me_opinion.unity3d,1935579d2
trCRM/upgradeRes4Publish/priority/lua/CLLMainLua.lua,f39b8b592de145c5f8331b30d0ba4d9d
trCRM/upgradeRes4Publish/other/uiAtlas/login/Android/log_no.unity3d,2ee604556b4fff6186f2bad067ed8695
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustFilter.lua,450e7e75ebfe83bb65d59beb3ce60782
trCRM/upgradeRes4Publish/priority/lua/public/CLLInclude.lua,2afb78b285a8cf6bbbef9f4612effc3d
trCRM/upgradeRes4Publish/priority/lua/public/CLLInclude.lua,d84df4859500a5745e7bdb118e5e2443
trCRM/upgradeRes4Publish/priority/lua/toolkit/KKLogListener.lua,85784ec79aefde29be3ef308e7b5203b
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSplash.unity3d,2691ddc66dff5da22fda3ffe11c897dd
trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLFrame2.lua,e25ce84ca55cd643d527d09cedd6228a
@@ -301,14 +301,14 @@ trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/radio.unity3d,4f2c80de666b
trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/button2.unity3d,1a48080b1d43367921fc09b430fffaf5
trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/play2.unity3d,0b6ede536ea7b5084a1de22265b04840
trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/check.unity3d,aa21836aaae62d8f719a930aefe37ea7
trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellSysMessageList.lua,1ce46f4b3a1a8b728e447c12e7df1831
trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellSysMessageList.lua,5386782677bbd283a1008547c4629262
trCRM/upgradeRes4Publish/priority/lua/json/rpc.lua,28c2f09ceb729d01052d8408eed0b57a
trCRM/upgradeRes4Publish/other/uiAtlas/call/Android/icon_del.unity3d,9439afa65f7071d5bdd7569713570266
trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPPopList.lua,17086f0c2296f83f5f407385fe15980c
trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellReportform2.lua,e62a82bcc9fb817a4460e82b6351e18f
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelTasks.unity3d,1ccaafb32c2b12b3cf5070636dc25009
trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/me_customer.unity3d,5676922ef1749c311285d1a207b8397b
trCRM/upgradeRes4Publish/priority/lua/net/NetProto.lua,2b7015f3ccf492969141082fae8d7a15
trCRM/upgradeRes4Publish/priority/lua/net/NetProto.lua,9c7edc982eae5989575747d2b8cad7ab
trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/tips_3.unity3d,2834e3cc399b70e7621065ad4ddaedf6
trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/myset_clean_up.unity3d,51e9fd3012fca7d448c3578c281bd15e
trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLCellToast.lua,6e350721fca8167bd621df86ad982326
@@ -343,8 +343,8 @@ trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCalender.unity3d,541231e
trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/del.unity3d,453d38d3af66e108db0d2bb827426bd7
trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPWebView.lua,29c95ef46d9adeb7d310ac073ca4ef26
trCRM/upgradeRes4Publish/priority/lua/json/json.lua,a2914572290611d3da35f4a7eec92022
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSysMsgDetail.lua,fd4b28f1cdf003bb4207e7a3064cffb8
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSelectProduct.lua,73db544d3da38058ab3385f2c3e4f665
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSysMsgDetail.lua,69d132613124308f6925704c70afb20d
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSelectProduct.lua,14772ca10ac3036c11c95d3427be516a
trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/get.unity3d,04bf77dfe50c327c85966f9fdd1350c6
trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/more.unity3d,f05eafb34336f1fcb5d614ad30217011
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustListProc.unity3d,5d32d590b8c5383f6c523b06132fb12f
@@ -371,7 +371,7 @@ trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPBatchGetCusts.lua,824f77c24866
trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLUICalenderDay.lua,6e7400e2dd535ced93960c1e18fa2458
trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustList.lua,3c927618bc036253a99d5932fe22ed08
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPPopCheckBoxs.lua,508171a924c113573b01a396e8217cc2
trCRM/upgradeRes4Publish/priority/lua/db/DBRoot.lua,97e2c26781603147d6e63b2b39f7643e
trCRM/upgradeRes4Publish/priority/lua/db/DBRoot.lua,bda8f4be66a51defbebe6d7ef6a9884a
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelFollowList4Cust.unity3d,b423a60a5239bebc95284477374e5f4d
trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/check.unity3d,d11f6d5b126c6a0fbf34ced5734cb66f
trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/check_full.unity3d,282038ef4b24e802b0c936877871200c
@@ -381,12 +381,12 @@ trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/cus_task.unity3d,a4f14863091
trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPBackplate.lua,ae946f1cec5baad680f4e8a0f7e71223
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSelectProduct.unity3d,360b504982d61fa054c5fde63586c81a
trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/radio_full.unity3d,299e73e63c854e9d88dc63f1c19a45f9
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPEditPrice.lua,ceb906ae12222324b9a61f4b83ec7e58
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPEditPrice.lua,a925a19c2e119783665305efddb682b3
trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/icon_1.unity3d,47e903d836aa8bc08317cdc45d61907e
trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_icon_1.unity3d,41ae133fd4da0f2bf01316f91cf67fb8
trCRM/upgradeRes4Publish/priority/lua/toolkit/curve.lua,f97735ed6c39accb55cdae44b62b5b38
trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPSendSms.lua,21ca579fc9f873db363be7a45cfc115f
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelEditPrice.unity3d,baa0e7f3e00e62b0d5cb5263d7583000
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelEditPrice.unity3d,5c87cd598efd9c145911e50a14fc193e
trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_icon_3.unity3d,651d81480c5ea1ff8aa4ccdf7e0a6058
trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCompany.lua,2cacaeb6845d8d0a0b16d726048a0216
trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellImage.lua,d7e729ad29ea6cabddfcca355458d9dd

8
Assets/trCRM/Plugins/Android/gen/android/telephony.meta Normal file
View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 12d49a1a05449429383d2dd5bc950c04
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

2
Assets/trCRM/serversCfg/servers.json
View File

@@ -1 +1 @@
{"2020158":{"2":{"id":"2", "host":"47.111.20.34", "name":"\u6d4b\u8bd5\u670d\u52a1\u5668", "iosVer":"fb48beff87f4fe19229784b93020d5ba", "port":29004, "androidVer":"a585ce6da49a704a488809d0d56eba90", "isDev":1}, "3":{"id":"3", "host":"192.168.1.11", "name":"\u672c\u5730\u6d4b\u8bd5", "iosVer":"fb48beff87f4fe19229784b93020d5ba", "port":29000, "androidVer":"a585ce6da49a704a488809d0d56eba90", "isDev":1}, "1":{"id":"1", "host":"app.ttf-cti.com", "name":"\u6b63\u5f0f\u670d\u52a1\u5668", "iosVer":"fb48beff87f4fe19229784b93020d5ba", "port":29000, "androidVer":"4f33d26a37d983936fa5feebfe6b57f8", "isDev":0}}}
{"2020158":{"2":{"id":"2", "host":"47.111.20.34", "name":"\u6d4b\u8bd5\u670d\u52a1\u5668", "iosVer":"fb48beff87f4fe19229784b93020d5ba", "port":29004, "androidVer":"6de1daaea5bd6699242e890a98719216", "isDev":1}, "3":{"id":"3", "host":"192.168.1.11", "name":"\u672c\u5730\u6d4b\u8bd5", "iosVer":"fb48beff87f4fe19229784b93020d5ba", "port":29000, "androidVer":"6de1daaea5bd6699242e890a98719216", "isDev":1}, "1":{"id":"1", "host":"app.ttf-cti.com", "name":"\u6b63\u5f0f\u670d\u52a1\u5668", "iosVer":"fb48beff87f4fe19229784b93020d5ba", "port":29000, "androidVer":"4f33d26a37d983936fa5feebfe6b57f8", "isDev":0}}}

12
Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBMessage.lua
View File

@@ -44,7 +44,8 @@ DBMessage.MsgType = {
SysNotice = 3, -- 系统通知
Task = 4,
Task4Cust = 5, -- 跟进客户
Task4Support = 6 -- 代办补货
Task4Support = 6, -- 代办补货
Timeout = 7 -- 到期提醒
}
DBMessage.ReadFlag = {
@@ -95,6 +96,7 @@ DBMessage.onGetMessage = function(type, list, meta)
end
---@param v _DBMessage
for i, v in ipairs(list) do
v.NOTICETYPE = type
table.insert(db.list[type], v) -- 倒序
end
-- //TODO:保存到本地
@@ -155,6 +157,14 @@ function DBMessage.getUnreadNum(type)
count = count + 1
end
end
elseif type == DBMessage.MsgType.Timeout then
local list = DBMessage.getMessages(DBMessage.MsgType.Timeout)
---@param v
for i, v in ipairs(list) do
if v.ReadFlag == DBMessage.ReadFlag.unread then
count = count + 1
end
end
end
return count

3
Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBRoot.lua
View File

@@ -33,6 +33,9 @@ DBRoot.funcs = {
[NetProto.cmds.replenish_query] = function(data) -- 待跟进客户
DBMessage.onGetMessage(DBMessage.MsgType.Task4Support, data.result.data)
end,
[NetProto.cmds.wforder_expiry_reminder] = function(data) -- 到期提醒
DBMessage.onGetMessage(DBMessage.MsgType.Timeout, data.result.data)
end,
[NetProto.cmds.filter_customers] = function(data) -- 过滤条件
DBCust.onGetFilter(data.result)
end,

11
Assets/trCRM/upgradeRes4Dev/priority/lua/net/NetProto.lua
View File

@@ -20,7 +20,7 @@ NetProto.setSever = function(_host, _port)
socketUrl = joinStr("ws://", host, ":", port, "/tr_socket/websocket/")
end
NetProto.isDebug = false
NetProto.isDebug = true
---@type Dist.SpringWebsocket.Client
local socket = Client4Stomp.self
@@ -276,6 +276,7 @@ NetProto.cmds = {
announcement_query = "announcement_query", -- 系统公告
booking_query = "booking_query", -- 待跟进客户
replenish_query = "replenish_query", -- 待补货
wforder_expiry_reminder = "wforder_expiry_reminder", -- 到期提醒
filter_customers = "filter_customers", -- 过滤条件
list_customers = "list_customers", -- 客户列表
person_view_query = "person_view_query", -- 头像
@@ -489,6 +490,14 @@ NetProto.send.booking_query = function(callback, timeOutSec)
NetProto.sendSocket(content, callback, timeOutSec)
end
---public 到期提醒
NetProto.send.wforder_expiry_reminder = function(callback, timeOutSec)
local content = {}
content.action = NetProto.cmds.wforder_expiry_reminder
content.groupId = NetProto.groupId
NetProto.sendSocket(content, callback, timeOutSec)
end
---public 待补货
NetProto.send.replenish_query = function(callback, timeOutSec)
local content = {}

9
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellMessageGroup.lua
View File

@@ -42,6 +42,15 @@ function _cell.show(go, data)
else
uiobjs.LabelTime.text = ""
end
elseif mData.type == DBMessage.MsgType.Timeout then
---@type _DBMessage
local newestMsg = DBMessage.getNewestMessage(mData.type)
uiobjs.LabelNewest.text = newestMsg and newestMsg.content or ""
if newestMsg then
uiobjs.LabelTime.text = newestMsg.createTime
else
uiobjs.LabelTime.text = ""
end
elseif mData.type == DBMessage.MsgType.Task then
---@type _DBTaskCust
-- local newestMsg = DBMessage.getNewestMessage(mData.type)

2
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellReportform3.lua
View File

@@ -47,7 +47,7 @@ function _cell.show(go, data)
mData.gap = math.abs(mData.gap)
uiobjs.SpritePersent.fillAmount = mData.finishPersent / 100
mData.finishPersent = string.format("%.2f", mData.finishPersent)
uiobjs.formRoot:setValue(mData)
end
end,

12
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellSysMessageList.lua
View File

@@ -24,14 +24,18 @@ function _cell.show(go, data)
mData = data
uiobjs.LabelStatus.text = mData.READFLAG == DBMessage.ReadFlag.unread and "未读" or "已读"
SetActive(uiobjs.SpriteReddot.gameObject, mData.READFLAG == DBMessage.ReadFlag.unread)
uiobjs.LabelTitle.text = mData.TITLE
local time = mData.CREATETIME
uiobjs.LabelTitle.text = mData.TITLE or mData.title
local time = mData.CREATETIME or mData.createTime
if time then
uiobjs.LabelTime.text = DateEx.formatByMs(time * 1000)
if(type(time) == "string") then
uiobjs.LabelTime.text = time
else
uiobjs.LabelTime.text = DateEx.formatByMs(time * 1000)
end
else
uiobjs.LabelTime.text = ""
end
uiobjs.LabelContent.text = mData.CONTENT
uiobjs.LabelContent.text = mData.CONTENT or mData.content
end
-- 取得数据

2
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPStart.lua
View File

@@ -54,7 +54,7 @@ function CLLPStart.setLuasAtBegainning()
ReporterMessageReceiver.self.gameObject:SetActive(true)
end
else
NetProto.isDebug = false
NetProto.isDebug = false or CLCfgBase.self.isEditMode
if ReporterMessageReceiver.self and ReporterMessageReceiver.self.gameObject then
ReporterMessageReceiver.self.gameObject:SetActive(false)
end

3
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPMsg.lua
View File

@@ -10,7 +10,8 @@ local isShowdDragFrefresh = false
local dragVal = Vector3.zero
local objs = {}
local defaulList = {
{icon = "news_news_1", bgColor = 0xfff1c40f, type = DBMessage.MsgType.Sys, name = "公告"}
{icon = "news_news_1", bgColor = 0xfff1c40f, type = DBMessage.MsgType.Sys, name = "公告"},
{icon = "news_news_1", bgColor = 0xff2990dc, type = DBMessage.MsgType.Timeout, name = "到期提醒"}
-- {icon="news_news_2", bgColor=0xff2990dc,type=DBMessage.MsgType.SysNotice, name="系统消息"},
-- {icon="news_news_3", bgColor=0xff1abc9c,type=DBMessage.MsgType.Task, name="待办任务"},
}

1
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPConnect.lua
View File

@@ -85,6 +85,7 @@ function TRPConnect.getDataFromServer()
5
)
NetProto.send.announcement_query()
NetProto.send.wforder_expiry_reminder()
NetProto.send.booking_query()
NetProto.send.replenish_query()
NetProto.send.load_wfTicket_Settings()

64
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPEditPrice.lua
View File

@@ -10,9 +10,16 @@ function TRPEditPrice:init(csObj)
TRPEditPrice.super.init(self, csObj)
self:setEventDelegate()
---@type UITable
uiobjs.Table = getCC(self.csSelf.transform, "Table", "UITable")
---@type CLUIFormRoot
uiobjs.formRoot = self.csSelf:GetComponent("CLUIFormRoot")
uiobjs.formRoot = uiobjs.Table.gameObject:GetComponent("CLUIFormRoot")
---@type CLUIElement
uiobjs.InputNum = getCC(uiobjs.formRoot.transform, "InputNum", "CLUIElement")
---@type CLUIElement
uiobjs.InputStartTime = getCC(uiobjs.formRoot.transform, "InputStartTime", "CLUIElement")
---@type CLUIElement
uiobjs.InputEndTime = getCC(uiobjs.formRoot.transform, "InputEndTime", "CLUIElement")
end
-- 设置数据
@@ -25,6 +32,47 @@ end
-- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh
function TRPEditPrice:show()
uiobjs.formRoot:setValue(self.mdata)
-- 产品属性:1-服务类产品，0/null为实物类产品
if (not isNilOrEmpty(self.mdata.productAttribute)) and tonumber(self.mdata.productAttribute) == 1 then
SetActive(uiobjs.InputStartTime.gameObject, true)
SetActive(uiobjs.InputEndTime.gameObject, true)
uiobjs.InputStartTime.value = self.mdata.validStartTime or DateEx.format(DateEx.fmt_yyyy_MM_dd)
self:calculateEndDate(uiobjs.InputStartTime.value)
else
SetActive(uiobjs.InputStartTime.gameObject, false)
SetActive(uiobjs.InputEndTime.gameObject, false)
end
uiobjs.Table:Reposition()
end
function TRPEditPrice:calculateEndDate(startDate)
if not uiobjs.InputEndTime.gameObject.activeInHierarchy then
return
end
local begain = DateTime.Now
if not isNilOrEmpty(startDate) then
local days = strSplit(startDate, "-")
begain = DateTime(tonumber(days[1]), tonumber(days[2]), tonumber(days[3]))
end
local enddate
local num = tonumber(uiobjs.InputNum.value) or 1
--服务产品消耗时间类型，默认：NULL；0：按日，1：按月，2：按季度，3：按年
if not isNilOrEmpty(self.mdata.productComsuingType) then
local productComsuingType = tonumber(self.mdata.productComsuingType)
if productComsuingType == 0 then
enddate = begain:AddDays(num)
elseif productComsuingType == 1 then
enddate = begain:AddMonths(num)
elseif productComsuingType == 2 then
enddate = begain:AddMonths(num * 3)
elseif productComsuingType == 3 then
enddate = begain:AddYears(num)
else
return ""
end
uiobjs.InputEndTime.value = enddate:ToString(DateEx.fmt_yyyy_MM_dd)
end
return ""
end
-- 刷新
@@ -57,7 +105,19 @@ function TRPEditPrice:setEventDelegate()
MyUtl.toastW("数量不能低于1")
return
end
if (not isNilOrEmpty(self.mdata.productAttribute)) and tonumber(self.mdata.productAttribute) == 1 then
if isNilOrEmpty(uiobjs.InputStartTime.value) then
MyUtl.toastW("请设置开始日期")
return
end
end
Utl.doCallback(callback, self.mdata)
end,
InputNum = function()
self:calculateEndDate(uiobjs.InputStartTime.value)
end,
InputStartTime = function()
self:calculateEndDate(uiobjs.InputStartTime.value)
end
}
end

28
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSelectProduct.lua
View File

@@ -90,6 +90,10 @@ function TRPSelectProduct:getSelected()
if d.isSelected then
d.data.productNum = d.data.productNum or 1
d.data.productPrice = d.data.price
if (not isNilOrEmpty(d.data.productAttribute)) and tonumber(d.data.productAttribute) == 1 then
d.data.validStartTime = DateEx.format(DateEx.fmt_yyyy_MM_dd)
d.data.validEndTime = self:calculateEndDate(d.data)
end
table.insert(list, d.data)
end
end
@@ -97,6 +101,30 @@ function TRPSelectProduct:getSelected()
return list
end
function TRPSelectProduct:calculateEndDate(data)
local days = strSplit(data.validStartTime, "-")
local begain = DateTime(tonumber(days[1]), tonumber(days[2]), tonumber(days[3]))
local enddate
local num = data.productNum or 1
--服务产品消耗时间类型，默认：NULL；0：按日，1：按月，2：按季度，3：按年
if not isNilOrEmpty(data.productComsuingType) then
local productComsuingType = tonumber(data.productComsuingType)
if productComsuingType == 0 then
enddate = begain:AddDays(num)
elseif productComsuingType == 1 then
enddate = begain:AddMonths(num)
elseif productComsuingType == 2 then
enddate = begain:AddMonths(num * 3)
elseif productComsuingType == 3 then
enddate = begain:AddYears(num)
else
return ""
end
return enddate:ToString(DateEx.fmt_yyyy_MM_dd)
end
return ""
end
-- 刷新
function TRPSelectProduct:refresh()
end

16
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSysMsgDetail.lua
View File

@@ -40,9 +40,19 @@ function TRPSysMsgDetail:onShowFrame(cs)
end
-- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh
function TRPSysMsgDetail:show()
self.uiobjs.LabelContent.text = joinStr("　", self.mdata.CONTENT)
self.uiobjs.LabelTime.text = self.mdata.CREATETIME and DateEx.formatByMs(tonumber(self.mdata.CREATETIME) * 1000) or ""
self.uiobjs.LabelTitle.text = self.mdata.TITLE
self.uiobjs.LabelContent.text = joinStr("　", self.mdata.CONTENT or self.mdata.content)
local time = self.mdata.CREATETIME or self.mdata.createTime
if time then
if(type(time) == "string") then
self.uiobjs.LabelTime.text = time
else
self.uiobjs.LabelTime.text = DateEx.formatByMs(time * 1000)
end
else
self.uiobjs.LabelTime.text = ""
end
self.uiobjs.LabelTitle.text = self.mdata.TITLE or self.mdata.title
self.uiobjs.scrollView:ResetPosition()
end

5
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSysMsgList.lua
View File

@@ -35,6 +35,8 @@ function TRPSysMsgList:onShowFrame(cs)
d.title = "公告"
elseif self.mdata.type == DBMessage.MsgType.Task then
d.title = "代办任务"
elseif self.mdata.type == DBMessage.MsgType.Timeout then
d.title = "到期提醒"
end
d.panel = cs
@@ -106,7 +108,10 @@ function TRPSysMsgList:onClickCell(cell, data)
getPanelAsy("PanelSysMsgDetail", onLoadedPanelTT, data)
elseif data.NOTICETYPE == DBMessage.MsgType.Task4Cust then
getPanelAsy("PanelCustListProc", onLoadedPanelTT, data)
elseif data.NOTICETYPE == DBMessage.MsgType.Timeout then
getPanelAsy("PanelSysMsgDetail", onLoadedPanelTT, data)
else
printw("没有处理该消息类型", data.NOTICETYPE)
end
end

906
Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelEditPrice.prefab
View File

File diff suppressed because it is too large Load Diff

333
Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewOrder.prefab
View File

@@ -280,7 +280,7 @@ MonoBehaviour:
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 0.04347826
aspectRatio: 4
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 0}
mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -626,6 +626,132 @@ MonoBehaviour:
m_EditorClassIdentifier:
scrollView: {fileID: 0}
draggablePanel: {fileID: 0}
--- !u!1 &788433213007036848
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4537950500870522849}
- component: {fileID: 9141256182201856122}
- component: {fileID: 6496410008280496209}
m_Layer: 5
m_Name: LabelEndDate
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4537950500870522849
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 788433213007036848}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 104, y: -89, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 487038160484443481}
m_Father: {fileID: 1249610349479200778}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &9141256182201856122
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 788433213007036848}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3}
m_Name:
m_EditorClassIdentifier:
leftAnchor:
target: {fileID: 0}
relative: 0
absolute: 169
rightAnchor:
target: {fileID: 0}
relative: 1
absolute: 253
bottomAnchor:
target: {fileID: 0}
relative: 0
absolute: 0
topAnchor:
target: {fileID: 0}
relative: 1
absolute: 0
updateAnchors: 0
mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1}
mPivot: 4
mWidth: 236
mHeight: 40
mDepth: 7
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 59
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 0}
mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
mText: 2020-12-12
mFontSize: 40
mFontStyle: 0
mAlignment: 0
mEncoding: 1
mMaxLineCount: 0
mEffectStyle: 0
mEffectColor: {r: 0, g: 0, b: 0, a: 1}
mSymbols: 1
mEffectDistance: {x: 1, y: 1}
mOverflow: 3
mMaterial: {fileID: 0}
mApplyGradient: 0
mGradientTop: {r: 1, g: 1, b: 1, a: 1}
mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1}
mSpacingX: 0
mSpacingY: 0
mUseFloatSpacing: 0
mFloatSpacingX: 0
mFloatSpacingY: 0
mShrinkToFit: 0
mMaxLineWidth: 0
mMaxLineHeight: 0
mLineWidth: 0
mMultiline: 1
isAppendEndingString: 0
AppendString: '...'
fontName: EmptyFont
--- !u!114 &6496410008280496209
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 788433213007036848}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3}
m_Name:
m_EditorClassIdentifier:
jsonKey: validEndTime
formatValue:
labeName: {fileID: 0}
defaultName:
canNull: 0
checkIDCard: 0
minLen: 0
maxLen: 0
spriteBg: {fileID: 0}
valueIsNumber: 0
isPhoneNum: 0
inValidColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
--- !u!1 &934217476452900769
GameObject:
m_ObjectHideFlags: 0
@@ -650,12 +776,12 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 934217476452900769}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -301, y: 0, z: 0}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0, y: 89, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1249610349479200778}
m_RootOrder: 4
m_Father: {fileID: 2058935815621498124}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1162926142170418264
MonoBehaviour:
@@ -670,12 +796,12 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
leftAnchor:
target: {fileID: 9060292173203855846}
target: {fileID: 0}
relative: 0
absolute: 169
rightAnchor:
target: {fileID: 9060292173203855846}
relative: 0
target: {fileID: 0}
relative: 1
absolute: 253
bottomAnchor:
target: {fileID: 0}
@@ -750,12 +876,12 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1246448268994330712}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 355, y: 0, z: 0}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 89, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1249610349479200778}
m_RootOrder: 5
m_Father: {fileID: 1930179077374056429}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &2404477135426433860
MonoBehaviour:
@@ -894,7 +1020,7 @@ MonoBehaviour:
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 0.04347826
aspectRatio: 4
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 0}
mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -1068,12 +1194,12 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1745755567360417693}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: 0, y: 15, z: 0}
m_LocalScale: {x: 0.7, y: 0.7, z: 1}
m_Children:
- {fileID: 5633492893922182200}
m_Father: {fileID: 1249610349479200778}
m_RootOrder: 9
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1747138548909843324
GameObject:
@@ -1386,11 +1512,12 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1756049166721528722}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -89, z: 0}
m_LocalPosition: {x: -191, y: -89, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Children:
- {fileID: 5445764659556725222}
m_Father: {fileID: 1249610349479200778}
m_RootOrder: 6
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &5731697688251608301
MonoBehaviour:
@@ -1405,13 +1532,13 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
leftAnchor:
target: {fileID: 0}
target: {fileID: 9060292173203855846}
relative: 0
absolute: 0
absolute: 221
rightAnchor:
target: {fileID: 0}
relative: 1
absolute: 0
target: {fileID: 9060292173203855846}
relative: 0
absolute: 421
bottomAnchor:
target: {fileID: 0}
relative: 0
@@ -1895,12 +2022,12 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2312657503403256251}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -5, y: 89, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1249610349479200778}
m_RootOrder: 3
m_Father: {fileID: 1502935258626211947}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &4509601295992522724
MonoBehaviour:
@@ -1915,13 +2042,13 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
leftAnchor:
target: {fileID: 0}
target: {fileID: 9060292173203855846}
relative: 0
absolute: 0
absolute: 253
rightAnchor:
target: {fileID: 0}
relative: 1
absolute: 0
target: {fileID: 9060292173203855846}
relative: 0
absolute: 379
bottomAnchor:
target: {fileID: 0}
relative: 0
@@ -2007,13 +2134,11 @@ Transform:
- {fileID: 9060292173203855846}
- {fileID: 6550131546567880329}
- {fileID: 741768755136082855}
- {fileID: 5445764659556725222}
- {fileID: 5691811272550430638}
- {fileID: 5492273475069516787}
- {fileID: 1502935258626211947}
- {fileID: 2058935815621498124}
- {fileID: 1930179077374056429}
- {fileID: 6638322929124924262}
- {fileID: 4537950500870522849}
m_Father: {fileID: 6735670843721406284}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -2389,7 +2514,7 @@ MonoBehaviour:
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 250
aspectRatio: 512.5
mType: 1
mFillDirection: 4
mFillAmount: 1
@@ -2671,7 +2796,7 @@ MonoBehaviour:
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 0.04347826
aspectRatio: 2
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 0}
mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -3113,11 +3238,12 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3693886865786244243}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -301, y: -89, z: 0}
m_LocalPosition: {x: -406, y: -89, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Children:
- {fileID: 5691811272550430638}
m_Father: {fileID: 1249610349479200778}
m_RootOrder: 7
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1732784937487359550
MonoBehaviour:
@@ -3132,12 +3258,12 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
leftAnchor:
target: {fileID: 9060292173203855846}
target: {fileID: 0}
relative: 0
absolute: 169
rightAnchor:
target: {fileID: 9060292173203855846}
relative: 0
target: {fileID: 0}
relative: 1
absolute: 253
bottomAnchor:
target: {fileID: 0}
@@ -3156,7 +3282,7 @@ MonoBehaviour:
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 2
aspectRatio: 0.61904764
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 0}
mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -3386,6 +3512,106 @@ MonoBehaviour:
widget: {fileID: 3244412214061244712}
offset: 0
sizeAdjust: 1
--- !u!1 &3907389304989768835
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 487038160484443481}
- component: {fileID: 1969088802880039800}
m_Layer: 5
m_Name: Label
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &487038160484443481
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3907389304989768835}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 89, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4537950500870522849}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1969088802880039800
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3907389304989768835}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3}
m_Name:
m_EditorClassIdentifier:
leftAnchor:
target: {fileID: 0}
relative: 0
absolute: 169
rightAnchor:
target: {fileID: 0}
relative: 1
absolute: 253
bottomAnchor:
target: {fileID: 0}
relative: 0
absolute: 0
topAnchor:
target: {fileID: 0}
relative: 1
absolute: 0
updateAnchors: 0
mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
mPivot: 4
mWidth: 168
mHeight: 42
mDepth: 7
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 4
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 0}
mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
mText: "\u5230\u671F\u65E5\u671F"
mFontSize: 42
mFontStyle: 0
mAlignment: 0
mEncoding: 1
mMaxLineCount: 0
mEffectStyle: 0
mEffectColor: {r: 0, g: 0, b: 0, a: 1}
mSymbols: 1
mEffectDistance: {x: 1, y: 1}
mOverflow: 2
mMaterial: {fileID: 0}
mApplyGradient: 0
mGradientTop: {r: 1, g: 1, b: 1, a: 1}
mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1}
mSpacingX: 0
mSpacingY: 0
mUseFloatSpacing: 0
mFloatSpacingX: 0
mFloatSpacingY: 0
mShrinkToFit: 0
mMaxLineWidth: 0
mMaxLineHeight: 0
mLineWidth: 0
mMultiline: 1
isAppendEndingString: 0
AppendString: '...'
fontName: EmptyFont
--- !u!1 &4147774519001480678
GameObject:
m_ObjectHideFlags: 0
@@ -3538,7 +3764,7 @@ MonoBehaviour:
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 0.04347826
aspectRatio: 2
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 0}
mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -3780,7 +4006,7 @@ MonoBehaviour:
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 0.04347826
aspectRatio: 0.47826087
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 0}
mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -3857,8 +4083,9 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1070758113057642923}
- {fileID: 5492273475069516787}
m_Father: {fileID: 1249610349479200778}
m_RootOrder: 8
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &2054639386129895517
BoxCollider:
@@ -4175,7 +4402,7 @@ MonoBehaviour:
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 250
aspectRatio: 512.5
mType: 1
mFillDirection: 4
mFillAmount: 1
@@ -4259,7 +4486,7 @@ MonoBehaviour:
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 0.04347826
aspectRatio: 4
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 0}
mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -4707,7 +4934,7 @@ MonoBehaviour:
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 0.04347826
aspectRatio: 0.47826087
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 0}
mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -4920,7 +5147,7 @@ MonoBehaviour:
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 0.04347826
aspectRatio: 2
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 0}
mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -5020,7 +5247,7 @@ MonoBehaviour:
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 250
aspectRatio: 512.5
mType: 1
mFillDirection: 4
mFillAmount: 1
@@ -5627,7 +5854,7 @@ MonoBehaviour:
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 0.3043478
aspectRatio: 6
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 0}
mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}

BIN
Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBMessage.lua
View File

Binary file not shown.

BIN
Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBRoot.lua
View File

Binary file not shown.

BIN
Assets/trCRM/upgradeRes4Publish/priority/lua/net/NetProto.lua
View File

Binary file not shown.

BIN
Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellMessageGroup.lua
View File

Binary file not shown.

BIN
Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellReportform3.lua
View File

Binary file not shown.

BIN
Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellSysMessageList.lua
View File

Binary file not shown.

BIN
Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPStart.lua
View File

Binary file not shown.

BIN
Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMsg.lua
View File

Binary file not shown.

BIN
Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPConnect.lua
View File

Binary file not shown.

BIN
Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPEditPrice.lua
View File

Binary file not shown.

BIN
Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSelectProduct.lua
View File

Binary file not shown.

BIN
Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSysMsgDetail.lua
View File

Binary file not shown.

BIN
Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSysMsgList.lua
View File

Binary file not shown.

BIN
Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelEditPrice.unity3d
View File

Binary file not shown.

BIN
Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewOrder.unity3d
View File

Binary file not shown.

2
Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl.ver
View File

@@ -1 +1 @@
r8 (trCRM/resVer/Android/VerCtl/priority.ver8,c614074d72ab97e19d230a736115cef28 %trCRM/resVer/Android/VerCtl/other.ver8,a1697c41c0443f2de244401dc128db13
r8 (trCRM/resVer/Android/VerCtl/priority.ver8,d486f011ddecfb2fcd9671b9f5e8cc378 %trCRM/resVer/Android/VerCtl/other.ver8,a1697c41c0443f2de244401dc128db13

BIN
Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl/other.ver
View File

Binary file not shown.

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

Binary file not shown.