uu

2020-07-28 21:02:59 +08:00
parent 5a53995fff
commit 8c38fea011
120 changed files with 7097 additions and 1930 deletions
--- a/Assets/trCRM/Resources/Atlas/EmptyAtlas.prefab
+++ b/Assets/trCRM/Resources/Atlas/EmptyAtlas.prefab
@@ -46,7 +46,7 @@ MonoBehaviour:
  material: {fileID: 0}
  mSprites: []
  mPixelSize: 1
-  mReplacement: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
+  mReplacement: {fileID: 0}
  mCoordinates: 0
  sprites: []
  _isBorrowSpriteMode: 1
--- a/Assets/trCRM/_scene/Main.unity
+++ b/Assets/trCRM/_scene/Main.unity
@@ -1630,7 +1630,7 @@ MonoBehaviour:
  luaPath: 
  isPrintDownload: 0
  downLoadTimes4Failed: 3
-  baseUrl: http://app.ttf-cti.com:29300/trCRM
+  baseUrl: http://ttfcrm.top:29300/trCRM
  platform: 
  haveUpgrade: 0
  is2GNetUpgrade: 1
--- a/Assets/trCRM/upgradeRes4Dev/other/txt.meta
+++ b/Assets/trCRM/upgradeRes4Dev/other/txt.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1d3221c4b14004b9cbc3b0f17580859e
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Dev/other/txt/serviceProto.txt
+++ b/Assets/trCRM/upgradeRes4Dev/other/txt/serviceProto.txt
@@ -0,0 +1,94 @@
+尊敬的用户，欢迎您访问中国移动通信有限公司安徽分公司（以下简称“安徽移动”）的客户端软件。
+本协议是您（或称"用户"）与中国移动通信有限公司安徽分公司（以下简称“安徽移动”）之间就使用“安徽移动”软件服务所订立的契约。在注册或通过移动手机号码登录本客户端前，请您仔细阅读本协议的全部内容，特别是协议中以加粗字体显示的内容，您应重点阅读。如您对协议有任何疑问，可向中国移动咨询。如果您不同意本协议或其中任何条款约定，请您立即停止注册或登录；您点击"同意"按钮后，本协议即构成对双方有约束力的法律文件。
+一、定义
+1、本客户端：在本协议中除非专门指明或声明，均指由中国移动通信有限公司安徽分公司所有并负责运营的“安徽移动”客户端。 
+2、所有权以及相关的权利：在本服务协议中，除非专门指明或声明，均意味着：第一，所有权；第二，知识产权，包括但不限于著作权、专利权、商标权、商业秘密等；第三，除上述权利之外的对物、信息及其载体和表现形式的使用、利用、传播、复制、发行、编辑、修改、处分等权利。 
+3、用户：在本服务协议中，除非专门指明或声明，是指接受本服务协议的自然人、法人或其他组织。 
+4、个人信息：在本服务协议中，除非专门指明或声明，是指以电子或者其他方式记录的能够单独或者与其他信息结合识别用户身份或者反映用户活动情况的各种信息。 
+5、网络服务：指本客户端基于互联网方式向用户提供的业务宣传、业务查询、业务办理、交费充值、商品交易等服务。
+二、网络服务内容
+1、本客户端向用户提供的网络服务包括：
+（1）用户注册、登录、安全退出、找回密码、修改密码、基本资料修改、历史订单查询等服务；
+（2）业务办理、缴费服务（仅向移动用户提供）；
+（3）商品交易服务；
+（4）发布的文字、软件、声音、图片、录像、图表、广告中的全部内容；
+（5）客户端消息通知服务；
+（6）本客户端为用户提供的其他服务。
+2、本客户端有权根据情况变化调整网络服务的具体内容，本客户端提供的自助业务办理功能和商品信息随时都有可能发生变动，对此中国移动不作特别通知，也不对网络服务的提供或不提供作出承诺。
+3、本客户端仅提供网络服务，与网络服务有关的通信设备（如电脑、调制解调器及其他与接入互联网有关的装置）及通信服务所需的费用（如为接入互联网而支付的电话费及宽带费）由用户自行承担。
+三、权利声明
+1、任何本客户端所发布的信息及/或其载体，及/或其表现形式，及/或服务，除以下情况之外，其所有权及相关的权利均独占性地属于中国移动所有：
+（1）依据中华人民共和国的相关法律规定该信息及/或载体，及/或服务，不享有所有权以及与此相关的权利的； 
+（2）依据中国移动和其他主体之间的协议、合同、章程，由中国移动和其他主体共享，或其他主体单独享有或中国移动转让的； 
+（3）依据中国移动具有法律效力的正式声明而放弃的。
+2、用户只能在本客户端和内容提供者授权下才能使用由本客户端享有权利的内容，且无权擅自复制、修改这些内容，或创造与内容有关的派生产品。任何对本客户端享有的基于该信息及/或其载体，及/或其表现形式，及/或服务的权利的侵犯，均属于对本客户端权利的侵犯。
+四、用户账号注册与管理
+1、用户在完成注册或登录程序实际使用本客户端提供服务时，应当是具备完全民事权利能力和完全民事行为能力的自然人、法人或其他组织。若用户不具备前述主体资格，则用户及用户的监护人应当依照法律规定承担因此而导致的一切后果，中国移动有权注销或永久冻结您的账户。 
+2、如果您是中国移动的手机用户，无需注册，可以直接使用手机号码作为账号进行登录；您也可以通过本客户端进行注册，获得在本客户端的帐号。在完成注册、激活或验证流程时，您应当按照相应页面的提示提供您的身份信息及资料，您应保证提供的身份信息及资料真实、及时、完整和准确。
+3、您在本客户端设置的用户名不得违反国家法律法规关于互联网用户账号名称的管理规定，否则本客户端将有权回收您的用户名。用户名的回收不会影响您以邮箱、手机号码登录本客户端并使用本客户端服务。
+4、您在本客户端的账号、密码和手机短信验证码是您在本客户端的唯一身份权证。为享受本客户端提供的网络服务，您须按照对应的服务要求键入正确的用户账号及密码或短信验证码。
+5、您应保管好自己在本客户端的账号、密码和手机短信验证码，避免使用过于简单的密码。您在服务使用过程中可以根据本客户端规定更改密码。非经本客户端事先同意，账号和密码不得出借、转让、继承或者赠与。非因本客户端原因导致您的账号、密码遗失、遗忘或被他人窃取的，本客户端不承担责任。如果您发现自己的个人信息泄密，尤其是本客户端账户及密码发生泄露，请您立即联络本客户端或中国移动。
+6、用户通过账号+密码和/或短信验证码登录本客户端办理的一切业务，均视为用户亲自办理的业务，由用户承担因此所导致的相关后果和责任，包括但不限于业务费用的支付。
+7、中国移动将采取相应的措施来保证用户的帐户和交易安全，但中国移动不保证其绝对安全。
+五、用户权利及其限制
+1、在遵守本服务协议的前提下，用户有权享有本客户端提供的网络服务，并将收到本客户端最新的优惠产品和服务的相关信息。如您不愿意接受本客户端的信息，您有权要求本客户端停止向您发送产品和服务信息。 
+2、用户承诺对网络服务的使用应符合国家法律法规的规定，且行为符合下列要求： 
+（1）从中国境内向境外传输技术性资料时必须符合中国有关法律的规定；
+（2）不传输或发表：煽动抗拒、破坏宪法和法律、行政法规实施的言论，煽动颠覆国家政权，推翻社会主义制度的言论，煽动分裂国家、破坏国家统一的的言论，煽动民族仇恨、民族歧视、破坏民族团结的言论；
+（3）不传输或发表任何违法犯罪的、骚扰性的、中伤他人的、辱骂性的、恐吓性的、伤害性的、庸俗的，淫秽的、不文明的等信息资料；
+（4）不得传输或发表违背公序良俗和涉及国家安全的信息资料或言论；
+（5） 不干扰本客户端的正常运转，不得侵入本客户端及国家计算机信息系统；
+（6）不得发布任何侵犯他人著作权、商标权等知识产权或隐私权、名誉权等合法权益的内容；
+（7）遵守所有使用网络服务的网络协议、规定、程序和惯例；
+（8）使用网络服务不作非法用途；
+若用户未遵守以上规定的，须对自己在网上的言论和行为承担法律责任，且中国移动有权作出独立判断并采取暂停或关闭用户帐号服务等措施。
+3、本客户端对用户发布及或通过本客户端传送的任何内容不承担责任，用户需对自己在网上的行为承担一切法律责任。用户如在本客户端发布涉嫌违法或涉嫌侵犯他人合法权利或违反本协议的信息，本客户端有权不经通知用户即予以删除。用户如有散布和传播反动、色情或其他违反国家法律信息的活动，本客户端的系统记录有可能作为用户违反法律的证据。
+4、用户违反本协议使用网络服务导致本客户端或第三人损失的，因此产生的损害赔偿费用、律师费用及其他相关费用，均由该用户承担。
+六、 商品购买
+1、在您下订单购买商品时，请您仔细确认所购商品的名称、价格、数量、型号、联系地址、电话、收货人等信息。收货人与用户本人不一致的，收货人/用户的行为和意思表示视为用户/收货人的行为和意思表示，用户/收货人应对收货人/用户的行为及意思表示的法律后果承担连带责任。
+2、除法律另有强制性规定外，双方约定如下：本客户端中销售方展示的商品和价格等信息仅仅是要约邀请，您下单时须填写您希望购买的商品数量、价款及支付方式、收货人、联系方式、收货地址（合同履行地点）、合同履行方式等内容；系统生成的订单信息是计算机信息系统根据您填写的内容自动生成的数据，仅是您向销售方发出的合同要约；销售方收到您的订单信息后，只有在销售方将您在订单中订购的商品从仓库实际直接向您发出时（以订单状态已发货为标志），方视为您与销售方之间就实际直接向您发出的商品建立了合同关系；如果您在一份订单里订购了多种商品并且销售方只给您发出了部分商品时，您与销售方之间仅就实际直接向您发出的商品建立了合同关系；只有在销售方实际直接向您发出了订单中订购的其他商品时，您和销售方之间就订单中该其他已实际直接向您发出的商品才成立合同关系。您可以随时登录您在本客户端注册的账户，查询您的订单状态。
+由于市场变化及各种以合理商业努力难以控制的因素的影响，本客户端无法保证您提交的订单信息中希望购买的商品都会有货；如您拟购买的商品， 发生缺货，您有权取消订单。此等情况，并不视为中国移动违约，中国移动没有义务向您作出任何赔偿。
+3、本客户端将会把商品送到您所指定的送货地址。所有在本客户端上列出的送货时间为参考时间，参考时间的计算是根据库存状况、正常的处理过程和送货时间、送货地点的基础上估计得出的。请清楚准确地填写您的真实姓名、送货地址及联系方式。因如下情况造成订单延迟或无法配送等，本客户端将无法承担迟延配送的责任：
+（1）用户提供错误信息和不详细的地址；
+（2）货物送达无人签收，由此造成的重复配送所产生的费用及相关的后果。
+（3）不可抗力，例如：自然灾害、交通戒严、突发战争等。 
+（4）法定及特殊节假日期间，物流商无法正常配送的。
+七、用户个人信息保护
+1、 用户应保证自己在注册或登录时用户身份的真实性和正确性及完整性，如果相关信息发生变化，用户应及时更改。本客户端不能也不会对个人信息的不真实、不准确，或个人信息未及时更新而引起的任何损失或损害承担责任。本客户端有权在投诉人准确说出用户在注册时所用的手机号码、身份证号码和用户姓名后删除该用户，并不承担任何责任。遇此情况，请用户重新注册。
+2、用户未能按照本客户端的要求和内容提供本客户端要求的必要信息的，本客户端有权中止本客户端所提供的服务，由此所导致的任何已经或可能发生的损失，本客户端概不负责，并保留对该用户进行追索的权利。本客户端有权对用户的注册信息及相关操作进行查阅，发现注册信息或相关操作中存在任何问题或怀疑，均有权向用户发出询问及要求改正的通知或者直接作出删除账户等处理。
+3、中国移动非常重视用户个人信息的保护，在您使用中国移动提供的网络服务时，您同意中国移动按照在本客户端公布的个人信息保护政策收集、存储、使用、披露和保护您的个人信息。中国移动希望通过《个人信息保护政策》向您清楚地介绍中国移动对您个人信息的处理方式，因此建议您完整地阅读《个人信息保护政策》，以帮助您更好地保护您的个人信息。
+八、免责声明
+1、本客户端不就通信系统或互联网的中断或无法运作、技术故障、计算机错误或病毒、信息损坏或丢失或其它在本客户端合理控制范围之外的原因而产生的其他任何性质的破坏而向用户或任何第三方承担赔偿责任。
+2、本客户端需要定期或不定期地对相关的信息网络系统、设备进行检修、维护或升级，如因此类情况而造成网络服务在合理时间内的中断，本客户端无需为此承担任何责任，但本客户端将尽可能事先进行通知。
+3、中国移动不保证用户在使用本客户端时在操作上不会中断或没有错误，不保证会纠正本客户端所有缺陷，不保证本客户端能满足用户的所有要求，亦不保证用户能通过本客户端订购所有中国移动的业务和产品，对网络服务的及时性、安全性、准确性也都不作担保。
+4、用户通过本客户端进行交易、获取有偿服务而发生的所有税费及有关费用，均由用户负责支付，因此产生的风险也由用户个人承担。中国移动提醒用户应该通过自己的谨慎判断确定陈列商品及相关信息的真实性、合法性和有效性。
+5、双方承认本条款反映了双方就协商谈判达成的一致意见。双方均完全了解本条款的后果并进一步承认本条款的合理性。
+九、网络服务的停止
+1、在以下情形下，本客户端有权单方并在不做出任何通知的情况下立即停止对用户提供网络服务: 
+（1）若该用户是通过手机号码及服务密码/或短信验证码登陆的，当该用户所对应的手机号码停机或销号后；
+（2）用户违反本协议规定使用网络服务；
+（3）用户提供的注册资料不真实；
+（4）用户账户被删除后；
+（5） 若用户利用本客户端提供的邮件服务发送了垃圾邮件或其他有害信息，则本客户端有权停止为该用户提供邮件服务。
+2、用户对本协议后续的修改有异议，或对本客户端的服务不满，可以行使如下权利： 
+（1）停止使用本客户端的网络服务；
+（2）通告本客户端停止对该用户的服务； 
+3、用户服务停止后，本客户端没有义务向该用户或第三方传送任何未处理的信息或未完成的服务，亦无需对该用户或第三方负责。但本协议的终止并不意味着终止前所发生的未完成用户指令的撤销，也不能消除因终止前的交易所带来的法律后果。
+十、第三方链接
+1、从本客户端链接至中国移动以外的网站：某些情况下，本客户端会提供跳转至国际互联网上的其它页面或网站的链接。此链接将会引您至第三方发行或经营的网站，而该第三方并非中国移动的合作机构或与中国移动有任何联系。中国移动将该链接列入网站内，仅为协助用户浏览和参考之用。中国移动致力于挑选声誉良好的网站和资料来源，以方便用户。然而，除非中国移动已经明确声明与该第三方有合作关系，提供链接至此第三方网站或网页，并不视为中国移动同意、推荐、认可、保证或推介任何第三方或在第三方网站上所提供的任何服务、产品，亦不可视为中国移动与该第三方及其网站有任何形式的合作。
+2、从本客户端链接至中国移动其它网站：本客户端亦包含链接至中国移动其它网站，以方便您的使用。该网站所提供的产品和服务只提供给身处或居所属于该司法管辖地区的人士使用。中国移动其他网站各自制定使用条款，条款可能互有差异，您应先仔细查阅适用的使用条款，然后才使用相关的网站。
+3、从其他网站链接至本客户端：若您想在第三方的网站以任何形式建立链接至本客户端，必须先取得中国移动的书面同意,中国移动有权决定是否核准建立此链接。凡从第三方网站建立任何链接至本客户端，中国移动不负责该链接的建立与设置。依此建立的链接，并不构成中国移动与该第三方网站有任何形式的合作，亦不构成中国移动对该第三方网站的认同。如因该链接而产生或导致的任何需由您或第三方承担或蒙受的损失或损害，中国移动不承担任何责任。对于经由中国移动核准以纯文字格式或任何形式建立的链接，中国移动保留随时撤销核准的权利，并有权要求清除任何指向本客户端的链接。
+十一、通告
+所有发给用户的通告都可通过页面的公告或电子邮件或常规的信件传送。服务条款的修改、服务变更、或其它重要事件的通告都会以此形式进行。 
+十二、服务条款修改
+本客户端有权根据法律法规变化和网站运营需要，对本协议条款不时地进行修改。本协议一旦发生变动，本客户端将通告用户，修改后的协议一经通告即生效。用户如果不同意所改动的内容，应主动停止使用本客户端提供的网络服务。如果用户继续享用本客户端网络服务，则视为接受服务条款的变动。
+十三、法律
+1、本协议条款适用中华人民共和国的法律法规。如协议条款与中华人民共和国法律相抵触，则依照法律的规定重新解释该服务条款，但不影响其它条款的法律效力和影响。 
+2、本协议的订立、执行和解释及争议的解决均应适用中华人民共和国法律并受中华人民共和国法院管辖。
+3、用户与本客户端一致同意：
+（1）双方应持平等、友好、争取合理解决问题的态度； 
+（2）发生纠纷时首先以协商方式解决，如协商未果，任何一方应向中国移动通信有限公司所在地人民法院提起诉讼。
+十四、其他
+1、中国移动未行使本协议的任何权利或规定，并不构成对前述权利之放弃。
+2、如本协议中的任何条款完全或部分无效，本协议的其余条款仍有效并且有约束力。
+3、本协议内容包括协议正文及本客户端上发布的声明和规则，包括但不限于购物指南、服务说明、个人信息保护政策等。所有声明、政策和规则等与协议正文具有同等法律效力，共同构成完整服务协议。
--- a/Assets/trCRM/upgradeRes4Dev/other/txt/serviceProto.txt.meta
+++ b/Assets/trCRM/upgradeRes4Dev/other/txt/serviceProto.txt.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 4e333627c16c04523bebb034bc39b186
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/CLLMainLua.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/CLLMainLua.lua
@@ -72,8 +72,10 @@ function CLLMainLua.setAndroidStatusBar()
    if CLPathCfg.self.platform ~= "Android" then
        return
    end
-    local mode = string.upper( SystemInfo.deviceModel)
-    if string.find(mode, "HUAWEI") then
+    local mode = SystemInfo.deviceModel
+    if string.find(string.upper(mode), "HUAWEI")
+        and "HUAWEI BAC-TL00" ~= mode -- 齐川的手机
+     then
        AndroidStatusBar.setFlags(AndroidStatusBar.WINDOW_FLAG_FORCE_NOT_FULLSCREEN)
        AndroidStatusBar.setColor(AndroidStatusBar.DEFAULT_BACKGROUND_COLOR)
    else
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBCust.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBCust.lua
@@ -1,4 +1,5 @@
 ---@class _DBCust
+---@field custId
 ---@field custName
 ---@field custType
 ---@field phoneNo
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBUser.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBUser.lua
@@ -8,13 +8,14 @@ DBUser = {}
 local db = {}
 local icons = {}
 local poplist = {}
+local rolePermission = {}

 DBUser.FilterGroup = {
    user = "user",
    group = "group"
 }

-function DBUser.onGetUsers(list, groupList)
+function DBUser.onGetUsers(list, groupList, permissions)
    local options = ArrayList()
    local values = ArrayList()
    db.filters = {}
@@ -40,7 +41,7 @@ function DBUser.onGetUsers(list, groupList)
    local options = ArrayList()
    local values = ArrayList()
    db.filters[DBUser.FilterGroup.group] = {}
-    for i, v in ipairs(groupList) do
+    for i, v in ipairs(groupList or {}) do
        table.insert(db.filters[DBUser.FilterGroup.group], {name = v.name, value = v.id})
        options:Add(v.name)
        values:Add(v.id)
@@ -49,6 +50,11 @@ function DBUser.onGetUsers(list, groupList)
        options = options,
        values = values
    }
+    --------------------------------------------
+    rolePermission = {}
+    for i, v in ipairs(permissions) do
+        rolePermission[v] = true
+    end
 end

 function DBUser.getFilters(group)
@@ -97,4 +103,9 @@ function DBUser.getIcon(loginNo, callback)
    )
 end

+---public 是否有权限
+function DBUser.hadPermission(key)
+    return rolePermission[key] or false
+end
+
 return DBUser
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/net/NetProto.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/net/NetProto.lua
@@ -10,12 +10,30 @@ NetProto.send = {}
 ---------------------------------------------------------------------------------------
 local host = "app.ttf-cti.com" -- "47.111.20.34"
 local port = 29004
-- local host = "192.168.1.126"
-- local port = 29000
 local baseUrl = joinStr("http://", host, ":", port, "/open_api/")
-- local baseUrl = "http://47.111.20.34/home/open_api/"
 local socketUrl = joinStr("ws://", host, ":", port, "/tr_socket/websocket/")

+NetProto.setSeverPublish = function()
+    host = "app.ttf-cti.com"
+    port = 29004
+    baseUrl = joinStr("http://", host, ":", port, "/open_api/")
+    socketUrl = joinStr("ws://", host, ":", port, "/tr_socket/websocket/")
+end
+
+NetProto.setSeverDev = function()
+    host = "app.ttf-cti.com"
+    port = 29004
+    baseUrl = joinStr("http://", host, ":", port, "/open_api/")
+    socketUrl = joinStr("ws://", host, ":", port, "/tr_socket/websocket/")
+end
+
+NetProto.setSeverLocal = function()
+    host = "192.168.1.100"
+    port = 29004
+    baseUrl = joinStr("http://", host, ":", port, "/open_api/")
+    socketUrl = joinStr("ws://", host, ":", port, "/tr_socket/websocket/")
+end
+
 ---@type Dist.SpringWebsocket.Client
 local socket = Client4Stomp.self
 local appid = 2020158
@@ -199,10 +217,7 @@ NetProto.getTokenForAPI = function(appsecret, callback, failedCallback, orgs)
 end

 NetProto.login = function(map, callback, failedCallback, orgs)
-    -- local map = {
-    --     phone = phone,
-    --     password = password
-    -- }
+    map.model = SystemInfo.deviceModel
    NetProto.sendGet(NetProto.cmds.login, map, callback, failedCallback, orgs)
 end

@@ -243,7 +258,11 @@ NetProto.cmds = {
    createWfInfo = "createWfInfo", -- 创建订单
    create_followUp_task = "create_followUp_task", -- 创建跟进预约
    list_followUp_records = "list_followUp_records", -- 跟进记录
-    workFlowQuery = "workFlowQuery" -- 工单列表
+    workFlowQuery = "workFlowQuery", -- 工单列表
+    backToGH = "backToGH", -- 返回公海
+    delCustomerInfo = "delCustomerInfo", -- 删除客户
+    loadProductType = "loadProductType", -- 产品类型
+    pageGHQueryList = "pageGHQueryList", -- 公海列表
 }
 ---------------------------------------------------------------------------------------
 ---------------------------------------------------------------------------------------
@@ -553,8 +572,9 @@ NetProto.send.selectProductInfo = function(searchKey, page, callback, timeOutSec
    content.action = NetProto.cmds.selectProductInfo
    content.loginNo = NetProto.loginNo
    content.groupId = NetProto.groupId
+    -- content.flag = 0
    content.current_page = page
-    content.search = searchKey
+    content.keywords = searchKey
    NetProto.sendSocket(content, callback, timeOutSec)
 end

@@ -596,5 +616,38 @@ NetProto.send.workFlowQuery = function(filters, queryKey, page, callback, timeOu
    content.current_page = page
    NetProto.sendSocket(content, callback, timeOutSec)
 end
+
+NetProto.send.backToGH = function(ids, callback, timeOutSec)
+    local content = {}
+    content.action = NetProto.cmds.backToGH
+    content.groupId = NetProto.groupId
+    content.ids = ids
+    NetProto.sendSocket(content, callback, timeOutSec)
+end
+
+NetProto.send.delCustomerInfo = function(ids, callback, timeOutSec)
+    local content = {}
+    content.action = NetProto.cmds.delCustomerInfo
+    content.groupId = NetProto.groupId
+    content.ids = ids
+    NetProto.sendSocket(content, callback, timeOutSec)
+end
+
+NetProto.send.loadProductType = function(callback, timeOutSec)
+    local content = {}
+    content.action = NetProto.cmds.loadProductType
+    content.groupId = NetProto.groupId
+    NetProto.sendSocket(content, callback, timeOutSec)
+end
+
+NetProto.send.pageGHQueryList = function(filters, queryKey, page, callback, timeOutSec)
+    local content = {}
+    content.action = NetProto.cmds.pageGHQueryList
+    content.groupId = NetProto.groupId
+    content.filters = filters
+    content.keywords = queryKey
+    content.current_page = page
+    NetProto.sendSocket(content, callback, timeOutSec)
+end
 ------------------------------------------------------
 return NetProto
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellComFilter.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellComFilter.lua
@@ -0,0 +1,48 @@
+---@class _ParamCellCustFilter
+---@field name string
+---@field value number
+---@field selected boolean
+
+-- xx单元
+local _cell = {}
+---@type Coolape.CLCellLua
+local csSelf = nil
+local transform = nil
+---@type _ParamCellCustFilter
+local mData = nil
+local uiobjs = {}
+
+-- 初始化，只调用一次
+function _cell.init(csObj)
+    csSelf = csObj
+    transform = csSelf.transform
+    uiobjs.Label = getCC(transform, "Label", "UILabel")
+    uiobjs.bg = csSelf:GetComponent("UISprite")
+end
+
+-- 显示，
+-- 注意，c#侧不会在调用show时，调用refresh
+function _cell.show(go, data)
+    mData = data
+    uiobjs.Label.text = mData.name
+    _cell.setSelect(mData.selected)
+end
+
+function _cell.setSelect(val)
+    mData.selected = val
+    if val then
+        uiobjs.bg.color = ColorEx.getColor(0xff2990dc)
+        uiobjs.Label.color = ColorEx.getColor(0xffffffff)
+    else
+        uiobjs.bg.color = ColorEx.getColor(0xfff4f4f4)
+        uiobjs.Label.color = ColorEx.getColor(0xff999999)
+    end
+end
+
+-- 取得数据
+function _cell.getData()
+    return mData
+end
+
+--------------------------------------------
+return _cell
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellComFilter.lua.meta
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellComFilter.lua.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: f792bcec1a2664348b80edb755526774
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellComFilterGroup.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellComFilterGroup.lua
@@ -0,0 +1,114 @@
+---@class _ParamCellCustFilterGroup
+---@field title
+---@field key
+---@field key2
+---@field panel TRPCustFilter
+---@field list
+---@field type 1:dateTime 其它情况为选择
+---@field isDateRange
+---@field isNeedTime
+---@field value
+
+-- xx单元
+local _cell = {}
+---@type Coolape.CLCellLua
+local csSelf = nil
+local transform = nil
+---@type _ParamCellCustFilterGroup
+local mData = nil
+local uiobjs = {}
+local cells = {}
+local firstCell
+local selectedCells = {}
+
+-- 初始化，只调用一次
+function _cell.init(csObj)
+    csSelf = csObj
+    transform = csSelf.transform
+    uiobjs.LabelTitle = getCC(transform, "LabelTitle", "UILabel")
+    uiobjs.grid = getCC(transform, "Grid", "UIGrid")
+    uiobjs.gridPrefab = getChild(uiobjs.grid.transform, "00000").gameObject
+    ---@type CLUIElementDate
+    uiobjs.InputDate = getCC(transform, "InputDate", "CLUIElementDate")
+    uiobjs.InputDateEl = getCC(transform, "InputDate", "CLUIElement")
+end
+
+-- 显示，
+-- 注意，c#侧不会在调用show时，调用refresh
+function _cell.show(go, data)
+    mData = data
+    uiobjs.LabelTitle.text = mData.title
+    if mData.type and mData.type == 1 then
+        SetActive(uiobjs.InputDate.gameObject, true)
+        SetActive(uiobjs.grid.gameObject, false)
+        uiobjs.InputDate.isSetTime = mData.isNeedTime or false
+        uiobjs.InputDate.isDateRange = mData.isDateRange or false
+        uiobjs.InputDateEl.value = mData.value
+    else
+        SetActive(uiobjs.InputDate.gameObject, false)
+        SetActive(uiobjs.grid.gameObject, true)
+        selectedCells = {}
+        cells = {}
+        CLUIUtl.resetList4Lua(uiobjs.grid, uiobjs.gridPrefab, mData.list, _cell.initCell)
+    end
+end
+
+function _cell.initCell(cell, data)
+    cell:init(data, _cell.onClickCell)
+    if data.value == -1 then
+        firstCell = cell
+    else
+        table.insert(cells, cell)
+    end
+end
+
+function _cell.onClickCell(cell, data)
+    data.selected = not data.selected
+    cell.luaTable.setSelect(data.selected)
+
+    if data.value == -1 then
+        -- 说明是全部
+        for i, v in ipairs(cells) do
+            v.luaTable.setSelect(data.selected)
+        end
+    else
+        local isAllSelected = true
+        for i, v in ipairs(cells) do
+            local d = v.luaTable.getData()
+            if not d.selected then
+                isAllSelected = false
+                break
+            end
+        end
+        if firstCell then
+            firstCell.luaTable.setSelect(isAllSelected)
+        end
+    end
+    mData.panel:refreshFilterBtnStatus()
+end
+
+-- 取得数据
+function _cell.getData()
+    return mData
+end
+
+function _cell.uiEventDelegate(go)
+    if go.name == "ButtonReset" then
+        -- 说明是全部
+        for i, v in ipairs(cells) do
+            v.luaTable.setSelect(false)
+        end
+        if uiobjs.InputDateEl then
+            uiobjs.InputDateEl.value = ""
+            mData.value = ""
+        end
+        mData.panel:refreshFilterBtnStatus()
+    elseif go.name == "InputDate" then
+        if mData.type == 1 then
+            mData.value = uiobjs.InputDateEl.value
+        end
+        mData.panel:refreshFilterBtnStatus()
+    end
+end
+--------------------------------------------
+return _cell
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellComFilterGroup.lua.meta
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellComFilterGroup.lua.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 8ae726fabf5f04108ad1086c8ffba0d5
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendFieldRoot.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendFieldRoot.lua
@@ -142,10 +142,9 @@ function _cell.getData()
    return mData
 end

-
 function _cell.OnDisable()
    if #(fieldsObjs) > 0 then
-        printe("动态加载的字段没有释放")
+        printe("动态加载的字段没有释放" .. csSelf.name)
    end
 end
 --------------------------------------------
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellOceanList.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellOceanList.lua
@@ -0,0 +1,43 @@
+-- xx单元
+local _cell = {}
+---@type Coolape.CLCellLua
+local csSelf = nil
+local transform = nil
+---@type _DBCust
+local mData = nil
+local uiobjs = {}
+
+-- 初始化，只调用一次
+function _cell.init(csObj)
+    csSelf = csObj
+    transform = csSelf.transform
+    ---@type UIPopupList
+    uiobjs.LabelStatus = getCC(transform, "LabelStatus", "UIPopupList")
+    ---@type CLUIFormRoot
+    uiobjs.formRoot = csSelf:GetComponent("CLUIFormRoot")
+    uiobjs.SpriteStatus = getChild(transform, "SpriteStatus")
+end
+
+-- 显示，
+-- 注意，c#侧不会在调用show时，调用refresh
+function _cell.show(go, data)
+    mData = data
+    mData._phoneNo = MyUtl.hidePhone(mData.phoneNo)
+    mData.lastFollowUpTime = isNilOrEmpty(mData.upTime) and "无" or mData.upTime
+    local optionInfor = DBCust.getFilter4Popup(DBCust.FilterGroup.dealFlagList)
+    uiobjs.LabelStatus:refreshItems(optionInfor.options, optionInfor.values)
+    uiobjs.formRoot:setValue(mData)
+    if tostring(mData.dealFlag) == "0" then
+        SetActive(uiobjs.SpriteStatus.gameObject, true)
+    else
+        SetActive(uiobjs.SpriteStatus.gameObject, false)
+    end
+end
+
+-- 取得数据
+function _cell.getData()
+    return mData
+end
+
+--------------------------------------------
+return _cell
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellOceanList.lua.meta
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellOceanList.lua.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: af56f0bbcec1a44f1ae7c33a79358445
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellOrderList.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellOrderList.lua
@@ -24,7 +24,7 @@ end
 -- 注意，c#侧不会在调用show时，调用refresh
 function _cell.show(go, data)
    mData = data
-    mData.money = mData.prodNum * mData.salePrice
+    -- mData.money = mData.prodNum * mData.salePrice
    mData._phoneNo = MyUtl.hidePhone(mData.phoneNo)
    local optionInfor = DBOrder.getPopupList(DBOrder.PopListGroup.orderStatus)
    uiobjs.LabelStatus:refreshItems(optionInfor.options, optionInfor.values)
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPStart.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPStart.lua
@@ -146,22 +146,26 @@ function CLLPStart.connectServer()
    -- Net.self:connect(selectedServer.host, bio2number(selectedServer.port))

    isLogined = true
-    NetProto.init(
-        function(success)
-            if success then
-                CLLPStart.showGuid()
-            else
-                CLUIUtl.showConfirm(
-                    "与服务器失去联系",
-                    false,
-                    "重试",
-                    CLLPStart.connectServer,
-                    "退出",
-                    function()
-                        Application.Quit()
+    CLLPStart.selectServer(
+        function()
+            NetProto.init(
+                function(success)
+                    if success then
+                        CLLPStart.showGuid()
+                    else
+                        CLUIUtl.showConfirm(
+                            "与服务器失去联系",
+                            false,
+                            "重试",
+                            CLLPStart.connectServer,
+                            "退出",
+                            function()
+                                Application.Quit()
+                            end
+                        )
                    end
-                )
-            end
+                end
+            )
        end
    )
 end
@@ -187,7 +191,8 @@ function CLLPStart.doEnterGame()
        NetProto.login(
            {
                phone = Prefs.getUserName(),
-                password = Prefs.getUserPsd()
+                password = Prefs.getUserPsd(),
+                model=SystemInfo.deviceModel
            },
            function(content, orgs)
                if content.success then
@@ -255,6 +260,33 @@ CLLPStart.showGuid = function()
    end
 end

+CLLPStart.selectServer = function(callback)
+    local userName = Prefs.getUserName()
+    if isNilOrEmpty(userName) then
+        Utl.doCallback(callback)
+        return
+    end
+    local url = Utl.urlAddTimes(PStr.b():a(CLVerManager.self.baseUrl):a("/whitList.json"):e())
+    WWWEx.get(
+        url,
+        CLAssetType.text,
+        function(content)
+            local map = json.decode(content)
+            if map[userName] then
+                getPanelAsy("PanelSelectServer", onLoadedPanelTT, {callback = callback})
+            else
+                Utl.doCallback(callback)
+            end
+        end,
+        function()
+            Utl.doCallback(callback)
+        end,
+        nil,
+        true,
+        1
+    )
+end
+
 CLLPStart.hideSplash = function()
    local p2 = CLPanelManager.getPanel("PanelSplash")
    if (p2 ~= nil) then
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPTasks.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPTasks.lua
@@ -157,6 +157,7 @@ function CSPTasks.setEventDelegate()
            getPanelAsy("PanelFollowList", onLoadedPanelTT)
        end,
        ButtonCustOcean = function()
+            getPanelAsy("PanelOceanList", onLoadedPanelTT)
        end,
        ButtonOrder = function()
            getPanelAsy("PanelOrderList", onLoadedPanelTT)
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPAbout.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPAbout.lua
@@ -41,13 +41,13 @@ function TRPAbout:initFiledsAttr()
    attr.donotJoinKey = true
    table.insert(self.baseFiledsAttr, attr)

-    attr = {}
-    attr.attrName = "发布评价"
-    attr.id = "assess"
-    attr.attrType = DBCust.FieldType.text
-    attr.ifMust = 0
-    attr.donotJoinKey = true
-    table.insert(self.baseFiledsAttr, attr)
+    -- attr = {}
+    -- attr.attrName = "发布评价"
+    -- attr.id = "assess"
+    -- attr.attrType = DBCust.FieldType.text
+    -- attr.ifMust = 0
+    -- attr.donotJoinKey = true
+    -- table.insert(self.baseFiledsAttr, attr)
 end

 -- 设置数据
@@ -80,13 +80,71 @@ end
 function TRPAbout:onClickField(el)
    if el.jsonKey == "upgrade" then
        -- 更新
+        self:upgrade()
    elseif el.jsonKey == "serviceAgreement" then
        -- 显示协议
+        local path =
+            joinStr(
+            CLPathCfg.self.basePath,
+            "/",
+            CLPathCfg.upgradeRes,
+            "/other/txt/",
+            CLPathCfg.self.platform,
+            "/serviceProto",
+            ".unity3d"
+        )
+        CLVerManager.self:getNewestRes(
+            path,
+            CLAssetType.assetBundle,
+            function(path, content, orgs)
+                if content then
+                    local msg = content.mainAsset and content.mainAsset.text or ""
+                    content:Unload(false)
+                    getPanelAsy(
+                        "PanelSysMsgDetail",
+                        onLoadedPanelTT,
+                        {PanelTitle = "服务协议", TITLE = "服务协议", CONTENT = msg}
+                    )
+                end
+            end,
+            true,
+            nil
+        )
    elseif el.jsonKey == "assess" then
-        -- 评价（这个做起来麻烦）
+    -- 评价（这个做起来麻烦）
    end
 end

+function TRPAbout:upgrade()
+    showHotWheel()
+    local oldVer = __version__
+    local onGetVer = function(content, orgs)
+        hideHotWheel()
+        local map = JSON.DecodeMap(content)
+        local newVer = MapEx.getString(map, "ver")
+        if (tonumber(newVer) > tonumber(oldVer)) then
+            local doUpgradeApp = function()
+                Application.OpenURL(MapEx.getString(map, "url"))
+            end
+            if MapEx.getBool(map, "force") then
+                CLUIUtl.showConfirm(LGet("MsgHadNewVerApp"), true, "更新", doUpgradeApp, "", nil)
+            else
+                CLUIUtl.showConfirm(LGet("MsgHadNewVerApp"), false, "更新", doUpgradeApp, "忽略", nil)
+            end
+        else
+            MyUtl.toastS("当前已经是最新版本 V" .. newVer)
+        end
+    end
+
+    local onGetVerError = function(msg, orgs)
+        hideHotWheel()
+        MyUtl.toastW("更新检查失败")
+    end
+
+    local chlCode = getChlCode()
+    local url = Utl.urlAddTimes(joinStr(CLVerManager.self.baseUrl, "/appVer.", chlCode, ".json"))
+    WWWEx.get(url, CLAssetType.text, onGetVer, onGetVerError, nil, true, 1)
+end
 function TRPAbout:onSelectField(go)
 end

@@ -98,7 +156,6 @@ end

 -- 刷新
 function TRPAbout:refresh()
-    uiobjs.TableLua.luaTable.release()
 end

 -- 关闭页面
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPComFilter.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPComFilter.lua
@@ -74,11 +74,15 @@ function TRPComFilter:refreshFilterBtnStatus()
 end

 function TRPComFilter:hadFilterVal()
-    for i,v in ipairs(self.list) do
-        for j, f in ipairs(v.list) do
-            if f.selected then
-                return true
+    for i, v in ipairs(self.list) do
+        if v.list then
+            for j, f in ipairs(v.list) do
+                if f.selected then
+                    return true
+                end
            end
+        elseif not isNilOrEmpty(v.value) then
+            return true
        end
    end
    return false
@@ -104,9 +108,14 @@ end

 function TRPComFilter:reset()
    uiobjs.InputSeachKey.value = ""
-    for i,v in ipairs(self.list) do
-        for j, f in ipairs(v.list) do
-            f.selected = false
+    ---@type _ParamCellCustFilterGroup
+    for i, v in ipairs(self.list) do
+        if v.list then
+            for j, f in ipairs(v.list) do
+                f.selected = false
+            end
+        else
+            v.value = ""
        end
    end
    CLUIUtl.resetList4Lua(uiobjs.Table, uiobjs.prefab, self.list, self:wrapFunc(self.initCell))
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPConnect.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPConnect.lua
@@ -30,7 +30,7 @@ function TRPConnect.show()
    local phone = Prefs.getUserName()
    local currGroup = Prefs.getCurrGroup(Prefs.getUserName())
    companyInfro = json.decode(currGroup)
-    DBUser.onGetUsers(companyInfro.loginNoList, companyInfro.groupInfoList) -- 缓存工号相关信息
+    DBUser.onGetUsers(companyInfro.loginNoList, companyInfro.groupInfoList, companyInfro.rolePermissions) -- 缓存工号相关信息
    NetProto.socketInit(companyInfro.company_id, companyInfro.login_no, companyInfro.group_id)
 end

@@ -88,6 +88,7 @@ function TRPConnect.getDataFromServer()
    NetProto.send.booking_query()
    NetProto.send.replenish_query()
    NetProto.send.load_wfTicket_Settings()
+    NetProto.send.loadProductType()
 end

 -- 处理ui上的事件，例如点击等
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustDetail.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustDetail.lua
@@ -97,7 +97,7 @@ function TRPCustDetail:prepareMoreData()
    attr.donotJoinKey = true
    table.insert(self.moreProcList, attr)
    --------------------------------------------
-    
+
    self.sysFields = {}
    ---@type _ParamFieldAttr
    local attr = {}
@@ -359,21 +359,20 @@ function TRPCustDetail:showOrders()
        )
    else
        showHotWheel()
-        -- //TODO:
-        MyUtl.toastW("TODO:取何取得单个客户的订单？？？")
-        NetProto.send.query_cust_calllog(self.mdata.phoneNo, nil, 1)
+        NetProto.send.workFlowQuery({custId = self.mdata.custId}, "", 1)
        uiobjs.OrderRoot:setList({}, self:wrapFunc(self.initOrderCell))
    end

-    uiobjs.Table:Reposition()
-    uiobjs.scrollView.disableDragIfFits = false
-    uiobjs.scrollView:ResetPosition()
+    self:reposition()
 end

 function TRPCustDetail:initOrderCell(cell, data)
-    cell:init(data, nil)
+    cell:init(data, self:wrapFunc(self.onClickOrderCell))
 end

+function TRPCustDetail:onClickOrderCell(cell, data)
+    getPanelAsy("PanelOrderDetail", onLoadedPanelTT, data)
+end
 function TRPCustDetail:onOrderHeadList(head)
    printw("到最顶端了")
 end
@@ -383,7 +382,7 @@ function TRPCustDetail:onOrderEndList(tail)
    if self.orders and self.orders.meta.current_page < self.orders.meta.total_pages then
        showHotWheel()
        -- //TODO:取得下一页
-        NetProto.send.query_cust_calllog(self.mdata.phoneNo, nil, self.orders.meta.current_page + 1)
+        NetProto.send.workFlowQuery({custId = self.mdata.custId}, "", self.orders.meta.current_page + 1)
    else
        uiobjs.ButtonEndListOrder.localPosition = tail.transform.localPosition + Vector3.up * -270
        SetActive(uiobjs.ButtonEndListOrder.gameObject, true)
@@ -434,7 +433,7 @@ function TRPCustDetail:onClickMoreProc(el)
    elseif el.jsonKey == "smsList" then
        -- 短信记录
    elseif el.jsonKey == "opList" then
-        -- 操作记录
+    -- 操作记录
    end
 end

@@ -449,6 +448,9 @@ function TRPCustDetail:release()
    if uiobjs.MoreRoot.luaTable then
        uiobjs.MoreRoot.luaTable.release()
    end
+    if uiobjs.SysRoot.luaTable then
+        uiobjs.SysRoot.luaTable.release()
+    end
    self.hasSetMoreProc = false
 end

@@ -481,11 +483,39 @@ function TRPCustDetail:procNetwork(cmd, succ, msg, paras)
                    uiobjs.Records:appendList(result.data)
                end
            end
+        elseif cmd == NetProto.cmds.workFlowQuery then
+            local result = paras.result
+            if self.orders == nil then
+                self.orders = result
+            else
+                if self.orders.meta.current_page < result.meta.current_page then
+                    self.orders.meta = result.meta
+                    for i, v in ipairs(result.data) do
+                        table.insert(self.orders.data, v)
+                    end
+                end
+            end
+
+            hideHotWheel()
+            if self.orders and uiobjs.OrderRoot.gameObject.activeInHierarchy then
+                if self.orders.meta.current_page == 1 then
+                    self:showOrders()
+                else
+                    uiobjs.OrderRoot:appendList(result.data)
+                end
+            end
        elseif cmd == NetProto.cmds.update_customer then
            if self.currToggle == 1 then
                self:showDetail()
                uiobjs.Head:setValue(self.mdata)
            end
+        elseif cmd == NetProto.cmds.delCustomerInfo or cmd == NetProto.cmds.backToGH then
+            hideTopPanel(self.csSelf)
+        elseif cmd == NetProto.cmds.createWfInfo then
+            self.orders = nil
+            if self.currToggle == 3 then
+                self:showOrders()
+            end
        end
    end
 end
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustList.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustList.lua
@@ -97,10 +97,15 @@ function TRPCustList:show()
 end

 function TRPCustList:showList(list)
+    list = list or {}
    SetActive(uiobjs.ButtonHeadList.gameObject, false)
-    SetActive(uiobjs.ButtonEndList.gameObject, false)
+    if #list > 0 then
+        SetActive(uiobjs.ButtonEndList.gameObject, false)
+    else
+        SetActive(uiobjs.ButtonEndList.gameObject, true)
+    end
    uiobjs.Grid:setList(
-        list or {},
+        list,
        self:wrapFunc(self.initCell),
        self:wrapFunc(self.onHeadList),
        self:wrapFunc(self.onEndList)
@@ -202,6 +207,8 @@ function TRPCustList:procNetwork(cmd, succ, msg, paras)
            uiobjs.Grid:refreshContentOnly()
        elseif cmd == NetProto.cmds.save_customer then
            self:refreshList()
+        elseif cmd == NetProto.cmds.delCustomerInfo or cmd == NetProto.cmds.backToGH then
+            self:refreshList()
        end
    end
 end
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPFollowList.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPFollowList.lua
@@ -7,6 +7,7 @@ local uiobjs = {}
 -- 初始化，只会调用一次
 function TRPFollowList:init(csObj)
    TRPFollowList.super.init(self, csObj)
+    self:initFilters()
    self:setEventDelegate()
    MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132 + 132 + 40, 0)
    uiobjs.InputSeachKey = getCC(self.transform, "Top/InputSeachKey", "UIInput")
@@ -26,6 +27,61 @@ function TRPFollowList:init(csObj)
    uiobjs.ButtonHeadList = getChild(uiobjs.Grid.transform, "ButtonHeadList")
 end

+function TRPFollowList:initFilters()
+    self.filters = {}
+    ---@type _ParamCellCustFilterGroup
+    local d = {}
+
+    d = {}
+    d.title = "跟进时间"
+    d.key = "dateRange"
+    d.key2 = "dateRange"
+    d.type = 1
+    d.isDateRange = true
+    d.isNeedTime = true
+    table.insert(self.filters, d)
+
+    d = {}
+    d.title = "跟进类型"
+    d.key = DBCust.FilterGroup.followUpTypeList
+    d.key2 = "followTypeUp"
+    d.list = DBCust.getFilter(DBCust.FilterGroup.followUpTypeList)
+    if d.list and #(d.list) > 0 then
+        -- table.insert(d.list, 1, {name = "全部", value = -1})
+        table.insert(self.filters, d)
+    end
+
+    d = {}
+    d.title = "跟进类型"
+    d.key = DBCust.FilterGroup.followUpTypeList
+    d.key2 = "followTypeUp"
+    d.list = DBCust.getFilter(DBCust.FilterGroup.followUpTypeList)
+    if d.list and #(d.list) > 0 then
+        -- table.insert(d.list, 1, {name = "全部", value = -1})
+        table.insert(self.filters, d)
+    end
+
+    d = {}
+    d.title = "商机"
+    d.key = DBCust.FilterGroup.opportunityList
+    d.key2 = "opportunity"
+    d.list = DBCust.getFilter(DBCust.FilterGroup.opportunityList)
+    if d.list and #(d.list) > 0 then
+        -- table.insert(d.list, 1, {name = "全部", value = -1})
+        table.insert(self.filters, d)
+    end
+
+    d = {}
+    d.title = "跟进人员"
+    d.key = "loginNos"
+    d.key2 = "loginNos"
+    d.list = DBUser.getFilters(DBUser.FilterGroup.user)
+    if d.list and #(d.list) > 0 then
+        -- table.insert(d.list, 1, {name = "全部", value = -1})
+        table.insert(self.filters, d)
+    end
+end
+
 -- 设置数据
 ---@param paras _ParamTRPFollowList
 function TRPFollowList:setData(paras)
@@ -42,8 +98,13 @@ function TRPFollowList:show()
 end

 function TRPFollowList:showList(list)
+    list = list or {}
    SetActive(uiobjs.ButtonHeadList.gameObject, false)
-    SetActive(uiobjs.ButtonEndList.gameObject, false)
+    if #list > 0 then
+        SetActive(uiobjs.ButtonEndList.gameObject, false)
+    else
+        SetActive(uiobjs.ButtonEndList.gameObject, true)
+    end
    uiobjs.Grid:setList(
        list or {},
        self:wrapFunc(self.initCell),
@@ -114,10 +175,14 @@ end

 function TRPFollowList:hadFilterVal()
    for i, v in ipairs(self.filters or {}) do
-        for j, f in ipairs(v.list) do
-            if f.selected then
-                return true
+        if v.list then
+            for j, f in ipairs(v.list) do
+                if f.selected then
+                    return true
+                end
            end
+        elseif not isNilOrEmpty(v.value) then
+            return true
        end
    end
    if self.startTime then
@@ -154,7 +219,7 @@ function TRPFollowList:setEventDelegate()
    self.EventDelegate = {
        ButtonFilter = function()
            getPanelAsy(
-                "PanelFollowFilter",
+                "PanelComFilter",
                onLoadedPanelTT,
                {
                    callback = self:wrapFunc(self.onSetFilter),
@@ -178,21 +243,24 @@ function TRPFollowList:getFilterStr()
    local ret = {}
    for i, g in ipairs(self.filters) do
        local list = {}
-        for j, f in ipairs(g.list) do
-            if f.selected and f.value ~= -1 then
-                if g.key == DBCust.FilterGroup.opportunityList or g.key == DBCust.FilterGroup.followUpTypeList then
-                    table.insert(list, f.name)
-                else
-                    table.insert(list, f.value)
+        if g.list then
+            for j, f in ipairs(g.list) do
+                if f.selected and f.value ~= -1 then
+                    if g.key == DBCust.FilterGroup.opportunityList or g.key == DBCust.FilterGroup.followUpTypeList then
+                        table.insert(list, f.name)
+                    else
+                        table.insert(list, f.value)
+                    end
                end
            end
+            ret[g.key2] = table.concat(list, ",")
+        elseif g.key == "dateRange" then
+            if not isNilOrEmpty(g.value) then
+                local strs = strSplit(g.value, "~")
+                ret.startTime = strs[1]
+                ret.endTime = strs[2]
+            end
        end
-        ret[g.key2] = table.concat(list, ",")
-    end
-
-    if self.startTime then
-        ret.startTime = self.startTime
-        ret.endTime = self.endTime
    end
    return ret
 end
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPMoreProc4Cust.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPMoreProc4Cust.lua
@@ -1,5 +1,4 @@
-
---@type IDBasePanel
+---@type IDBasePanel
 local TRBasePanel = require("ui.panel.TRBasePanel")
 ---@class TRPMoreProc4Cust:TRBasePanel 邮件列表
 local TRPMoreProc4Cust = class("TRPMoreProc4Cust", TRBasePanel)
@@ -15,6 +14,7 @@ end
 -- 设置数据
 ---@param paras _ParamTRPMoreProc4Cust
 function TRPMoreProc4Cust:setData(paras)
+    ---@type _DBCust
    self.mdata = paras
 end

@@ -33,10 +33,10 @@ end
 -- 网络请求的回调；cmd：指命，succ：成功失败，msg：消息；paras：服务器下行数据
 function TRPMoreProc4Cust:procNetwork(cmd, succ, msg, paras)
    if (succ == NetSuccess) then
-        --[[
-        if cmd == xx then
+        if cmd == NetProto.cmds.delCustomerInfo or cmd == NetProto.cmds.backToGH then
+            hideHotWheel()
+            hideTopPanel(self.csSelf)
        end
-        ]]
    end
 end

@@ -51,6 +51,14 @@ function TRPMoreProc4Cust:setEventDelegate()
        ButtonSendSM = function()
        end,
        ButtonMovetoOcean = function()
+            MyUtl.confirm(
+                "确定要将客户移到公海？",
+                function()
+                    showHotWheel()
+                    NetProto.send.backToGH(self.mdata.custId)
+                end,
+                "确认"
+            )
        end,
        ButtonGetCust = function()
        end,
@@ -62,7 +70,15 @@ function TRPMoreProc4Cust:setEventDelegate()
        ButtonCheckIn = function()
        end,
        ButtonDelCust = function()
-        end,
+            MyUtl.confirm(
+                "确定要删除客户？",
+                function()
+                    showHotWheel()
+                    NetProto.send.delCustomerInfo(self.mdata.custId)
+                end,
+                "确认删除"
+            )
+        end
    }
 end
 -- 处理ui上的事件，例如点击等
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewFollow.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewFollow.lua
@@ -57,6 +57,7 @@ function TRPNewFollow:initFiledsAttr()
    attr.id = ""
    attr.attrType = DBCust.FieldType.dateTime
    attr.ifMust = 1
+    attr.ifTime = 1
    attr.donotJoinKey = true
    table.insert(self.baseFiledsAttr, attr)

@@ -149,9 +150,12 @@ function TRPNewFollow:onPopupFieldValChg(go)
    ---@type CLUIElement
    local el = go:GetComponent("CLUIElement")
    if el.jsonKey == "dealFlag" then
-        if uiobjs.followUpContent and isNilOrEmpty(uiobjs.followUpContent.value) then
+        if uiobjs.followUpContent then
            local popList = go:GetComponent("UIPopupList")
-            uiobjs.followUpContent.value = popList.selectedItem
+            if isNilOrEmpty(uiobjs.followUpContent.value) or self.oldselectedItem == uiobjs.followUpContent.value then
+                uiobjs.followUpContent.value = popList.selectedItem
+                self.oldselectedItem = popList.selectedItem
+            end
        end
    end
 end
@@ -167,6 +171,7 @@ end

 -- 关闭页面
 function TRPNewFollow:hide()
+    self.oldselectedItem = nil
    if uiobjs.DetailRoot.luaTable then
        uiobjs.DetailRoot.luaTable.release()
    end
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewFollowSimple.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewFollowSimple.lua
@@ -88,6 +88,7 @@ function TRPNewFollowSimple:showBaseFields()
    local param = {}
    param.data = self.mdata or {}
    param.onFinish = self:wrapFunc(self.setExtendFieldsMode)
+    param.onLoadOneField = self:wrapFunc(self.onLoadOneField)
    param.fields = {}
    ---@type _ParamCellExtendFiled
    local filedInfor
@@ -111,9 +112,12 @@ function TRPNewFollowSimple:onPopupFieldValChg(go)
    ---@type CLUIElement
    local el = go:GetComponent("CLUIElement")
    if el.jsonKey == "dealFlag" then
-        if uiobjs.followUpContent and isNilOrEmpty(uiobjs.followUpContent.value) then
+        if uiobjs.followUpContent  then
            local popList = go:GetComponent("UIPopupList")
-            uiobjs.followUpContent.value = popList.selectedItem
+            if isNilOrEmpty(uiobjs.followUpContent.value) or self.oldselectedItem == uiobjs.followUpContent.value then
+                uiobjs.followUpContent.value = popList.selectedItem
+                self.oldselectedItem = popList.selectedItem
+            end
        end
    end
 end
@@ -123,14 +127,17 @@ function TRPNewFollowSimple:reposition()
    uiobjs.Table.repositionNow = true
 end

+function TRPNewFollowSimple:onLoadOneField(cell)
+    local el = cell:GetComponent("CLUIElement")
+    if el and el.jsonKey == "followUpContent" then
+        uiobjs.followUpContent = el
+    end
+end
+
 function TRPNewFollowSimple:setExtendFieldsMode(root)
    local elements = root:GetComponentsInChildren(typeof(CLUIElement), true)
    for i = 0, elements.Length - 1 do
        self:setElementMode(elements[i])
-        if elements[i].jsonKey == "followUpContent" then
-            ---@type CLUIElement
-            uiobjs.followUpContent = elements[i]
-        end
    end
    self:reposition()
 end
@@ -181,6 +188,7 @@ end

 -- 关闭页面
 function TRPNewFollowSimple:hide()
+    self.oldselectedItem = nil
    if uiobjs.DetailRoot.luaTable then
        uiobjs.DetailRoot.luaTable.release()
    end
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewOrder.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewOrder.lua
@@ -538,6 +538,11 @@ function TRPNewOrder:setEventDelegate()
                order.attrJson = attrJson
            end
            if uiobjs.StepFormRoot.gameObject.activeInHierarchy then
+                err = joinStr(err, uiobjs.StepFormRoot:checkValid())
+                if not isNilOrEmpty(err) then
+                    MyUtl.toastW(err)
+                    return
+                end
                order = uiobjs.StepFormRoot:getValue(order, true)
            end
            local templateInfor = DBOrder.getTemplateInfor(order.templetId)
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOceanList.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOceanList.lua
@@ -0,0 +1,287 @@
+---@type IDBasePanel
+local TRBasePanel = require("ui.panel.TRBasePanel")
+---@class TRPOceanList:TRBasePanel
+local TRPOceanList = class("TRPOceanList", TRBasePanel)
+
+local uiobjs = {}
+-- 初始化，只会调用一次
+function TRPOceanList:init(csObj)
+    TRPOceanList.super.init(self, csObj)
+    self:setEventDelegate()
+    self:initFilters()
+    MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132 + 132 + 40, 0)
+    uiobjs.InputSeachKey = getCC(self.transform, "Top/InputSeachKey", "UIInput")
+    uiobjs.ButtonFilterSp = getCC(self.transform, "Top/ButtonFilter", "UISprite")
+    uiobjs.ButtonFilterLb = getCC(uiobjs.ButtonFilterSp.transform, "Label", "UILabel")
+    ---@type CLUIScrollViewWithEvent
+    uiobjs.scrollView = getCC(self.transform, "PanelContent", "CLUIScrollViewWithEvent")
+    uiobjs.scrollView:init(
+        self:wrapFunc(self.onShowRefreshFlg),
+        self:wrapFunc(self.onhideRefreshFlg),
+        self:wrapFunc(self.refreshList)
+    )
+    ---@type Coolape.CLUILoopGrid
+    uiobjs.Grid = getCC(uiobjs.scrollView.transform, "Grid", "CLUILoopGrid")
+    uiobjs.ButtonEndList = getChild(uiobjs.Grid.transform, "ButtonEndList")
+    uiobjs.ButtonEndListLb = getCC(uiobjs.ButtonEndList, "Label", "UILabel")
+    uiobjs.ButtonHeadList = getChild(uiobjs.Grid.transform, "ButtonHeadList")
+end
+
+function TRPOceanList:initFilters()
+    self.filters = {}
+    ---@type _ParamCellCustFilterGroup
+    local d = {}
+    d.title = "创建时间"
+    d.key = "createTime"
+    d.key2 = "createTime"
+    d.type = 1
+    d.isDateRange = true
+    d.isNeedTime = true
+    table.insert(self.filters, d)
+
+    d = {}
+    d.title = "更新时间"
+    d.key = "updateTime"
+    d.key2 = "updateTime"
+    d.type = 1
+    d.isDateRange = true
+    d.isNeedTime = true
+    table.insert(self.filters, d)
+
+    d = {}
+    d.title = "任务名称"
+    d.key = DBCust.FilterGroup.taskList
+    d.key2 = "taskId"
+    d.list = DBCust.getFilter(DBCust.FilterGroup.taskList)
+    if #(d.list) > 0 then
+        -- table.insert(d.list, 1, {name = "全部", value = -1})
+        table.insert(self.filters, d)
+    end
+
+    d = {}
+    d.title = "跟进阶段"
+    d.key = DBCust.FilterGroup.dealFlagList
+    d.key2 = "payStatus"
+    d.list = DBCust.getFilter(DBCust.FilterGroup.dealFlagList)
+    if #(d.list) > 0 then
+        -- table.insert(d.list, 1, {name = "全部", value = -1})
+        table.insert(self.filters, d)
+    end
+end
+
+function TRPOceanList:resetFilters()
+    for i, v in ipairs(self.filters) do
+        v.selected = false
+    end
+end
+
+-- 设置数据
+---@param paras _ParamTRPOceanList
+function TRPOceanList:setData(paras)
+    self.mdata = paras
+end
+
+-- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh
+function TRPOceanList:show()
+    uiobjs.InputSeachKey.value = ""
+    self:resetFilters()
+    self:refreshFilterBtnStatus()
+    self:showList({})
+    showHotWheel()
+    NetProto.send.pageGHQueryList(self.filterValue, "", 1)
+end
+
+function TRPOceanList:showList(list)
+    list = list or {}
+    SetActive(uiobjs.ButtonHeadList.gameObject, false)
+    if #list > 0 then
+        SetActive(uiobjs.ButtonEndList.gameObject, false)
+    else
+        SetActive(uiobjs.ButtonEndList.gameObject, true)
+    end
+    uiobjs.Grid:setList(
+        list or {},
+        self:wrapFunc(self.initCell),
+        self:wrapFunc(self.onHeadList),
+        self:wrapFunc(self.onEndList)
+    )
+    uiobjs.scrollView:ResetPosition()
+end
+
+function TRPOceanList:appList(list)
+    SetActive(uiobjs.ButtonEndList.gameObject, false)
+    uiobjs.Grid:appendList(list)
+end
+
+function TRPOceanList:onShowRefreshFlg()
+    -- printe("TRPOceanList:onShowRefreshFlg")
+    uiobjs.ButtonHeadList.transform.localPosition = Vector3(0, 222, 0)
+    SetActive(uiobjs.ButtonHeadList.gameObject, true)
+end
+function TRPOceanList:onhideRefreshFlg()
+    -- printe("TRPOceanList:onhideRefreshFlg")
+    SetActive(uiobjs.ButtonHeadList.gameObject, false)
+end
+function TRPOceanList:refreshList()
+    local queryKey = uiobjs.InputSeachKey.value
+    showHotWheel()
+    NetProto.send.pageGHQueryList(self.filterValue, queryKey, 1)
+end
+
+function TRPOceanList:onHeadList(head)
+    printw("到最顶端了")
+    -- uiobjs.ButtonHeadList.transform.localPosition = Vector3(0, 250, 0)
+    -- SetActive(uiobjs.ButtonHeadList.gameObject, true)
+end
+
+function TRPOceanList:onEndList(tail)
+    printw("到最后了==" .. tail.name)
+    if self.pageInfo and self.pageInfo.current_page < self.pageInfo.total_pages then
+        local queryKey = uiobjs.InputSeachKey.value
+        showHotWheel()
+        -- 取得下一页
+        NetProto.send.pageGHQueryList(self.filterValue, queryKey, self.pageInfo.current_page + 1)
+    else
+        uiobjs.ButtonEndList.localPosition = tail.transform.localPosition + Vector3.up * -235
+        SetActive(uiobjs.ButtonEndList.gameObject, true)
+    end
+end
+
+function TRPOceanList:initCell(cell, data)
+    cell:init(data, self:wrapFunc(self.onClickCell))
+end
+
+function TRPOceanList:onClickCell(cell, data)
+    getPanelAsy("PanelOrderDetail", onLoadedPanelTT, data)
+end
+
+function TRPOceanList:refreshFilterBtnStatus()
+    if self:hadFilterVal() then
+        uiobjs.ButtonFilterLb.color = ColorEx.getColor(0xff2990dc)
+        uiobjs.ButtonFilterSp.color = ColorEx.getColor(0xff2990dc)
+        uiobjs.ButtonFilterSp.spriteName = "cust_funnel"
+    else
+        uiobjs.ButtonFilterLb.color = ColorEx.getColor(0xff999999)
+        uiobjs.ButtonFilterSp.color = ColorEx.getColor(0xff999999)
+        uiobjs.ButtonFilterSp.spriteName = "cust_screen"
+    end
+end
+
+function TRPOceanList:hadFilterVal()
+    for i, v in ipairs(self.filters or {}) do
+        if v.list then
+            for j, f in ipairs(v.list) do
+                if f.selected then
+                    return true
+                end
+            end
+        elseif not isNilOrEmpty(v.value) then
+            return true
+        end
+    end
+
+    return false
+end
+-- 刷新
+function TRPOceanList:refresh()
+end
+
+-- 关闭页面
+function TRPOceanList:hide()
+    self.filterValue = nil
+end
+
+-- 网络请求的回调；cmd：指命，succ：成功失败，msg：消息；paras：服务器下行数据
+function TRPOceanList:procNetwork(cmd, succ, msg, paras)
+    if (succ == NetSuccess) then
+        if cmd == NetProto.cmds.pageGHQueryList then
+            local result = paras.result or {}
+            self.pageInfo = result.meta
+            if self.pageInfo and self.pageInfo.current_page > 1 then
+                self:appList(result.data)
+            else
+                self:showList(result.data)
+            end
+            hideHotWheel()
+        elseif cmd == NetProto.cmds.update_customer then
+            uiobjs.Grid:refreshContentOnly()
+        elseif cmd == NetProto.cmds.save_customer then
+            self:refreshList()
+        end
+    end
+end
+
+function TRPOceanList:setEventDelegate()
+    self.EventDelegate = {
+        ButtonFilter = function()
+            getPanelAsy(
+                "PanelComFilter",
+                onLoadedPanelTT,
+                {
+                    title = "订单筛选",
+                    callback = self:wrapFunc(self.onSetFilter),
+                    queryKey = uiobjs.InputSeachKey.value,
+                    defautFilter = self.filters
+                }
+            )
+        end,
+        InputSeachKey = function()
+            local queryKey = uiobjs.InputSeachKey.value
+            NetProto.send.pageGHQueryList(self.filterValue, queryKey, 1)
+        end
+    }
+end
+
+function TRPOceanList:getFilterStr()
+    if not self.filters then
+        return ""
+    end
+    local ret = {}
+    for i, g in ipairs(self.filters) do
+        if g.list then
+            local list = {}
+            for j, f in ipairs(g.list) do
+                if f.selected and f.value ~= -1 then
+                    table.insert(list, f.value)
+                end
+            end
+            ret[g.key2] = table.concat(list, ",")
+        elseif g.key == "createTime" then
+            --//TODO:
+        elseif g.key == "updateTime" then
+            --//TODO:
+        end
+    end
+    return ret
+end
+
+function TRPOceanList:onSetFilter(filters, queryKey)
+    local oldqueryKey = uiobjs.InputSeachKey.value
+    uiobjs.InputSeachKey.value = queryKey
+    self.filters = filters
+    self:refreshFilterBtnStatus()
+    local queryKey = uiobjs.InputSeachKey.value
+    queryKey = trim(queryKey)
+    showHotWheel()
+    self.filterValue = self:getFilterStr()
+    if oldqueryKey == queryKey then
+        NetProto.send.pageGHQueryList(self.filterValue, queryKey, 1)
+    else
+        -- 会触发input的onChange事件
+    end
+end
+
+-- 处理ui上的事件，例如点击等
+function TRPOceanList:uiEventDelegate(go)
+    local func = self.EventDelegate[go.name]
+    if func then
+        func()
+    end
+end
+
+-- 当顶层页面发生变化时回调
+function TRPOceanList:onTopPanelChange(topPanel)
+end
+
+--------------------------------------------
+return TRPOceanList
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOceanList.lua.meta
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOceanList.lua.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 6b28699b6e85042abbe39aeb10d1bcf5
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOrderList.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOrderList.lua
@@ -103,8 +103,13 @@ function TRPOrderList:show()
 end

 function TRPOrderList:showList(list)
+    list = list or {}
    SetActive(uiobjs.ButtonHeadList.gameObject, false)
-    SetActive(uiobjs.ButtonEndList.gameObject, false)
+    if #list > 0 then
+        SetActive(uiobjs.ButtonEndList.gameObject, false)
+    else
+        SetActive(uiobjs.ButtonEndList.gameObject, true)
+    end
    uiobjs.Grid:setList(
        list or {},
        self:wrapFunc(self.initCell),
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPProductList.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPProductList.lua
@@ -44,7 +44,11 @@ function TRPProductList:showList(products)
    uiobjs.Grid:setList(list, self:wrapFunc(self.initCell), nil, self:wrapFunc(self.onEndList))
    uiobjs.scrollView:ResetPosition()
 end
-function TRPProductList:appList(list)
+function TRPProductList:appList(products)
+    local list = {}
+    for i, v in ipairs(products or {}) do
+        table.insert(list, {data = v, isSelected = false})
+    end
    SetActive(uiobjs.ButtonEndList.gameObject, false)
    uiobjs.Grid:appendList(list)
 end
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSelectServer.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSelectServer.lua
@@ -0,0 +1,74 @@
+---@type IDBasePanel
+local TRBasePanel = require("ui.panel.TRBasePanel")
+---@class TRPSelectServer:TRBasePanel 邮件列表
+local TRPSelectServer = class("TRPSelectServer", TRBasePanel)
+
+local uiobjs = {}
+-- 初始化，只会调用一次
+function TRPSelectServer:init(csObj)
+    TRPSelectServer.super.init(self, csObj)
+
+    self:setEventDelegate()
+end
+
+-- 设置数据
+---@param paras _ParamTRPSelectServer
+function TRPSelectServer:setData(paras)
+    self.mdata = paras
+end
+
+-- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh
+function TRPSelectServer:show()
+end
+
+-- 刷新
+function TRPSelectServer:refresh()
+end
+
+-- 关闭页面
+function TRPSelectServer:hide()
+end
+
+-- 网络请求的回调；cmd：指命，succ：成功失败，msg：消息；paras：服务器下行数据
+function TRPSelectServer:procNetwork(cmd, succ, msg, paras)
+    if (succ == NetSuccess) then
+    --[[
+        if cmd == xx then
+        end
+        ]]
+    end
+end
+
+function TRPSelectServer:setEventDelegate()
+    self.EventDelegate = {
+        ButtonServer = function()
+            hideTopPanel(self.csSelf)
+            NetProto.setSeverPublish()
+            Utl.doCallback(self.mdata.callback)
+        end,
+        ButtonServerDev = function()
+            hideTopPanel(self.csSelf)
+            NetProto.setSeverDev()
+            Utl.doCallback(self.mdata.callback)
+        end,
+        ButtonServerLoc = function()
+            hideTopPanel(self.csSelf)
+            NetProto.setSeverLocal()
+            Utl.doCallback(self.mdata.callback)
+        end
+    }
+end
+-- 处理ui上的事件，例如点击等
+function TRPSelectServer:uiEventDelegate(go)
+    local func = self.EventDelegate[go.name]
+    if func then
+        func()
+    end
+end
+
+-- 当顶层页面发生变化时回调
+function TRPSelectServer:onTopPanelChange(topPanel)
+end
+
+--------------------------------------------
+return TRPSelectServer
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSelectServer.lua.meta
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSelectServer.lua.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 382b52baaa31844a1b2c2fda33397c5e
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSysMsgDetail.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSysMsgDetail.lua
@@ -1,6 +1,6 @@
 ---@type IDBasePanel
 local TRBasePanel = require("ui.panel.TRBasePanel")
---@class TRPSysMsgDetail:TRBasePanel 邮件列表
+---@class TRPSysMsgDetail:TRBasePanel
 local TRPSysMsgDetail = class("TRPSysMsgDetail", TRBasePanel)

 local uiobjs = {}
@@ -25,10 +25,22 @@ function TRPSysMsgDetail:setData(paras)
    self.mdata = paras
 end

+---public 当有通用背板显示时的回调
+---@param cs Coolape.CLPanelLua
+function TRPSysMsgDetail:onShowFrame(cs)
+    if cs.frameObj then
+        ---@type _BGFrame1Param
+        local d = {}
+        -- d.title = LGet(cs.titleKeyName)
+        d.title = self.mdata.PanelTitle or "公告详情"
+        d.panel = cs
+        cs.frameObj:init(d)
+    end
+end
 -- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh
 function TRPSysMsgDetail:show()
    self.uiobjs.LabelContent.text = joinStr("　", self.mdata.CONTENT)
-    self.uiobjs.LabelTime.text = DateEx.formatByMs(tonumber(self.mdata.CREATETIME) * 1000)
+    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.scrollView:ResetPosition()
 end
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputDate.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputDate.prefab
@@ -387,6 +387,13 @@ MonoBehaviour:
      field: 
      name: 
    oneShot: 0
+  - mTarget: {fileID: 4665338699303856003}
+    mMethodName: OnValueChg
+    mParameters:
+    - obj: {fileID: 0}
+      field: 
+      name: 
+    oneShot: 0
 --- !u!114 &7375490486847536484
 MonoBehaviour:
  m_ObjectHideFlags: 0
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputPoplist.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputPoplist.prefab
@@ -229,6 +229,13 @@ MonoBehaviour:
      field: 
      name: paras
    oneShot: 0
+  - mTarget: {fileID: 8547632661248865796}
+    mMethodName: OnValueChg
+    mParameters:
+    - obj: {fileID: 0}
+      field: 
+      name: go
+    oneShot: 0
  mSelectedItem: 
  mPanel: {fileID: 0}
  mChild: {fileID: 0}
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputTime.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputTime.prefab
@@ -115,7 +115,7 @@ Transform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 2023978223955727508}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  m_LocalPosition: {x: 0, y: 30, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
@@ -257,7 +257,14 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: c3cdf5f2b8d8745a69ee31dc45d16005, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  onChange: []
+  onChange:
+  - mTarget: {fileID: 6931577314366637404}
+    mMethodName: OnValueChg
+    mParameters:
+    - obj: {fileID: 0}
+      field: 
+      name: 
+    oneShot: 0
 --- !u!114 &5103833499522604987
 MonoBehaviour:
  m_ObjectHideFlags: 0
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelAbout.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelAbout.prefab
@@ -393,9 +393,6 @@ GameObject:
  - component: {fileID: 3377653671809927871}
  - component: {fileID: 3377653671809927869}
  - component: {fileID: 3377653671809927870}
-  - component: {fileID: 4975592500484722759}
-  - component: {fileID: 7628694758041971091}
-  - component: {fileID: 5704952207260630023}
  m_Layer: 5
  m_Name: SpriteTopbg
  m_TagString: Untagged
@@ -485,89 +482,6 @@ MonoBehaviour:
  widget: {fileID: 3377653671809927869}
  offset: 0
  sizeAdjust: 1
--- !u!65 &4975592500484722759
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3377653671809927864}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Size: {x: 1125, y: 500, z: 0}
-  m_Center: {x: 0, y: -250, z: 0}
--- !u!114 &7628694758041971091
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3377653671809927864}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 57e428c9b6087304da439ec665b56a2d, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  atlasName: 
-  atlas: {fileID: 8379920634462272047, guid: 9aea3d2b5a77f4e84bd921688ff9ca99, type: 3}
-  fontName: 
-  bitmapFont: {fileID: 0}
-  trueTypeFont: {fileID: 12800000, guid: e49e0253465a54d1a83f684649c927ae, type: 3}
-  fontSize: 46
-  fontStyle: 0
-  backgroundSprite: cust_right
-  highlightSprite: cust_right
-  position: 0
-  alignment: 1
-  items:
-  - "\u62CD\u7167"
-  - "\u4ECE\u76F8\u518C\u9009\u62E9"
-  valueItems:
-  - 1
-  - 2
-  padding: {x: 4, y: 4}
-  textColor: {r: 1, g: 1, b: 1, a: 1}
-  backgroundColor: {r: 1, g: 1, b: 1, a: 1}
-  highlightColor: {r: 0.88235295, g: 0.78431374, b: 0.5882353, a: 1}
-  isAnimated: 1
-  isLocalized: 0
-  openOn: 0
-  onChange: []
-  mSelectedItem: "\u62CD\u7167"
-  mPanel: {fileID: 0}
-  mChild: {fileID: 0}
-  mBackground: {fileID: 0}
-  mHighlight: {fileID: 0}
-  mHighlightedLabel: {fileID: 0}
-  mLabelList: []
-  mBgBorder: 0
-  eventReceiver: {fileID: 0}
-  functionName: OnSelectionChange
-  textScale: 0
-  font: {fileID: 0}
-  textLabel: {fileID: 0}
--- !u!114 &5704952207260630023
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3377653671809927864}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  onSelect:
-  - mTarget: {fileID: 5197292460261144610}
-    mMethodName: uiEventDelegate
-    mParameters:
-    - obj: {fileID: 0}
-      field: 
-      name: 
-    oneShot: 0
 --- !u!1 &3971446323443766474
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCalender.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCalender.prefab
@@ -7028,7 +7028,7 @@ MonoBehaviour:
  characterLimit: 0
  savedAs: 
  selectOnTab: {fileID: 0}
-  activeTextColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1}
+  activeTextColor: {r: 0.16078432, g: 0.5647059, b: 0.8627451, a: 1}
  caretColor: {r: 1, g: 1, b: 1, a: 0.8}
  selectionColor: {r: 1, g: 0.8745098, b: 0.5529412, a: 0.5}
  onSubmit: []
@@ -11713,7 +11713,7 @@ MonoBehaviour:
  characterLimit: 0
  savedAs: 
  selectOnTab: {fileID: 0}
-  activeTextColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1}
+  activeTextColor: {r: 0.16078432, g: 0.5647059, b: 0.8627451, a: 1}
  caretColor: {r: 1, g: 1, b: 1, a: 0.8}
  selectionColor: {r: 1, g: 0.8745098, b: 0.5529412, a: 0.5}
  onSubmit: []
@@ -14654,7 +14654,7 @@ MonoBehaviour:
  characterLimit: 0
  savedAs: 
  selectOnTab: {fileID: 0}
-  activeTextColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1}
+  activeTextColor: {r: 0.16078432, g: 0.5647059, b: 0.8627451, a: 1}
  caretColor: {r: 1, g: 1, b: 1, a: 0.8}
  selectionColor: {r: 1, g: 0.8745098, b: 0.5529412, a: 0.5}
  onSubmit: []
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelComFilter.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelComFilter.prefab
@@ -749,6 +749,90 @@ MonoBehaviour:
      field: 
      name: go
    oneShot: 0
+--- !u!1 &1407842409310103267
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6498509718176547415}
+  - component: {fileID: 2866704243539096054}
+  m_Layer: 5
+  m_Name: SpriteRight
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6498509718176547415
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1407842409310103267}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 468, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 2063762107333207662}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &2866704243539096054
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1407842409310103267}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 2063762107333207662}
+    relative: 1
+    absolute: -48
+  rightAnchor:
+    target: {fileID: 2063762107333207662}
+    relative: 1
+    absolute: -20
+  bottomAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  topAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  updateAnchors: 1
+  mColor: {r: 0.89411765, g: 0.89411765, b: 0.89411765, a: 1}
+  mPivot: 4
+  mWidth: 28
+  mHeight: 40
+  mDepth: 2
+  autoResizeBoxCollider: 0
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 0.7
+  mType: 0
+  mFillDirection: 4
+  mFillAmount: 1
+  mInvert: 0
+  mFlip: 0
+  centerType: 1
+  leftType: 1
+  rightType: 1
+  bottomType: 1
+  topType: 1
+  atlasName: atlasAllReal
+  mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
+  mSpriteName: cust_right
+  mFillCenter: 1
+  isGrayMode: 0
 --- !u!1 &2088325436638624531
 GameObject:
  m_ObjectHideFlags: 0
@@ -1087,6 +1171,106 @@ MonoBehaviour:
  sorted: 0
  oldParentPos: {x: 0, y: 0, z: 0}
  oldParentClipOffset: {x: 0, y: 0}
+--- !u!1 &3603192727636508577
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6322255039491352009}
+  - component: {fileID: 725171783778550641}
+  m_Layer: 5
+  m_Name: Label
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6322255039491352009
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3603192727636508577}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -472, y: 1, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 2063762107333207662}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &725171783778550641
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3603192727636508577}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 2063762107333207662}
+    relative: 0
+    absolute: 30
+  rightAnchor:
+    target: {fileID: 2063762107333207662}
+    relative: 1
+    absolute: -70
+  bottomAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  topAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  updateAnchors: 0
+  mColor: {r: 0.8, g: 0.8, b: 0.8, a: 1}
+  mPivot: 3
+  mWidth: 905
+  mHeight: 46
+  mDepth: 1
+  autoResizeBoxCollider: 0
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 6
+  keepCrispWhenShrunk: 1
+  mTrueTypeFont: {fileID: 0}
+  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
+  mText: "\u9009\u62E9\u65F6\u95F4\u8303\u56F4"
+  mFontSize: 46
+  mFontStyle: 0
+  mAlignment: 0
+  mEncoding: 0
+  mMaxLineCount: 1
+  mEffectStyle: 0
+  mEffectColor: {r: 0, g: 0, b: 0, a: 1}
+  mSymbols: 1
+  mEffectDistance: {x: 1, y: 1}
+  mOverflow: 0
+  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 &3905687911834238589
 GameObject:
  m_ObjectHideFlags: 0
@@ -1407,12 +1591,13 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 5419392198895611480}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0.000061035156, y: -129.7792, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 894187409540540665}
  - {fileID: 3807174589059692935}
  - {fileID: 8325070186297174099}
+  - {fileID: 2063762107333207662}
  m_Father: {fileID: 399459460936336576}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1429,7 +1614,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  isPause: 0
-  luaPath: trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustFilterGroup.lua
+  luaPath: trCRM/upgradeRes/priority/lua/ui/cell/TRCellComFilterGroup.lua
  isNeedResetAtlase: 1
 --- !u!114 &8892237662771014533
 MonoBehaviour:
@@ -1650,7 +1835,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  isPause: 0
-  luaPath: trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustFilter.lua
+  luaPath: trCRM/upgradeRes/priority/lua/ui/cell/TRCellComFilter.lua
  isNeedResetAtlase: 1
 --- !u!114 &3692367307914200530
 MonoBehaviour:
@@ -2482,3 +2667,211 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  input: {fileID: 0}
+--- !u!1 &8040838973755823818
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2063762107333207662}
+  - component: {fileID: 1525962486747003362}
+  - component: {fileID: 8657339436076644261}
+  - component: {fileID: 4967607906274370311}
+  - component: {fileID: 7813858630935219250}
+  - component: {fileID: 3556848704283497978}
+  - component: {fileID: 6739440026415741281}
+  - component: {fileID: 7330105934729335370}
+  m_Layer: 5
+  m_Name: InputDate
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2063762107333207662
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8040838973755823818}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: -142.89, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 6322255039491352009}
+  - {fileID: 6498509718176547415}
+  m_Father: {fileID: 8411829511229606282}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &1525962486747003362
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8040838973755823818}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1005, y: 140, z: 0}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &8657339436076644261
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8040838973755823818}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ac5060295fbd39b4a88d20d0c83d925e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  label: {fileID: 725171783778550641}
+  inputType: 0
+  onReturnKey: 0
+  keyboardType: 0
+  hideInput: 0
+  alertModeKeybaord: 0
+  validation: 0
+  characterLimit: 0
+  savedAs: 
+  selectOnTab: {fileID: 0}
+  activeTextColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1}
+  caretColor: {r: 1, g: 1, b: 1, a: 0.8}
+  selectionColor: {r: 1, g: 0.8745098, b: 0.5529412, a: 0.5}
+  onSubmit: []
+  onChange: []
+  mValue: 
+--- !u!114 &4967607906274370311
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8040838973755823818}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  rightAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  bottomAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  topAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  updateAnchors: 0
+  mColor: {r: 1, g: 1, b: 1, a: 1}
+  mPivot: 4
+  mWidth: 1005
+  mHeight: 140
+  mDepth: 0
+  autoResizeBoxCollider: 1
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 7.178571
+  mType: 1
+  mFillDirection: 4
+  mFillAmount: 1
+  mInvert: 0
+  mFlip: 0
+  centerType: 1
+  leftType: 1
+  rightType: 1
+  bottomType: 1
+  topType: 1
+  atlasName: atlasAllReal
+  mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
+  mSpriteName: cust_input
+  mFillCenter: 1
+  isGrayMode: 0
+--- !u!114 &7813858630935219250
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8040838973755823818}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  jsonKey: taskId
+  formatValue: 
+  labeName: {fileID: 0}
+  defaultName: 
+  canNull: 0
+  checkIDCard: 0
+  minLen: 0
+  maxLen: 0
+  spriteBg: {fileID: 4967607906274370311}
+  valueIsNumber: 0
+  isPhoneNum: 0
+  inValidColor: {r: 1, g: 1, b: 0.9019608, a: 1}
+--- !u!114 &3556848704283497978
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8040838973755823818}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4fc1983a05daa4f0fb11c911430b5e5d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  isSetTime: 1
+  isDateRange: 1
+  onChange:
+  - mTarget: {fileID: 57481834132150723}
+    mMethodName: uiEventDelegate
+    mParameters:
+    - obj: {fileID: 0}
+      field: 
+      name: 
+    oneShot: 0
+--- !u!114 &6739440026415741281
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8040838973755823818}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f02842fa4878db54f9587ff4de7d9f2d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  scrollView: {fileID: 0}
+  draggablePanel: {fileID: 0}
+--- !u!114 &7330105934729335370
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8040838973755823818}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  widget: {fileID: 4967607906274370311}
+  offset: 60
+  sizeAdjust: 1
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustDetail.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustDetail.prefab
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelFollowFilter.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelFollowFilter.prefab
@@ -3294,7 +3294,7 @@ MonoBehaviour:
  mEffectColor: {r: 0, g: 0, b: 0, a: 1}
  mSymbols: 1
  mEffectDistance: {x: 1, y: 1}
-  mOverflow: 2
+  mOverflow: 0
  mMaterial: {fileID: 0}
  mApplyGradient: 0
  mGradientTop: {r: 1, g: 1, b: 1, a: 1}
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMine.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMine.prefab
@@ -552,7 +552,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &5491138480075079044
 Transform:
  m_ObjectHideFlags: 0
@@ -561,7 +561,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 184486829508797677}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: -1013.1542, z: 0}
+  m_LocalPosition: {x: -562.49994, y: -1013.1542, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 246771686767694676}
@@ -964,7 +964,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 840437353990515007}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: -747.0292, z: 0}
+  m_LocalPosition: {x: 0, y: -213.65428, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 7860134392385234681}
@@ -1142,7 +1142,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &4223530067768363855
 Transform:
  m_ObjectHideFlags: 0
@@ -1151,7 +1151,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1088463162980397119}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: -112.904236, z: 0}
+  m_LocalPosition: {x: -562.49994, y: -112.904236, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 5747074830141145353}
@@ -1646,7 +1646,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &4806853180109488993
 Transform:
  m_ObjectHideFlags: 0
@@ -2290,7 +2290,7 @@ MonoBehaviour:
  updateAnchors: 0
  mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
  mPivot: 3
-  mWidth: 572
+  mWidth: 607
  mHeight: 36
  mDepth: 5
  autoResizeBoxCollider: 0
@@ -2369,7 +2369,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &8055268178187303537
 Transform:
  m_ObjectHideFlags: 0
@@ -2378,7 +2378,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 4581052720665187015}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: -549.02924, z: 0}
+  m_LocalPosition: {x: -562.49994, y: -549.02924, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 7860134392385234681}
@@ -2540,7 +2540,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &9058263097930270872
 Transform:
  m_ObjectHideFlags: 0
@@ -2549,7 +2549,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 5000965022431849311}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: -280.90424, z: 0}
+  m_LocalPosition: {x: -562.49994, y: -280.90424, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 6494128839770782524}
@@ -2870,7 +2870,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 5302143445670681189}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: -1182.2792, z: 0}
+  m_LocalPosition: {x: 0, y: -311.15433, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 3383858163226375859}
@@ -3373,7 +3373,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 6294668045162800048}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 50, y: -84, z: 0}
+  m_LocalPosition: {x: 50, y: -83, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 8231042360533177612}
@@ -3460,7 +3460,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 6835201525035095168}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: -647.02924, z: 0}
+  m_LocalPosition: {x: 0, y: -113.65428, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 8090171467771370018}
@@ -3704,7 +3704,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &8870281937905939455
 Transform:
  m_ObjectHideFlags: 0
@@ -3713,7 +3713,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 7225677049649647650}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: -449.0292, z: 0}
+  m_LocalPosition: {x: -562.49994, y: -449.0292, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 5995514188312941234}
@@ -4891,7 +4891,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &4684322523491284131
 Transform:
  m_ObjectHideFlags: 0
@@ -4900,7 +4900,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 9069596104152791670}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: -845.0292, z: 0}
+  m_LocalPosition: {x: -562.49994, y: -845.0292, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 6300766951930731237}
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMoreProc4Cust.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMoreProc4Cust.prefab
@@ -201,7 +201,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &5277372479390350048
 Transform:
  m_ObjectHideFlags: 0
@@ -210,7 +210,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 499400275736742615}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -140, y: -200, z: 0}
+  m_LocalPosition: {x: -420, y: -200, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 1221806652923567659}
@@ -1276,7 +1276,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &3837960431183373118
 Transform:
  m_ObjectHideFlags: 0
@@ -1285,7 +1285,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 5302636813556190272}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 140, y: -0, z: 0}
+  m_LocalPosition: {x: -140, y: -0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 3074551617188155498}
@@ -1525,7 +1525,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &4350464794319423872
 Transform:
  m_ObjectHideFlags: 0
@@ -1534,7 +1534,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 6010324266785203443}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -420, y: -0, z: 0}
+  m_LocalPosition: {x: -700, y: -0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 6227542931138195830}
@@ -1690,7 +1690,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &1563067978267000244
 Transform:
  m_ObjectHideFlags: 0
@@ -1699,7 +1699,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 6545508908313909632}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -420, y: -200, z: 0}
+  m_LocalPosition: {x: -700, y: -200, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 1151304663116218500}
@@ -2333,7 +2333,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 7553703605476557833}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -140, y: -0, z: 0}
+  m_LocalPosition: {x: -280, y: -0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 4948126674344885475}
@@ -2414,7 +2414,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 7811480330925744859}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 140, y: -200, z: 0}
+  m_LocalPosition: {x: 280, y: -0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 2706796553119845174}
@@ -2495,7 +2495,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 7816656800586324046}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 420, y: -0, z: 0}
+  m_LocalPosition: {x: 0, y: -0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 5137697459384881279}
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOceanList.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOceanList.prefab
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOceanList.prefab.meta
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOceanList.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 88e068331004a4677afaaa9e601c6634
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOrderDetail.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOrderDetail.prefab
@@ -4705,7 +4705,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &3926309906149336925
 Transform:
  m_ObjectHideFlags: 0
@@ -5124,7 +5124,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &4713768725097190093
 Transform:
  m_ObjectHideFlags: 0
@@ -8191,7 +8191,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &1979994046684094812
 Transform:
  m_ObjectHideFlags: 0
@@ -10655,7 +10655,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &1881041057993121940
 Transform:
  m_ObjectHideFlags: 0
@@ -13109,7 +13109,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &4981470194771461204
 Transform:
  m_ObjectHideFlags: 0
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOrderList.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOrderList.prefab
@@ -1811,7 +1811,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  jsonKey: money
+  jsonKey: salePrice
  formatValue: "\u8BA2\u5355\u91D1\u989D\uFF1A{0}"
  labeName: {fileID: 0}
  defaultName: 
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelProductList.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelProductList.prefab
@@ -772,7 +772,7 @@ BoxCollider:
  m_IsTrigger: 0
  m_Enabled: 1
  serializedVersion: 2
-  m_Size: {x: 1127, y: 2041, z: 0}
+  m_Size: {x: 1127, y: 2036, z: 0}
  m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &5273785393500861225
 MonoBehaviour:
@@ -822,10 +822,10 @@ MonoBehaviour:
  mWidth: 1127
  mHeight: 2036
  mDepth: 0
-  autoResizeBoxCollider: 0
+  autoResizeBoxCollider: 1
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 0.5405276
+  aspectRatio: 0.55353636
 --- !u!1 &2273052227574290906
 GameObject:
  m_ObjectHideFlags: 0
@@ -1241,6 +1241,7 @@ GameObject:
  - component: {fileID: 7157395470677172185}
  - component: {fileID: 319691064790145712}
  - component: {fileID: 2451302499724644244}
+  - component: {fileID: 904012587215764392}
  m_Layer: 5
  m_Name: 00000
  m_TagString: Untagged
@@ -1377,6 +1378,20 @@ BoxCollider:
  serializedVersion: 2
  m_Size: {x: 1125, y: 220, z: 0}
  m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &904012587215764392
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6430060577259612141}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f02842fa4878db54f9587ff4de7d9f2d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  scrollView: {fileID: 0}
+  draggablePanel: {fileID: 0}
 --- !u!1 &6904830646041015535
 GameObject:
  m_ObjectHideFlags: 0
@@ -1561,7 +1576,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &8144756602567182551
 Transform:
  m_ObjectHideFlags: 0
@@ -1748,7 +1763,7 @@ MonoBehaviour:
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
-  mText: "\u4EA7\u54C1\u540D\u79F0"
+  mText: "\u4EA7\u54C1\u540D\u79F0/\u4EF7\u683C/\u7C7B\u578B"
  mFontSize: 48
  mFontStyle: 0
  mAlignment: 0
@@ -1846,7 +1861,7 @@ MonoBehaviour:
  anchorOffset: 0
  softBorderPadding: 1
  renderQueue: 0
-  startingRenderQueue: 3006
+  startingRenderQueue: 3005
  mClipTexture: {fileID: 0}
  mAlpha: 1
  mClipping: 3
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSelectProduct.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSelectProduct.prefab
@@ -555,7 +555,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 547.5
+  aspectRatio: 409.5
  mType: 1
  mFillDirection: 4
  mFillAmount: 1
@@ -991,7 +991,7 @@ MonoBehaviour:
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
-  mText: "\u4EA7\u54C1\u540D\u79F0"
+  mText: "\u4EA7\u54C1\u540D\u79F0/\u4EF7\u683C/\u7C7B\u578B"
  mFontSize: 48
  mFontStyle: 0
  mAlignment: 0
@@ -1087,7 +1087,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 2
+  aspectRatio: 6.7619047
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -1278,7 +1278,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 0.03448276
+  aspectRatio: 1
  mType: 0
  mFillDirection: 4
  mFillAmount: 1
@@ -1415,7 +1415,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 1
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 11.659091
+  aspectRatio: 10.738636
  mType: 1
  mFillDirection: 4
  mFillAmount: 1
@@ -1946,7 +1946,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 0.5405276
+  aspectRatio: 0.611503
 --- !u!1 &6575156775745750833
 GameObject:
  m_ObjectHideFlags: 0
@@ -1974,7 +1974,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 6575156775745750833}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: -960, z: 0}
+  m_LocalPosition: {x: 0, y: -240, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 3318967223522064214}
@@ -2256,7 +2256,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 4.7619047
+  aspectRatio: 6.7619047
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -2673,7 +2673,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 1
+  aspectRatio: 2
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSelectServer.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSelectServer.prefab
@@ -0,0 +1,911 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1815702334092406493
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1681386719772936772}
+  - component: {fileID: 4522722561110309687}
+  - component: {fileID: 4905738896896487268}
+  m_Layer: 5
+  m_Name: Sprite
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1681386719772936772
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1815702334092406493}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -1, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 722716463705605040}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &4522722561110309687
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1815702334092406493}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 722716463705605040}
+    relative: 0
+    absolute: 0
+  rightAnchor:
+    target: {fileID: 722716463705605040}
+    relative: 1
+    absolute: 0
+  bottomAnchor:
+    target: {fileID: 722716463705605040}
+    relative: 0
+    absolute: 0
+  topAnchor:
+    target: {fileID: 722716463705605040}
+    relative: 1
+    absolute: 0
+  updateAnchors: 1
+  mColor: {r: 1, g: 1, b: 1, a: 1}
+  mPivot: 4
+  mWidth: 1125
+  mHeight: 2304
+  mDepth: 0
+  autoResizeBoxCollider: 1
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 0.48828125
+  mType: 1
+  mFillDirection: 4
+  mFillAmount: 1
+  mInvert: 0
+  mFlip: 0
+  centerType: 1
+  leftType: 1
+  rightType: 1
+  bottomType: 1
+  topType: 1
+  atlasName: atlasAllReal
+  mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
+  mSpriteName: public__empty
+  mFillCenter: 1
+  isGrayMode: 0
+--- !u!65 &4905738896896487268
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1815702334092406493}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1125, y: 2304, z: 0}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!1 &5298718982170013365
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2597976407841131450}
+  - component: {fileID: 3717174517520463622}
+  m_Layer: 5
+  m_Name: Label
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2597976407841131450
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5298718982170013365}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 7109500400804505203}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &3717174517520463622
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5298718982170013365}
+  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: 0
+  rightAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  bottomAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  topAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  updateAnchors: 1
+  mColor: {r: 1, g: 0.1273585, b: 0.1273585, a: 1}
+  mPivot: 4
+  mWidth: 138
+  mHeight: 46
+  mDepth: 5
+  autoResizeBoxCollider: 0
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 2
+  keepCrispWhenShrunk: 1
+  mTrueTypeFont: {fileID: 0}
+  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
+  mText: "\u672C\u5730\u670D"
+  mFontSize: 46
+  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 &5952753598030686669
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4202480726961252122}
+  - component: {fileID: 2895870955327661504}
+  m_Layer: 5
+  m_Name: Label
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4202480726961252122
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5952753598030686669}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 6906317883994210997}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &2895870955327661504
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5952753598030686669}
+  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: 0
+  rightAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  bottomAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  topAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  updateAnchors: 1
+  mColor: {r: 1, g: 0.1273585, b: 0.1273585, a: 1}
+  mPivot: 4
+  mWidth: 138
+  mHeight: 46
+  mDepth: 5
+  autoResizeBoxCollider: 0
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 3
+  keepCrispWhenShrunk: 1
+  mTrueTypeFont: {fileID: 0}
+  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
+  mText: "\u5F00\u53D1\u670D"
+  mFontSize: 46
+  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 &6154162936729908387
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6906317883994210997}
+  - component: {fileID: 6863175624405474998}
+  - component: {fileID: 4419233353655098087}
+  - component: {fileID: 1734898684140572659}
+  m_Layer: 5
+  m_Name: ButtonServerDev
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6906317883994210997
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6154162936729908387}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 4202480726961252122}
+  m_Father: {fileID: 722716463705605040}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &6863175624405474998
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6154162936729908387}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 400, y: 120, z: 0}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &4419233353655098087
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6154162936729908387}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  tweenTarget: {fileID: 6154162936729908387}
+  hover: {r: 0.88235295, g: 0.78431374, b: 0.5882353, a: 1}
+  pressed: {r: 0.7176471, g: 0.6392157, b: 0.48235294, a: 1}
+  disabledColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+  duration: 0.2
+  skipColorEffect: 1
+  dragHighlight: 0
+  hoverSprite: 
+  pressedSprite: 
+  disabledSprite: 
+  hoverSprite2D: {fileID: 0}
+  pressedSprite2D: {fileID: 0}
+  disabledSprite2D: {fileID: 0}
+  pixelSnap: 0
+  onClick:
+  - mTarget: {fileID: 2306636552521049162}
+    mMethodName: uiEventDelegate
+    mParameters:
+    - obj: {fileID: 0}
+      field: 
+      name: go
+    oneShot: 0
+--- !u!114 &1734898684140572659
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6154162936729908387}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  rightAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  bottomAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  topAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  updateAnchors: 1
+  mColor: {r: 0.8, g: 0.8, b: 0.8, a: 1}
+  mPivot: 4
+  mWidth: 400
+  mHeight: 120
+  mDepth: 3
+  autoResizeBoxCollider: 1
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 3.3333333
+  mType: 1
+  mFillDirection: 4
+  mFillAmount: 1
+  mInvert: 0
+  mFlip: 0
+  centerType: 1
+  leftType: 1
+  rightType: 1
+  bottomType: 1
+  topType: 1
+  atlasName: atlasAllReal
+  mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
+  mSpriteName: public_button2
+  mFillCenter: 1
+  isGrayMode: 0
+--- !u!1 &6320771060119039048
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3602705091620079525}
+  - component: {fileID: 630664255065274416}
+  - component: {fileID: 2706568950277189029}
+  - component: {fileID: 5016178426459801864}
+  m_Layer: 5
+  m_Name: ButtonServer
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3602705091620079525
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6320771060119039048}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 200, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 8534664546235284192}
+  m_Father: {fileID: 722716463705605040}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &630664255065274416
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6320771060119039048}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 400, y: 120, z: 0}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &2706568950277189029
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6320771060119039048}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  tweenTarget: {fileID: 6320771060119039048}
+  hover: {r: 0.88235295, g: 0.78431374, b: 0.5882353, a: 1}
+  pressed: {r: 0.7176471, g: 0.6392157, b: 0.48235294, a: 1}
+  disabledColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+  duration: 0.2
+  skipColorEffect: 1
+  dragHighlight: 0
+  hoverSprite: 
+  pressedSprite: 
+  disabledSprite: 
+  hoverSprite2D: {fileID: 0}
+  pressedSprite2D: {fileID: 0}
+  disabledSprite2D: {fileID: 0}
+  pixelSnap: 0
+  onClick:
+  - mTarget: {fileID: 2306636552521049162}
+    mMethodName: uiEventDelegate
+    mParameters:
+    - obj: {fileID: 0}
+      field: 
+      name: go
+    oneShot: 0
+--- !u!114 &5016178426459801864
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6320771060119039048}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  rightAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  bottomAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  topAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  updateAnchors: 1
+  mColor: {r: 1, g: 1, b: 1, a: 1}
+  mPivot: 4
+  mWidth: 400
+  mHeight: 120
+  mDepth: 3
+  autoResizeBoxCollider: 1
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 3.3333333
+  mType: 1
+  mFillDirection: 4
+  mFillAmount: 1
+  mInvert: 0
+  mFlip: 0
+  centerType: 1
+  leftType: 1
+  rightType: 1
+  bottomType: 1
+  topType: 1
+  atlasName: atlasAllReal
+  mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
+  mSpriteName: public_button
+  mFillCenter: 1
+  isGrayMode: 0
+--- !u!1 &8005951734287196268
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8534664546235284192}
+  - component: {fileID: 1301261577565511599}
+  m_Layer: 5
+  m_Name: Label
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8534664546235284192
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8005951734287196268}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 3602705091620079525}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1301261577565511599
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8005951734287196268}
+  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: 0
+  rightAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  bottomAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  topAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  updateAnchors: 1
+  mColor: {r: 1, g: 1, b: 1, a: 1}
+  mPivot: 4
+  mWidth: 138
+  mHeight: 46
+  mDepth: 5
+  autoResizeBoxCollider: 0
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 3
+  keepCrispWhenShrunk: 1
+  mTrueTypeFont: {fileID: 0}
+  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
+  mText: "\u6B63\u5F0F\u670D"
+  mFontSize: 46
+  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 &8047438374758084340
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 722716463705605040}
+  - component: {fileID: 8267247793847255164}
+  - component: {fileID: 2306636552521049162}
+  m_Layer: 5
+  m_Name: PanelSelectServer
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!4 &722716463705605040
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8047438374758084340}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 1681386719772936772}
+  - {fileID: 3602705091620079525}
+  - {fileID: 6906317883994210997}
+  - {fileID: 7109500400804505203}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &8267247793847255164
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8047438374758084340}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ae942c9068183dc40a9d01f648273726, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  rightAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  bottomAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  topAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  updateAnchors: 1
+  showInPanelTool: 1
+  generateNormals: 0
+  widgetsAreStatic: 0
+  cullWhileDragging: 1
+  alwaysOnScreen: 0
+  anchorOffset: 0
+  softBorderPadding: 1
+  renderQueue: 0
+  startingRenderQueue: 3004
+  mClipTexture: {fileID: 0}
+  mAlpha: 1
+  mClipping: 0
+  mClipRange: {x: 0, y: 0, z: 300, w: 200}
+  mClipSoftness: {x: 4, y: 4}
+  mDepth: 10001
+  mSortingOrder: 0
+  mClipOffset: {x: 0, y: 0}
+--- !u!114 &2306636552521049162
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8047438374758084340}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1ff491def90b44724978eb9e0b2b558f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  isPause: 0
+  luaPath: trCRM/upgradeRes/priority/lua/ui/panel/TRPSelectServer.lua
+  isNeedBackplate: 1
+  destroyWhenHide: 0
+  isNeedResetAtlase: 1
+  isNeedMask4Init: 0
+  isNeedMask4InitOnlyOnce: 1
+  isHideWithEffect: 1
+  isRefeshContentWhenEffectFinish: 0
+  EffectRoot: {fileID: 0}
+  effectType: 1
+  EffectList: []
+  frameName: 
+  frameObj: {fileID: 0}
+  titleKeyName: 
+--- !u!1 &8145156391994179470
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7109500400804505203}
+  - component: {fileID: 6522521951507144505}
+  - component: {fileID: 430727873322794693}
+  - component: {fileID: 216730793368670284}
+  m_Layer: 5
+  m_Name: ButtonServerLoc
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7109500400804505203
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8145156391994179470}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: -200, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 2597976407841131450}
+  m_Father: {fileID: 722716463705605040}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &6522521951507144505
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8145156391994179470}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 400, y: 120, z: 0}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &430727873322794693
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8145156391994179470}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  tweenTarget: {fileID: 8145156391994179470}
+  hover: {r: 0.88235295, g: 0.78431374, b: 0.5882353, a: 1}
+  pressed: {r: 0.7176471, g: 0.6392157, b: 0.48235294, a: 1}
+  disabledColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+  duration: 0.2
+  skipColorEffect: 1
+  dragHighlight: 0
+  hoverSprite: 
+  pressedSprite: 
+  disabledSprite: 
+  hoverSprite2D: {fileID: 0}
+  pressedSprite2D: {fileID: 0}
+  disabledSprite2D: {fileID: 0}
+  pixelSnap: 0
+  onClick:
+  - mTarget: {fileID: 2306636552521049162}
+    mMethodName: uiEventDelegate
+    mParameters:
+    - obj: {fileID: 0}
+      field: 
+      name: go
+    oneShot: 0
+--- !u!114 &216730793368670284
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8145156391994179470}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  rightAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  bottomAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  topAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  updateAnchors: 1
+  mColor: {r: 0.8, g: 0.8, b: 0.8, a: 1}
+  mPivot: 4
+  mWidth: 400
+  mHeight: 120
+  mDepth: 3
+  autoResizeBoxCollider: 1
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 3.3333333
+  mType: 1
+  mFillDirection: 4
+  mFillAmount: 1
+  mInvert: 0
+  mFlip: 0
+  centerType: 1
+  leftType: 1
+  rightType: 1
+  bottomType: 1
+  topType: 1
+  atlasName: atlasAllReal
+  mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
+  mSpriteName: public_button2
+  mFillCenter: 1
+  isGrayMode: 0
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSelectServer.prefab.meta
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSelectServer.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 149045ebaef68497d845409c4d326eec
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSetting.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSetting.prefab
@@ -630,7 +630,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1574758529604312775}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: -1081.9042, z: 0}
+  m_LocalPosition: {x: 0, y: -579.0293, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 5142353427110750969}
@@ -749,7 +749,7 @@ MonoBehaviour:
    relative: 1
    absolute: 0
  updateAnchors: 0
-  mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1}
+  mColor: {r: 0.94509804, g: 0.3529412, b: 0.2901961, a: 1}
  mPivot: 4
  mWidth: 192
  mHeight: 48
@@ -892,7 +892,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &4675397354910025470
 Transform:
  m_ObjectHideFlags: 0
@@ -901,7 +901,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 2085915762645019667}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: -814.9042, z: 0}
+  m_LocalPosition: {x: -562.49994, y: -814.9042, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 1618426770527669028}
@@ -1052,7 +1052,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 2441044411561534783}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: -1278.9043, z: 0}
+  m_LocalPosition: {x: 0, y: -776.0293, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 5142353427110750969}
@@ -1130,7 +1130,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &5708718997705413206
 Transform:
  m_ObjectHideFlags: 0
@@ -1139,7 +1139,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 2484531034894060934}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: -646.90424, z: 0}
+  m_LocalPosition: {x: -562.49994, y: -646.90424, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 2703578331337026897}
@@ -2424,7 +2424,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &1345443715194949896
 Transform:
  m_ObjectHideFlags: 0
@@ -2433,7 +2433,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 4079953227522190995}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: -982.9042, z: 0}
+  m_LocalPosition: {x: -562.49994, y: -982.9042, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 6145429347260269230}
@@ -3484,7 +3484,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 7196047386175395429}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: -1376.9043, z: 0}
+  m_LocalPosition: {x: 0, y: -874.0293, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 4069223954330664614}
@@ -4124,7 +4124,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 8399778681914775680}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: -1179.9042, z: 0}
+  m_LocalPosition: {x: 0, y: -677.0293, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 6489565779607049762}
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSysMsgDetail.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSysMsgDetail.prefab
@@ -62,7 +62,7 @@ MonoBehaviour:
  updateAnchors: 1
  mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
  mPivot: 3
-  mWidth: 132
+  mWidth: 150
  mHeight: 30
  mDepth: 5
  autoResizeBoxCollider: 0
@@ -385,18 +385,16 @@ MonoBehaviour:
  mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1}
  mPivot: 0
  mWidth: 1025
-  mHeight: 1508
+  mHeight: 52
  mDepth: 5
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 0.66644996
+  aspectRatio: 0.70398355
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
-  mText: "\u5BF9\u9C81\u8FC5\u6742\u6587\u7684\u601D\u60F3\u7279\u5F81\u548C\u827A\u672F\u7279\u5F81\u3001\u9C81\u8FC5\u7684\u7F8E\u5B66\u601D\u60F3\u3001\u9C81\u8FC5\u5C0F\u8BF4\u7684\u73B0\u5B9E\u4E3B\u4E49\u548C\u9C81\u8FC5\u4F5A\u6587\u7684\u771F\u4F2A\u9274\u522B\u90FD\u6709\u72EC\u5230\u89C1\u89E3\u3002\u5510\u5F22\u521D\u4E2D\u65F6\u5BB6\u8D2B\u8F8D\u5B66,\u5165\u4E0A\u6D77\u90AE\u5C40\u4F5C\u62E3\u4FE1\u751F,\u5F00\u59CB\u4E1A\u4F59\u5199\u4F5C\u3002
-    \u5510\u5F22\u8457\u4F5C\u4ECE20\u4E16\u7EAA30\u5E74\u4EE3\u5F00\u59CB\u4ECE\u4E8B\u4E1A\u4F59\u521B\u4F5C,\u4EE5\u6563\u6587\u548C\u6742\u6587\u4E3A\u4E3B,\u5176\u98CE\u683C\u63A5\u8FD1\u9C81\u8FC5,\u5E76\u56E0\u6B64\u4E0E\u9C81\u8FC5\u7ED3\u8BC6\u30021933\u5E74\u8D77\u53D1\u8868\u6563\u6587\u3001\u6742\u6587,\u540E\u7ED3\u8BC6\u9C81\u8FC5\u3002\u6297\u65E5\u6218\u4E89\u7206\u53D1\u540E,\u5728\u4E0A\u6D77\u575A\u6301\u6297\u65E5\u6587\u5316\u8FD0\u52A8,\u53C2\u52A0\u521D\u7248\u300A\u9C81\u8FC5\u5168\u96C6\u300B\u7F16\u6821\u3002\u53C8\u652F\u6301\u300A\u9C81\u8FC5\u98CE\u300B\u5468\u520A,\u7F16\u8F91\u300A\u6587\u827A\u754C\u4E1B\u520A\u300B,\u517C\u4EFB\u4E2D\u5B66\u6559\u804C\u3002\u6297\u65E5\u6218\u4E89\u80DC\u5229\u540E\u91CD\u56DE\u90AE\u5C40,\u4E0E\u67EF\u7075\u5408\u7F16\u300A\u5468\u62A5\u300B,\u53C2\u52A0\u53CD\u8FEB\u5BB3\u3001\u53CD\u5185\u6218\u3001\u53CD\u9965\u997F\u6C11\u4E3B\u8FD0\u52A8\u3002\u300A\u5468\u62A5\u300B\u88AB\u7981,\u8F6C\u7F16\u300A\u6587\u6C47\u62A5\xB7\u7B14\u4F1A\u300B\u3002\u65B0\u4E2D\u56FD\u6210\u7ACB\u540E,\u81F4\u529B\u9C81\u8FC5\u8457\u4F5C\u548C\u4E2D\u56FD\u73B0\u4EE3\u6587\u5B66\u53F2\u7814\u7A76,\u575A\u6301\u6742\u6587\u3001\u6563\u6587\u521B\u4F5C,\u5386\u4EFB\u590D\u65E6\u5927\u5B66\u3001\u4E0A\u6D77\u620F\u5267\u4E13\u79D1\u5B66\u6821\u6559\u6388,\u4E0A\u6D77\u5E02\u6587\u5316\u5C40\u526F\u5C40\u957F,\u4E2D\u56FD\u4F5C\u5BB6\u534F\u4F1A\u4E0A\u6D77\u5206\u4F1A\u4E66\u8BB0\u5904\u4E66\u8BB0,\u300A\u6587\u827A\u65B0\u5730\u300B\u3001\u300A\u6587\u827A\u6708\u62A5\u300B\u526F\u4E3B\u7F16\u7B49\u30021959\u5E74\u4EFB\u4E2D\u56FD\u793E\u4F1A\u79D1\u5B66\u9662\u6587\u5B66\u7814\u7A76\u6240\u7814\u7A76\u5458,\u662F\u7B2C\u4E8C\u3001\u4E09\u3001\u56DB\u5C4A\u5168\u56FD\u653F\u534F\u59D4\u5458,\u7B2C\u56DB\u3001\u4E94\u5C4A\u5168\u56FD\u4EBA\u5927\u4EE3\u8868,\u4E2D\u56FD\u4F5C\u5BB6\u534F\u4F1A\u7406\u4E8B\u3002\u6240\u8457\u6742\u6587\u601D\u60F3\u3001\u827A\u672F...\u5510\u5F22\u521D\u4E2D\u65F6\u5BB6\u8D2B\u8F8D\u5B66,\u5165\u4E0A\u6D77\u90AE\u5C40\u4F5C\u62E3\u4FE1\u751F,\u5F00\u59CB\u4E1A\u4F59\u5199\u4F5C\u3002
-    \u5510\u5F22\u8457\u4F5C\u4ECE20\u4E16\u7EAA30\u5E74\u4EE3\u5F00\u59CB\u4ECE\u4E8B\u4E1A\u4F59\u521B\u4F5C,\u4EE5\u6563\u6587\u548C\u6742\u6587\u4E3A\u4E3B,\u5176\u98CE\u683C\u63A5\u8FD1\u9C81\u8FC5,\u5E76\u56E0\u6B64\u4E0E\u9C81\u8FC5\u7ED3\u8BC6\u30021933\u5E74\u8D77\u53D1\u8868\u6563\u6587\u3001\u6742\u6587,\u540E\u7ED3\u8BC6\u9C81\u8FC5\u3002\u6297\u65E5\u6218\u4E89\u7206\u53D1\u540E,\u5728\u4E0A\u6D77\u575A\u6301\u6297\u65E5\u6587\u5316\u8FD0\u52A8,\u53C2\u52A0\u521D\u7248\u300A\u9C81\u8FC5\u5168\u96C6\u300B\u7F16\u6821\u3002\u53C8\u652F\u6301\u300A\u9C81\u8FC5\u98CE\u300B\u5468"
+  mText: 
  mFontSize: 48
  mFontStyle: 0
  mAlignment: 0
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSysMsgDetail.prefab.meta
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSysMsgDetail.prefab.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 9220c63bf59564ea7be87599940a8ec9
+guid: 9b02f2e651ece471c828920279b1c841
 PrefabImporter:
  externalObjects: {}
  userData: 
--- a/Assets/trCRM/upgradeRes4Publish/other/txt.meta
+++ b/Assets/trCRM/upgradeRes4Publish/other/txt.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ae3d232dba3554931b0e8943a411214f
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/other/txt/Android.meta
+++ b/Assets/trCRM/upgradeRes4Publish/other/txt/Android.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c71cdfad3e1e44312ad1fb4ebefb11de
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/other/txt/Android/serviceProto.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/other/txt/Android/serviceProto.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/other/txt/Android/serviceProto.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/other/txt/Android/serviceProto.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 7130f447a196548159841e75109a6f46
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/CLLMainLua.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/CLLMainLua.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBCust.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBCust.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBUser.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBUser.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/net/NetProto.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/net/NetProto.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellComFilter.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellComFilter.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellComFilter.lua.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellComFilter.lua.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 81f3adf660755442e87d00e452b48f2a
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellComFilterGroup.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellComFilterGroup.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellComFilterGroup.lua.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellComFilterGroup.lua.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 40e154f8811854b3e9fe53e8ea5d45fc
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendFieldRoot.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendFieldRoot.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellOceanList.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellOceanList.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellOceanList.lua.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellOceanList.lua.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 974377b5151c04c1589f8ff3a027ed40
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellOrderList.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellOrderList.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPStart.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPStart.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPTasks.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPTasks.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPAbout.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPAbout.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPComFilter.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPComFilter.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPConnect.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPConnect.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustDetail.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustDetail.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustList.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustList.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPFollowList.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPFollowList.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPMoreProc4Cust.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPMoreProc4Cust.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollow.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollow.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollowSimple.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollowSimple.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewOrder.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewOrder.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOceanList.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOceanList.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOceanList.lua.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOceanList.lua.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: f69e14c4301e74562ada01752c0f5fd6
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOrderList.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOrderList.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPProductList.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPProductList.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSelectServer.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSelectServer.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSelectServer.lua.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSelectServer.lua.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: da0f504c05cd64157a296dabdd4fba5c
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSysMsgDetail.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSysMsgDetail.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/InputDate.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/InputDate.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/InputPoplist.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/InputPoplist.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/InputTime.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/InputTime.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelAbout.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelAbout.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCalender.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCalender.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelComFilter.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelComFilter.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustDetail.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustDetail.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelFollowFilter.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelFollowFilter.unity3d
--- a/Show More
+++ b/Show More