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

bug fix

Browse Source
This commit is contained in:
陈彬
2020-07-19 12:52:05 +08:00
parent 30d5701d96
commit d92ad2ecca
33 changed files with 1689 additions and 769 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
Assets/CoolapeFrame/3rd/NGUI_Enhance/Scripts/UI/UIInput.cs
View File

@@ -498,15 +498,14 @@ public class UIInput : MonoBehaviour
protected virtual void OnSelect (bool isSelected)
{
if (!enabled) return; // add by chenbin
if (isSelected)
if (isSelected)
{
#if !MOBILE
if (mOnGUI == null)
if (mOnGUI == null && this.enabled)
mOnGUI = gameObject.AddComponent<UIInputOnGUI>();
#endif
OnSelectEvent();
}
OnSelectEvent();
}
else
{
#if !MOBILE
@@ -526,8 +525,8 @@ public class UIInput : MonoBehaviour
protected void OnSelectEvent ()
{
#if !MOBILE // add by chenbin
selection = this;
#if !MOBILE // add by chenbin
selection = this;
if (mDoInit) Init();
// Unity has issues bringing up the keyboard properly if it's in "hideInput" mode and you happen
@@ -810,6 +809,7 @@ public class UIInput : MonoBehaviour
void init4GUI()
{
if (!this.enabled) return;
#if !UNITY_EDITOR && !UNITY_STANDALONE_OSX
isShowGUI = false;
return;
@@ -860,7 +860,7 @@ public class UIInput : MonoBehaviour
#if UNITY_EDITOR || UNITY_STANDALONE_OSX
void OnGUI() {
if(isShowGUI) {
if(isShowGUI && this.enabled) {
if (mDoInit)
Init ();
GUI.SetNextControlName("__MyTextField");
@@ -1444,54 +1444,57 @@ public class UIInput : MonoBehaviour
mBlankTex.Apply();
}
// Create the selection highlight
if (start != end)
if (this.enabled) //add by chenbin
{
if (mHighlight == null)
// Create the selection highlight
if (start != end)
{
mHighlight = NGUITools.AddWidget<UITexture>(label.cachedGameObject);
mHighlight.name = "Input Highlight";
mHighlight.mainTexture = mBlankTex;
mHighlight.fillGeometry = false;
mHighlight.pivot = label.pivot;
mHighlight.SetAnchor(label.cachedTransform);
if (mHighlight == null)
{
mHighlight = NGUITools.AddWidget<UITexture>(label.cachedGameObject);
mHighlight.name = "Input Highlight";
mHighlight.mainTexture = mBlankTex;
mHighlight.fillGeometry = false;
mHighlight.pivot = label.pivot;
mHighlight.SetAnchor(label.cachedTransform);
}
else
{
mHighlight.pivot = label.pivot;
mHighlight.mainTexture = mBlankTex;
mHighlight.MarkAsChanged();
mHighlight.enabled = true;
}
}
// Create the carter
if (mCaret == null)
{
mCaret = NGUITools.AddWidget<UITexture>(label.cachedGameObject);
mCaret.name = "Input Caret";
mCaret.mainTexture = mBlankTex;
mCaret.fillGeometry = false;
mCaret.pivot = label.pivot;
mCaret.SetAnchor(label.cachedTransform);
}
else
{
mHighlight.pivot = label.pivot;
mHighlight.mainTexture = mBlankTex;
mHighlight.MarkAsChanged();
mHighlight.enabled = true;
mCaret.pivot = label.pivot;
mCaret.mainTexture = mBlankTex;
mCaret.MarkAsChanged();
mCaret.enabled = true;
}
}
// Create the carter
if (mCaret == null)
{
mCaret = NGUITools.AddWidget<UITexture>(label.cachedGameObject);
mCaret.name = "Input Caret";
mCaret.mainTexture = mBlankTex;
mCaret.fillGeometry = false;
mCaret.pivot = label.pivot;
mCaret.SetAnchor(label.cachedTransform);
}
else
{
mCaret.pivot = label.pivot;
mCaret.mainTexture = mBlankTex;
mCaret.MarkAsChanged();
mCaret.enabled = true;
}
if (start != end)
{
label.PrintOverlay(start, end, mCaret.geometry, mHighlight.geometry, caretColor, selectionColor);
mHighlight.enabled = mHighlight.geometry.hasVertices;
}
else
{
label.PrintOverlay(start, end, mCaret.geometry, null, caretColor, selectionColor);
if (mHighlight != null) mHighlight.enabled = false;
if (start != end)
{
label.PrintOverlay(start, end, mCaret.geometry, mHighlight.geometry, caretColor, selectionColor);
mHighlight.enabled = mHighlight.geometry.hasVertices;
}
else
{
label.PrintOverlay(start, end, mCaret.geometry, null, caretColor, selectionColor);
if (mHighlight != null) mHighlight.enabled = false;
}
}
// Reset the blinking time

2
Assets/CoolapeFrameData/cfg/publishChannel.cfg
View File

@@ -1 +1 @@
tBchannelMapr?generalp'FmBuildLocation@iosBuildDmProductNameD添添办公CisThirdExitJmBundleVersionCode
tBchannelMapr?generalp'FmBuildLocation@iosBuildDmProductNameD添添办公CisThirdExitJmBundleVersionCode

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

File diff suppressed because it is too large Load Diff

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

Binary file not shown.

15
Assets/CoolapeFrameData/verControl/android/ver4Publish.v
View File

@@ -182,11 +182,11 @@ trCRM/upgradeRes4Publish/priority/lua/ui/cell/CSCellBottomBtn.lua,afbf445995d42e
trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCompany.lua,b145bc086a8b1657a314622614dcb70a
trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustFilter.lua,2fb22f9248e4af86ab42482151a5b141
trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustFilterGroup.lua,93cdb67f51a62110b38e133b065f8f85
trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustList.lua,21f43d920caab4d30c9ce7f9a1255603
trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustList.lua,035626bac75e16f15bc825f6e0ded212
trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustProc.lua,3f9f33de3630a03463952058ba795128
trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustStar.lua,ed39330cf68d1e1e062bc8311d1e8d44
trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellEmptySpace.lua,42b2a61f171153603c9adda32bf7cb7d
trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendField.lua,be687e94841bf222fa7b0c6a7a591156
trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendField.lua,e8045bceb1a7c7794d41fb68ed7b7921
trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendFieldRoot.lua,c38ffa7d9111dc4bedeaba97a6d5a661
trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellGuidPage.lua,7b3c3f567c3e0d92065913101b08ddd0
trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellImage.lua,604691a3a96bbdb9cf88f20e2adf027c
@@ -214,13 +214,13 @@ trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPWebView.lua,093deec807e28be04
trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMain.lua,24f616b9384dc0eefa9955fabb1d05f1
trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMine.lua,2dd00dde001dd24d01df96a841ce2f91
trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMsg.lua,f72d285313cb63ff775722473af9a5f9
trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPTasks.lua,778f0d663544d0b2379e87b50ea49031
trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPTasks.lua,b27eae62169a50c49ede43bb033a1f3b
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRBasePanel.lua,dc088058987b435c998a9709297a88e6
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPAbout.lua,ded7b5021b8837a537e426614cc2171e
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPConfirm2.lua,bd0ea9f50708dedd598b517c1dfc739f
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPConnect.lua,e6c7e0aafd60eb1de8bf0ab7758bac11
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCusFilter.lua,f0452e3d6cfa59244dc7b9dd8f5a475d
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustDetail.lua,e32c3b520335c1b2966d8a503518275c
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustDetail.lua,4708f1d57deea5bee059824d7c94dc87
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustFilter.lua,450e7e75ebfe83bb65d59beb3ce60782
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustList.lua,473a578d9811d494d8cf58c7fc6a45b9
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustListProc.lua,1973dc8d949ed85e01b09aff328d1033
@@ -232,7 +232,7 @@ trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPModifyFiled.lua,99b250c386ce8d
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPMoreProc4Cust.lua,cc11fe3b2530891e91e2c649762d06f8
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPMyInfor.lua,600ae2f4949e3ee829f17a2f6b4284e7
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewCust.lua,c3f8563afb97d79992a35de8c3ee9ba6
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollow.lua,336ea3b9be70d8d1fff12f59c101193a
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollow.lua,d3a1105688c2aa06e1644de6f4bf28ed
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollowSimple.lua,720f3ff97d9b71a9108fd949bf779b30
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollowTask.lua,7fe7010d91b43edf001169feb70ce395
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewOrder.lua,0c9076d943ba5d1b3ac4da7726e7b73a
@@ -244,7 +244,7 @@ trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPResetPasswordStep2.lua,af8af3f
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPResetPasswordStep3.lua,0d3be662e0a236b709d8f1f9d6b3321e
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSelectCompany.lua,28ca57d169af022ec621dece879bdcfc
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSelectProduct.lua,59750609585193c66d08adfa8544d946
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSetting.lua,45f706ba538ab2b39364826b8fc7e214
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSetting.lua,dabd3a6e76a5743b94d861be9a735795
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSysMsgDetail.lua,6266494c653deda1b5a391cc7f38a06a
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSysMsgList.lua,518461e7bf8f3b3420fa9377a23db86a
trCRM/upgradeRes4Publish/priority/ui/other/Android/AlertRoot.unity3d,c30044a6e7bf14ddb7a87c4f51d1f073
@@ -283,6 +283,7 @@ trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMoreProc4Cust.unity3d,0a
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMsg.unity3d,e0d5c4eb46bc7c1734c79206bd0962e0
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMyInfor.unity3d,94f1b88c66705acd7f798affef48c540
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewCust.unity3d,059a6d8bc6830d6eea05685f17829c14
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewFollow.unity3d,069e9d7a4f265817731ac790a228dce0
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewFollowSimple.unity3d,d0f73f4324743d77717668fdcda14680
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewFollowTask.unity3d,00abbad1fdb08fdf2dcdcd6f2a70f95c
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewOrder.unity3d,068f97e365e79ae11418ff16a1cf2f89
@@ -301,7 +302,7 @@ trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSplash.unity3d,2691ddc66
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelStart.unity3d,50cfab21f360ee339c94b1111be09fef
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSysMsgDetail.unity3d,91e06baebc3ec7e9b2a5c108ced50b52
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSysMsgList.unity3d,b48b08a37217bb43ef7a94566f79fec0
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelTasks.unity3d,2739446b89e4fb5c449abb46ff406785
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelTasks.unity3d,d461935432083ba62e8176bd4a212409
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelWWWProgress.unity3d,d9cbe9d08670eedbee77ba97330f4118
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelWebView.unity3d,e5372cdacc520ff8ba318ce09b681772
trCRM/upgradeRes4Publish/priority/ui/panel/Android/ToastRoot.unity3d,412c3557a187689acaa1d79d7d555836

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

@@ -1,4 +1,4 @@
trCRM/upgradeRes/priority/lua/ui/cell/TRCellExtendField.lua,be687e94841bf222fa7b0c6a7a591156
trCRM/upgradeRes/priority/lua/ui/cell/TRCellExtendField.lua,e8045bceb1a7c7794d41fb68ed7b7921
trCRM/upgradeRes/other/uiAtlas/public/Android/on_off.unity3d,69b1b8dfdfc0afecdd9fdd9dbd5fb98a
trCRM/upgradeRes/other/uiAtlas/icon/Android/icon_26_no.unity3d,c16242cb394b0720d1c2e1e0289c1c4a
trCRM/upgradeRes/other/uiAtlas/logo/Android/logo.unity3d,849e7b3d08491890c6e021896c8ec39c
@@ -43,7 +43,7 @@ trCRM/upgradeRes/other/uiAtlas/news/Android/new2_bg_20.unity3d,8e81d4a650273e24b
trCRM/upgradeRes/priority/ui/other/Android/Frame1.unity3d,622d3ea7e4f9aa1d11f6492cabffa445
trCRM/upgradeRes/other/uiAtlas/mine/Android/myset_check.unity3d,d9092d78af855e769abff1223f650a9d
trCRM/upgradeRes/other/uiAtlas/cust/Android/record.unity3d,afd45ba065ba86f138b8c92b9794c722
trCRM/upgradeRes/priority/lua/ui/panel/TRPSetting.lua,45f706ba538ab2b39364826b8fc7e214
trCRM/upgradeRes/priority/lua/ui/panel/TRPSetting.lua,dabd3a6e76a5743b94d861be9a735795
trCRM/upgradeRes/other/uiAtlas/main/Android/icon_news2.unity3d,a35e85b68569bf1adc16bdee3a609fdd
trCRM/upgradeRes/priority/ui/other/Android/AlertRoot.unity3d,c30044a6e7bf14ddb7a87c4f51d1f073
trCRM/upgradeRes/priority/ui/other/Android/InputDate.unity3d,b9645fe9ff5972788d341acc70b7be30
@@ -199,7 +199,7 @@ trCRM/upgradeRes/priority/lua/ui/cell/TRCellEmptySpace.lua,42b2a61f171153603c9ad
trCRM/upgradeRes/other/uiAtlas/news/Android/news_3.unity3d,5f130cc66d813a2b339757e8a31cee8c
trCRM/upgradeRes/priority/ui/panel/Android/PanelSetting.unity3d,e28ed051439e06abe8ffc14ebf9cf1d2
trCRM/upgradeRes/other/uiAtlas/mine/Android/myset_remind.unity3d,99a50a17b34f464693ac84d1c6f38966
trCRM/upgradeRes/priority/lua/ui/panel/TRPNewFollow.lua,336ea3b9be70d8d1fff12f59c101193a
trCRM/upgradeRes/priority/lua/ui/panel/TRPNewFollow.lua,d3a1105688c2aa06e1644de6f4bf28ed
trCRM/upgradeRes/priority/lua/ui/panel/TRPSysMsgList.lua,518461e7bf8f3b3420fa9377a23db86a
trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_3.unity3d,651d81480c5ea1ff8aa4ccdf7e0a6058
trCRM/upgradeRes/other/uiAtlas/cust/Android/order.unity3d,0b796b27d351f49010fb3c3921f1a843
@@ -209,7 +209,7 @@ trCRM/upgradeRes/other/uiAtlas/coolape/Android/user.unity3d,dc5411391ea0beae4ecc
trCRM/upgradeRes/priority/lua/ui/cell/TRCellReportform1.lua,d31b42aa50089defb22bde59b5c0474d
trCRM/upgradeRes/other/uiAtlas/work/Android/work_color.unity3d,043e8a3cdee29da6e5c909432f25d6f8
trCRM/upgradeRes/other/uiAtlas/login/Android/log_visible.unity3d,884f69f0dd0c2a58af5ad891f23e985e
trCRM/upgradeRes/priority/lua/ui/panel/CSPTasks.lua,778f0d663544d0b2379e87b50ea49031
trCRM/upgradeRes/priority/lua/ui/panel/CSPTasks.lua,b27eae62169a50c49ede43bb033a1f3b
trCRM/upgradeRes/priority/lua/ui/panel/TRPResetPasswordStep2.lua,af8af3fde5f3526b36c48517a5da89d0
trCRM/upgradeRes/priority/lua/ui/panel/TRPNewFollowTask.lua,7fe7010d91b43edf001169feb70ce395
trCRM/upgradeRes/priority/ui/panel/Android/PanelSceneManager.unity3d,c83769673e1c0793d88547c05d20a82e
@@ -239,7 +239,7 @@ trCRM/upgradeRes/priority/lua/json/rpc.lua,28c2f09ceb729d01052d8408eed0b57a
trCRM/upgradeRes/priority/lua/public/CLLQueue.lua,065303c980678b25b11854bfec1690f3
trCRM/upgradeRes/priority/lua/ui/panel/CLLPPopList.lua,896c4b35a6cd0d4f86ed5c0ba532ea00
trCRM/upgradeRes/priority/lua/ui/cell/TRCellReportform2.lua,47ac1164b1ffb27397953ccb032fd2d7
trCRM/upgradeRes/priority/ui/panel/Android/PanelTasks.unity3d,2739446b89e4fb5c449abb46ff406785
trCRM/upgradeRes/priority/ui/panel/Android/PanelTasks.unity3d,d461935432083ba62e8176bd4a212409
trCRM/upgradeRes/other/uiAtlas/mine/Android/me_customer.unity3d,5676922ef1749c311285d1a207b8397b
trCRM/upgradeRes/priority/lua/net/NetProto.lua,3493f7ceb04a0b147ce63d323e3553af
trCRM/upgradeRes/other/uiAtlas/public/Android/tips_3.unity3d,2834e3cc399b70e7621065ad4ddaedf6
@@ -253,14 +253,14 @@ trCRM/upgradeRes/other/uiAtlas/cust/Android/add.unity3d,ceb10233c0fc59270d66e1cb
trCRM/upgradeRes/priority/lua/ui/cell/TRCellProductSelected.lua,e7f4b1e06a54d5fa52cf9a4ed00f5233
trCRM/upgradeRes/priority/lua/public/CLLIncludeBase.lua,87bcfc58c6d99be6fe89102d7323c95e
trCRM/upgradeRes/priority/lua/ui/panel/TRPCustList.lua,473a578d9811d494d8cf58c7fc6a45b9
trCRM/upgradeRes/priority/ui/panel/Android/PanelMine.unity3d,11da82174234ef319918c3e06f3775d6
trCRM/upgradeRes/priority/ui/panel/Android/PanelMine.unity3d,08da3fb9aee4ab666acb8b15eb1b01bf
trCRM/upgradeRes/priority/lua/cfg/DBCfg.lua,3d0e60dbcdaa61b8553eee17f4d68b32
trCRM/upgradeRes/other/uiAtlas/order/Android/ipt_bg.unity3d,89541a2aaed40069c1f0ce363c5a8e2a
trCRM/upgradeRes/other/uiAtlas/order/Android/system.unity3d,570fa72b2d385d604cc7c9f7516965da
trCRM/upgradeRes/other/uiAtlas/news/Android/news_bg_num2.unity3d,bfdbfc9e1fd1f91de555c0801d278d25
trCRM/upgradeRes/other/uiAtlas/login/Android/log_password.unity3d,6a41f099b79cda5941cf720c1452b5a5
trCRM/upgradeRes/priority/lua/ui/cell/TRCellCompany.lua,b145bc086a8b1657a314622614dcb70a
trCRM/upgradeRes/priority/ui/panel/Android/PanelNewFollow.unity3d,3ee9577410d709f08bf37e7c9a2b19a1
trCRM/upgradeRes/priority/ui/panel/Android/PanelNewFollow.unity3d,069e9d7a4f265817731ac790a228dce0
trCRM/upgradeRes/other/uiAtlas/cust/Android/pause.unity3d,f67cbbc84b61bc281f486e4e18fb177f
trCRM/upgradeRes/priority/lua/ui/panel/CLLPWWWProgress.lua,b713ddf9f0af8602ec48f71162181d6d
trCRM/upgradeRes/priority/lua/ui/cell/CLLCellServer.lua,1e9de9f0b4bbc703296808c1ba179c29
@@ -269,7 +269,7 @@ trCRM/upgradeRes/priority/ui/other/Android/InputText.unity3d,7b419ca2ec17017ed14
trCRM/upgradeRes/other/uiAtlas/news/Android/new2_wait.unity3d,4171ead446231d4429305811f6e91fbc
trCRM/upgradeRes/priority/ui/panel/Android/PanelNewCust.unity3d,059a6d8bc6830d6eea05685f17829c14
trCRM/upgradeRes/priority/ui/panel/Android/PanelServers.unity3d,1613390ef03ce766ec3680f99949122b
trCRM/upgradeRes/priority/lua/ui/panel/TRPCustDetail.lua,e32c3b520335c1b2966d8a503518275c
trCRM/upgradeRes/priority/lua/ui/panel/TRPCustDetail.lua,4708f1d57deea5bee059824d7c94dc87
trCRM/upgradeRes/priority/ui/panel/Android/PanelCalender.unity3d,56aa22c08fd4a18488f213a650f67ff1
trCRM/upgradeRes/other/uiAtlas/cust/Android/del.unity3d,453d38d3af66e108db0d2bb827426bd7
trCRM/upgradeRes/priority/lua/ui/panel/CLLPWebView.lua,093deec807e28be04df4d593bcff9e38
@@ -292,7 +292,7 @@ trCRM/upgradeRes/priority/lua/json/rpcserver.lua,48b8f5e53a1141652c38f8a5a8a7792
trCRM/upgradeRes/priority/lua/net/CLLNet.lua,947abdf2c019f44a26211acf6f31e2dd
trCRM/upgradeRes/other/uiAtlas/coolape/Android/logo.unity3d,c712e48e071a87fb6668333774da19a6
trCRM/upgradeRes/priority/lua/ui/cell/CLLUICalenderDay.lua,6e7400e2dd535ced93960c1e18fa2458
trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustList.lua,21f43d920caab4d30c9ce7f9a1255603
trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustList.lua,035626bac75e16f15bc825f6e0ded212
trCRM/upgradeRes/priority/lua/ui/panel/TRPPopCheckBoxs.lua,508171a924c113573b01a396e8217cc2
trCRM/upgradeRes/other/uiAtlas/news/Android/news_bg_num1.unity3d,2ed88c277f983b8d1a3dedf73d735239
trCRM/upgradeRes/other/uiAtlas/public/Android/check.unity3d,d11f6d5b126c6a0fbf34ced5734cb66f

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

File diff suppressed because one or more lines are too long

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

@@ -26,6 +26,7 @@ trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/get.unity3d,04bf77dfe50c327c
trCRM/upgradeRes4Publish/priority/ui/other/Android/InputMultText.unity3d,e4554fe97f92473cff5bfd8f1443b8a7
trCRM/upgradeRes4Publish/priority/lua/json/rpcserver.lua,48b8f5e53a1141652c38f8a5a8a77928
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPConfirm2.lua,bd0ea9f50708dedd598b517c1dfc739f
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPopList.unity3d,a0ba753b0deecff9a85c8cd2b60013dd
trCRM/upgradeRes4Publish/priority/lua/toolkit/CLLVerManager.lua,39b154e796d60c2c40ebcc427a5c05e8
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewFollowTask.unity3d,00abbad1fdb08fdf2dcdcd6f2a70f95c
trCRM/upgradeRes4Publish/priority/lua/CLLMainLua.lua,c0cae0cd02eba21111cf005f6c608901
@@ -75,7 +76,7 @@ trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_icon_5.unity3d,7edfb781
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSysMsgDetail.unity3d,91e06baebc3ec7e9b2a5c108ced50b52
trCRM/upgradeRes4Publish/other/uiAtlas/main/Android/icon_me2.unity3d,6efa661cb74e62dfdc75bdbeaeeceb39
trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellReportform1.lua,d31b42aa50089defb22bde59b5c0474d
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollow.lua,336ea3b9be70d8d1fff12f59c101193a
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollow.lua,d3a1105688c2aa06e1644de6f4bf28ed
trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/news_3.unity3d,5f130cc66d813a2b339757e8a31cee8c
trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPPopList.lua,896c4b35a6cd0d4f86ed5c0ba532ea00
trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLFrame2.lua,e25ce84ca55cd643d527d09cedd6228a
@@ -88,10 +89,10 @@ trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellSysMessageList.lua,1ce46f4b3
trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/news_bg.unity3d,b13e253b3a1689bf665ea7c3edecc519
trCRM/upgradeRes4Publish/priority/lua/db/DBRoot.lua,2de10366932579d84506e9ca7aff0971
trCRM/upgradeRes4Publish/other/uiAtlas/login/Android/log_sms.unity3d,8677ba455b4c85e5f1230986ff1032cf
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSetting.lua,45f706ba538ab2b39364826b8fc7e214
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSetting.lua,dabd3a6e76a5743b94d861be9a735795
trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustFilter.lua,2fb22f9248e4af86ab42482151a5b141
trCRM/upgradeRes4Publish/other/uiAtlas/guid/Android/1.unity3d,7654268e7c4bc7cea47f584d306f503d
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPopList.unity3d,a0ba753b0deecff9a85c8cd2b60013dd
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewFollow.unity3d,069e9d7a4f265817731ac790a228dce0
trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellProductList.lua,b2827429c70df8b7aa8e87451a96bf67
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPConnect.lua,e6c7e0aafd60eb1de8bf0ab7758bac11
trCRM/upgradeRes4Publish/priority/ui/other/Android/InputCheckboxs.unity3d,a929e8a7fd7ba3bc89bdda0686b6d7dd
@@ -129,7 +130,7 @@ trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellPopCheckbox.lua,25adbf587891
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOrderList.lua,3655882d094b886c89c7e48099136a46
trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/new2_notice.unity3d,8ccab8900911e68fc8e0b46f6c1e0372
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMask4Panel.unity3d,ed5e0d7cc2ba83e33435bddc760b5f9d
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMine.unity3d,11da82174234ef319918c3e06f3775d6
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMine.unity3d,08da3fb9aee4ab666acb8b15eb1b01bf
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPlaySoundRecord.unity3d,14e1a1da65735a1ac9a4256be49a4e40
trCRM/upgradeRes4Publish/priority/ui/other/Android/reportform2.unity3d,de5097255fc8126d368e9693106347dc
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelOrderList.unity3d,ce405f9722a7c2ab354a4091d49faa62
@@ -177,7 +178,7 @@ trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustList.lua,473a578d9811d494d
trCRM/upgradeRes4Publish/other/uiAtlas/login/Android/log_bg.unity3d,a7398f0f48b3b469e31bea6dac45457e
trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLUICalenderDay.lua,6e7400e2dd535ced93960c1e18fa2458
trCRM/upgradeRes4Publish/other/uiAtlas/guid/Android/2.unity3d,6b83b2d5a2dfc1f08744077e669c3ed0
trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendField.lua,be687e94841bf222fa7b0c6a7a591156
trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendField.lua,e8045bceb1a7c7794d41fb68ed7b7921
trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_bg.unity3d,3b42ecd8d30203eb5dcc65cb3a0ad815
trCRM/upgradeRes4Publish/other/uiAtlas/coolape/Android/name.unity3d,f5b44185a57a97ce6971f20a4054d990
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPMyInfor.lua,600ae2f4949e3ee829f17a2f6b4284e7
@@ -202,7 +203,7 @@ trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLFrame1.lua,1fd4e80adb13bd0d3cb0
trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPSplash.lua,8ce0b645f948233e6328b20a07a5999c
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPModifyFiled.lua,99b250c386ce8dad9c10c8f4fe9874f1
trCRM/upgradeRes4Publish/priority/lua/public/class.lua,cc0f201cc55c59f8bc8f623853382b9c
trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPTasks.lua,778f0d663544d0b2379e87b50ea49031
trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPTasks.lua,b27eae62169a50c49ede43bb033a1f3b
trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/new2_remind.unity3d,04a96d237c5e80ab044a54e7c063e368
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPResetPasswordStep3.lua,0d3be662e0a236b709d8f1f9d6b3321e
trCRM/upgradeRes4Publish/other/uiAtlas/login/Android/log_visible.unity3d,884f69f0dd0c2a58af5ad891f23e985e
@@ -231,7 +232,7 @@ trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustFilter.lua,450e7e75ebfe83b
trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPWWWProgress.lua,b713ddf9f0af8602ec48f71162181d6d
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelEditPrice.unity3d,baa0e7f3e00e62b0d5cb5263d7583000
trCRM/upgradeRes4Publish/priority/lua/public/CLLStack.lua,579069654d88a15e43c818a6b8079b15
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelTasks.unity3d,2739446b89e4fb5c449abb46ff406785
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelTasks.unity3d,d461935432083ba62e8176bd4a212409
trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/phone.unity3d,36e34519b910a11de3531994f607a140
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelConfirm2.unity3d,d199779b559cef259ebbfe686ba42703
trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/peo.unity3d,939edcb747217aa4b0deb1d9a34f16b8
@@ -284,7 +285,7 @@ trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/star.unity3d,f9684ea4b4e3a42
trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPHotWheel.lua,1760aa9933da4b421f1c6093d802cb4f
trCRM/upgradeRes4Publish/priority/lua/net/NetProto.lua,3493f7ceb04a0b147ce63d323e3553af
trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/me_opinion.unity3d,1935579d226c7400323115d8be90421d
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustDetail.lua,e32c3b520335c1b2966d8a503518275c
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustDetail.lua,4708f1d57deea5bee059824d7c94dc87
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustDetail.unity3d,b22b74b2ee1d57cccbaa92c6971dd9df
trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/choose.unity3d,e31379a28ab86046414db1fb23cd2bf6
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPMoreProc4Cust.lua,cc11fe3b2530891e91e2c649762d06f8
@@ -299,7 +300,7 @@ trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/cus_tel.unity3d,692b010c775f
trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/news_2.unity3d,802f5fec3b39fb208b1bd8a400801081
trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/myset_fingerprint.unity3d,de777211a380a09ea82e1092a9fba414
trCRM/upgradeRes4Publish/priority/ui/other/Android/reportform1.unity3d,5d061e9c5511ae3b978dbfe2be87f35e
trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustList.lua,21f43d920caab4d30c9ce7f9a1255603
trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustList.lua,035626bac75e16f15bc825f6e0ded212
trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellImage.lua,604691a3a96bbdb9cf88f20e2adf027c
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewCust.unity3d,059a6d8bc6830d6eea05685f17829c14
trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/system.unity3d,570fa72b2d385d604cc7c9f7516965da

2
Assets/trCRM/Resources/Atlas/EmptyAtlas.prefab
View File

@@ -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

1
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellCustList.lua
View File

@@ -66,6 +66,7 @@ end
function _cell.uiEventDelegate(go)
local goName = go.name
if goName == "ButtonFollow" then
getPanelAsy("PanelNewFollow", onLoadedPanelTT, mData)
elseif goName == "ButtonTask" then
getPanelAsy("PanelNewFollowTask", onLoadedPanelTT, mData)
elseif goName == "ButtonContact" then

19
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendField.lua
View File

@@ -132,14 +132,11 @@ function _cell.setElementMode(mode)
local isPopCheckbox = uiobjs.checkbox
---@type UIInput
local input = uiobjs.input
local inputOnGUI = csSelf:GetComponent("UIInputOnGUI")
local boxcollider = uiobjs.boxCollider
local ButtonReset = uiobjs.ButtonReset
if mode == _FieldMode.inputOnly then
_cell.enabeldObj(boxcollider, true)
_cell.enabeldObj(inputOnGUI, true)
_cell.enabeldObj(input, true)
if uiobjs.Label2 then
uiobjs.Label2.color = ColorEx.getColor(0xff999999)
end
@@ -154,16 +151,18 @@ function _cell.setElementMode(mode)
end
_cell.enabeldObj(uiobjs.Label4, true) -- multext
if
attr.attrType == DBCust.FieldType.dateTime or attr.attrType == DBCust.FieldType.checkbox or
attr.attrType == DBCust.FieldType.popuplist
attr.attrType == DBCust.FieldType.dateTime or
attr.attrType == DBCust.FieldType.checkbox or
attr.attrType == DBCust.FieldType.popuplist
then
_cell.enabeldObj(input, false)
_cell.enabeldObj(uiobjs.SpriteRight, true)
else
_cell.enabeldObj(uiobjs.SpriteRight, false)
_cell.enabeldObj(input, true)
end
elseif mode == _FieldMode.showOnly then
_cell.enabeldObj(boxcollider, false)
_cell.enabeldObj(inputOnGUI, false)
_cell.enabeldObj(input, false)
if uiobjs.Label2 then
uiobjs.Label2.color = ColorEx.getColor(0xff999999)
@@ -181,7 +180,6 @@ function _cell.setElementMode(mode)
_cell.enabeldObj(uiobjs.SpriteRight, false)
elseif mode == _FieldMode.modifyOnly then
_cell.enabeldObj(boxcollider, true)
_cell.enabeldObj(inputOnGUI, false)
_cell.enabeldObj(input, false)
if uiobjs.Label2 then
uiobjs.Label2.color = ColorEx.getColor(0xff999999)
@@ -199,7 +197,6 @@ function _cell.setElementMode(mode)
_cell.enabeldObj(uiobjs.SpriteRight, true)
elseif mode == _FieldMode.showAndModify then
_cell.enabeldObj(boxcollider, true)
_cell.enabeldObj(inputOnGUI, false)
_cell.enabeldObj(input, false)
if uiobjs.Label2 then
uiobjs.Label2.color = ColorEx.getColor(0xff999999)
@@ -217,7 +214,6 @@ function _cell.setElementMode(mode)
_cell.enabeldObj(uiobjs.SpriteRight, true)
elseif mode == _FieldMode.button then
_cell.enabeldObj(boxcollider, true)
_cell.enabeldObj(inputOnGUI, false)
_cell.enabeldObj(input, false)
if uiobjs.Label2 then
uiobjs.Label2.color = ColorEx.getColor(0xff363636)
@@ -237,8 +233,9 @@ function _cell.setElementMode(mode)
-- 再次修正input
if
attr.attrType == DBCust.FieldType.dateTime or attr.attrType == DBCust.FieldType.checkbox or
attr.attrType == DBCust.FieldType.popuplist
attr.attrType == DBCust.FieldType.dateTime or
attr.attrType == DBCust.FieldType.checkbox or
attr.attrType == DBCust.FieldType.popuplist
then
_cell.enabeldObj(input, false)
end

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

@@ -13,7 +13,7 @@ function CSPTasks.init(csObj)
csSelf = csObj
transform = csObj.transform
CSPTasks.setEventDelegate()
CSPTasks.contentRect = MyUtl.getUIContent(csSelf, 360+220+60)
CSPTasks.contentRect = MyUtl.getUIContent(csSelf, 360+220)
uiobjs.Content = getCC(transform, "PanelContent", "UIPanel")
uiobjs.Content.transform.localPosition = Vector3.zero

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

@@ -244,6 +244,7 @@ function TRPCustDetail:setEventDelegate()
self:showRecords()
end,
ButtonNewFollow = function()
getPanelAsy("PanelNewFollow", onLoadedPanelTT, self.mdata)
end,
ButtonNewTask = function()
getPanelAsy("PanelNewFollowTask", onLoadedPanelTT, self.mdata)

223
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewFollow.lua Normal file
View File

@@ -0,0 +1,223 @@
---@type IDBasePanel
local TRBasePanel = require("ui.panel.TRBasePanel")
---@class TRPNewFollow:TRBasePanel 邮件列表
local TRPNewFollow = class("TRPNewFollow", TRBasePanel)
local uiobjs = {}
local stars = {}
-- 初始化，只会调用一次
function TRPNewFollow:init(csObj)
TRPNewFollow.super.init(self, csObj)
self:initFiledsAttr()
self:setEventDelegate()
MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132, 0)
---@type UIScrollView
uiobjs.scrollView = getCC(self.transform, "PanelContent", "UIScrollView")
---@type UITable
uiobjs.Table = getCC(uiobjs.scrollView.transform, "Table", "UITable")
---@type CLUIFormRoot
uiobjs.DetailFromRoot = getCC(uiobjs.Table.transform, "DetailRoot", "CLUIFormRoot")
uiobjs.DetailRoot = getCC(uiobjs.Table.transform, "DetailRoot", "CLCellLua")
---@type UITable
uiobjs.DetailRootTabel = uiobjs.DetailRoot:GetComponent("UITable")
uiobjs.ButtonSave = getChild(self.transform, "Top/ButtonSave")
end
function TRPNewFollow:initFiledsAttr()
---@type _ParamFieldAttr
local attr
self.baseFiledsAttr = {}
attr = {}
attr.attrName = "商机"
attr.id = ""
attr.attrType = DBCust.FieldType.popuplist
attr.ifMust = 1
attr.donotJoinKey = true
-- local popInfor = DBCust.getFilter4Popup(DBCust.FilterGroup.followUpTypeList)
-- attr.popOptions = popInfor.options
-- attr.popValues = popInfor.values
table.insert(self.baseFiledsAttr, attr)
attr = {}
attr.attrName = "跟进类型"
attr.id = "followUpType"
attr.attrType = DBCust.FieldType.popuplist
attr.ifMust = 1
attr.donotJoinKey = true
local popInfor = DBCust.getFilter4Popup(DBCust.FilterGroup.followUpTypeList)
attr.popOptions = popInfor.options
attr.popValues = popInfor.values
table.insert(self.baseFiledsAttr, attr)
attr = {}
attr.attrName = "跟时时间"
attr.id = ""
attr.attrType = DBCust.FieldType.dateTime
attr.ifMust = 1
attr.donotJoinKey = true
table.insert(self.baseFiledsAttr, attr)
attr = {}
attr.attrName = "客户名称"
attr.id = "custName"
attr.attrType = DBCust.FieldType.text
attr.ifMust = 1
attr.donotJoinKey = true
table.insert(self.baseFiledsAttr, attr)
attr = {}
attr.attrName = "客户状态"
attr.id = "dealFlag"
attr.attrType = DBCust.FieldType.popuplist
attr.ifMust = 1
attr.donotJoinKey = true
local popInfor = DBCust.getFilter4Popup(DBCust.FilterGroup.dealFlagList)
attr.popOptions = popInfor.options
attr.popValues = popInfor.values
table.insert(self.baseFiledsAttr, attr)
attr = {}
attr.attrName = "跟进内容"
attr.id = "followUpContent"
attr.attrType = DBCust.FieldType.multext
attr.ifMust = 1
attr.donotJoinKey = true
table.insert(self.baseFiledsAttr, attr)
end
-- 设置数据
---@param paras _ParamTRPNewFollow
function TRPNewFollow:setData(paras)
self.mdata = {}
self.mdata.custId = paras.custId
self.mdata.taskId = paras.taskId
self.mdata.custName = paras.custName
self.isNewFollow = true
end
-- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh
function TRPNewFollow:show()
self:refreshContent()
SetActive(uiobjs.ButtonSave.gameObject, self.isNewFollow)
uiobjs.scrollView:ResetPosition()
end
function TRPNewFollow:refreshContent()
self:showBaseFields()
self.csSelf:invoke4Lua(self:wrapFunc(self.reposition), 0.1)
end
function TRPNewFollow:showBaseFields()
---@type _ParamCellExtendFiledRoot
local param = {}
param.data = self.mdata or {}
param.onFinish = self:wrapFunc(self.reposition)
param.onLoadOneField = self:wrapFunc(self.onLoadOneField)
param.fields = {}
---@type _ParamCellExtendFiled
local filedInfor
for i, v in ipairs(self.baseFiledsAttr) do
-- 工单模板
filedInfor = {}
filedInfor.attr = v
filedInfor.isEditMode = true
if filedInfor.attr.attrType == DBCust.FieldType.multext then
filedInfor.onMultTextInputChg = self:wrapFunc(self.reposition)
end
filedInfor.onClick = nil
filedInfor.onSelect = self:wrapFunc(self.onPopupFieldValChg)
table.insert(param.fields, filedInfor)
end
uiobjs.DetailRoot:init(param, nil)
end
function TRPNewFollow:onLoadOneField(cell)
local el = cell:GetComponent("CLUIElement")
if el and el.jsonKey == "followUpContent" then
uiobjs.followUpContent = el
end
end
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
local popList = go:GetComponent("UIPopupList")
uiobjs.followUpContent.value = popList.selectedItem
end
end
end
function TRPNewFollow:reposition()
uiobjs.DetailRootTabel.repositionNow = true
uiobjs.Table.repositionNow = true
end
-- 刷新
function TRPNewFollow:refresh()
end
-- 关闭页面
function TRPNewFollow:hide()
if uiobjs.DetailRoot.luaTable then
uiobjs.DetailRoot.luaTable.release()
end
end
-- 网络请求的回调；cmd：指命，succ：成功失败，msg：消息；paras：服务器下行数据
function TRPNewFollow:procNetwork(cmd, succ, msg, paras)
if (succ == NetSuccess) then
if cmd == NetProto.cmds.update_customer then
self:refreshContent()
end
end
end
function TRPNewFollow:setEventDelegate()
self.EventDelegate = {
ButtonSave = function()
local err = uiobjs.DetailFromRoot:checkValid()
if not isNilOrEmpty(err) then
MyUtl.toastW(err)
return
end
self.mdata = uiobjs.DetailFromRoot:getValue(self.mdata, true)
showHotWheel()
NetProto.send.create_followUp_record(
self.mdata,
function(content)
hideHotWheel()
if content.success then
MyUtl.toastS("保存成功")
hideTopPanel(self.csSelf)
end
end
)
end,
InputTask = function()
self:showExtentFiles(uiobjs.InputTask.value)
end
}
end
-- 处理ui上的事件，例如点击等
function TRPNewFollow:uiEventDelegate(go)
local func = self.EventDelegate[go.name]
if func then
func()
end
end
-- 当顶层页面发生变化时回调
function TRPNewFollow:onTopPanelChange(topPanel)
end
--------------------------------------------
return TRPNewFollow

7
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewFollow.lua.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: c98e9d776c5a846e6af1289bdad59626
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

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

@@ -46,6 +46,9 @@ end
function TRPSetting:setEventDelegate()
self.EventDelegate = {
ButtonPersonInfor=function()
getPanelAsy("PanelMyInfor", onLoadedPanelTT)
end,
ButtonPassword = function()
getPanelAsy("PanelResetPasswordStep1", onLoadedPanelTT, {phone = Prefs.getUserName(), isModify = true})
end,

14
Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMine.prefab
View File

@@ -209,7 +209,7 @@ MonoBehaviour:
target: {fileID: 0}
relative: 1
absolute: 0
updateAnchors: 1
updateAnchors: 0
mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1}
mPivot: 3
mWidth: 216
@@ -2272,13 +2272,13 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
leftAnchor:
target: {fileID: 0}
relative: 0
absolute: 293
target: {fileID: 1626933637}
relative: 1
absolute: 44
rightAnchor:
target: {fileID: 0}
relative: 0
absolute: 838
absolute: 0
bottomAnchor:
target: {fileID: 0}
relative: 0
@@ -2290,13 +2290,13 @@ MonoBehaviour:
updateAnchors: 0
mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
mPivot: 3
mWidth: 545
mWidth: 572
mHeight: 36
mDepth: 5
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 15.138889
aspectRatio: 15.25
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 0}
mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}

649
Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewFollow.prefab Normal file
View File

@@ -0,0 +1,649 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &892331021296762499
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8959323457515368671}
- component: {fileID: 5365037729377547425}
- component: {fileID: 4006864420758205446}
- component: {fileID: 3077299055825078045}
m_Layer: 5
m_Name: DetailRoot
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8959323457515368671
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 892331021296762499}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -1, y: -30, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8806942786345163243}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &5365037729377547425
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 892331021296762499}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 66ca9c6e5cbd4544ab22016a27d817a4, type: 3}
m_Name:
m_EditorClassIdentifier:
columns: 1
direction: 0
sorting: 0
pivot: 1
cellAlignment: 1
hideInactive: 1
keepWithinPanel: 0
padding: {x: 0, y: -1}
--- !u!114 &4006864420758205446
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 892331021296762499}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 16bd2beefa5ca4a3ba0753143d28e2d9, type: 3}
m_Name:
m_EditorClassIdentifier:
jsonKey:
--- !u!114 &3077299055825078045
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 892331021296762499}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 575f113ee96624a30ab2ca1af1303112, type: 3}
m_Name:
m_EditorClassIdentifier:
isPause: 0
luaPath: trCRM/upgradeRes/priority/lua/ui/cell/TRCellExtendFieldRoot.lua
isNeedResetAtlase: 1
--- !u!1 &2995868542908713658
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 703582893891920782}
- component: {fileID: 4067808357013956449}
- component: {fileID: 1504390251094336990}
- component: {fileID: 6400533450649344254}
m_Layer: 5
m_Name: DragScroll
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &703582893891920782
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2995868542908713658}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -1, y: -66, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5001673685575848814}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &4067808357013956449
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2995868542908713658}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 858a20c1b21a3f94bb5b2d3b901c9aaf, type: 3}
m_Name:
m_EditorClassIdentifier:
leftAnchor:
target: {fileID: 5001673685575848814}
relative: 0
absolute: 0
rightAnchor:
target: {fileID: 5001673685575848814}
relative: 1
absolute: 0
bottomAnchor:
target: {fileID: 5001673685575848814}
relative: 0
absolute: 0
topAnchor:
target: {fileID: 5001673685575848814}
relative: 1
absolute: -132
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4
mWidth: 1125
mHeight: 2172
mDepth: 7
autoResizeBoxCollider: 1
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 0.5179558
--- !u!114 &1504390251094336990
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2995868542908713658}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f02842fa4878db54f9587ff4de7d9f2d, type: 3}
m_Name:
m_EditorClassIdentifier:
scrollView: {fileID: 5804642261774301127}
draggablePanel: {fileID: 0}
--- !u!65 &6400533450649344254
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2995868542908713658}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1125, y: 2172, z: 0}
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &3811868574047077953
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3811868574047077966}
- component: {fileID: 3811868574047077965}
- component: {fileID: 3811868574047077964}
- component: {fileID: 3811868574047077967}
m_Layer: 5
m_Name: ButtonSave
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3811868574047077966
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3811868574047077953}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 510, y: -66, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 3811868574385527201}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &3811868574047077965
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3811868574047077953}
m_Material: {fileID: 0}
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 200, y: 100, z: 0}
m_Center: {x: -50, y: -0.22070312, z: 0}
--- !u!114 &3811868574047077964
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3811868574047077953}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3}
m_Name:
m_EditorClassIdentifier:
tweenTarget: {fileID: 3811868574047077953}
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: 6602973367304329883}
mMethodName: uiEventDelegate
mParameters:
- obj: {fileID: 0}
field:
name: go
oneShot: 0
--- !u!114 &3811868574047077967
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3811868574047077953}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3}
m_Name:
m_EditorClassIdentifier:
leftAnchor:
target: {fileID: 5001673685575848814}
relative: 1
absolute: -163
rightAnchor:
target: {fileID: 5001673685575848814}
relative: 1
absolute: -51
bottomAnchor:
target: {fileID: 0}
relative: 0
absolute: 0
topAnchor:
target: {fileID: 0}
relative: 1
absolute: 0
updateAnchors: 0
mColor: {r: 0.16078432, g: 0.5647059, b: 0.8627451, a: 1}
mPivot: 5
mWidth: 112
mHeight: 56
mDepth: 1
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 2
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 0}
mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
mText: "\u4FDD\u5B58"
mFontSize: 56
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 &3811868574385527200
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3811868574385527201}
- component: {fileID: 3811868574385527214}
m_Layer: 5
m_Name: Top
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3811868574385527201
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3811868574385527200}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 1152, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 3811868574047077966}
m_Father: {fileID: 5001673685575848814}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &3811868574385527214
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3811868574385527200}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c8077b76001d36d489868d20d28bddb9, type: 3}
m_Name:
m_EditorClassIdentifier:
uiCamera: {fileID: 0}
container: {fileID: 0}
side: 3
runOnlyOnce: 1
relativeOffset: {x: 0, y: 0}
pixelOffset: {x: 0, y: 0}
widgetContainer: {fileID: 0}
--- !u!1 &6102090276801802862
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5001673685575848814}
- component: {fileID: 3093772623855813911}
- component: {fileID: 6602973367304329883}
m_Layer: 5
m_Name: PanelNewFollow
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!4 &5001673685575848814
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6102090276801802862}
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: 5093278721696270566}
- {fileID: 703582893891920782}
- {fileID: 3811868574385527201}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &3093772623855813911
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6102090276801802862}
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: 3000
mClipTexture: {fileID: 0}
mAlpha: 1
mClipping: 0
mClipRange: {x: 0, y: 0, z: 300, w: 200}
mClipSoftness: {x: 4, y: 4}
mDepth: 1
mSortingOrder: 0
mClipOffset: {x: 0, y: 0}
--- !u!114 &6602973367304329883
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6102090276801802862}
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/TRPNewFollow.lua
isNeedBackplate: 1
destroyWhenHide: 0
isNeedResetAtlase: 1
isNeedMask4Init: 0
isNeedMask4InitOnlyOnce: 1
isHideWithEffect: 1
isRefeshContentWhenEffectFinish: 0
EffectRoot: {fileID: 0}
effectType: 1
EffectList: []
frameName: Frame1
frameObj: {fileID: 0}
titleKeyName: "\u65B0\u5EFA\u8DDF\u8FDB"
--- !u!1 &7224901118966550397
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8806942786345163243}
- component: {fileID: 6007508926977579986}
m_Layer: 5
m_Name: Table
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8806942786345163243
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7224901118966550397}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 937, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 8959323457515368671}
m_Father: {fileID: 5093278721696270566}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &6007508926977579986
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7224901118966550397}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 66ca9c6e5cbd4544ab22016a27d817a4, type: 3}
m_Name:
m_EditorClassIdentifier:
columns: 1
direction: 0
sorting: 0
pivot: 1
cellAlignment: 1
hideInactive: 1
keepWithinPanel: 0
padding: {x: 0, y: 30}
--- !u!1 &8459369083141396275
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5093278721696270566}
- component: {fileID: 5357800581257752099}
- component: {fileID: 5804642261774301127}
m_Layer: 5
m_Name: PanelContent
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &5093278721696270566
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8459369083141396275}
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: 8806942786345163243}
m_Father: {fileID: 5001673685575848814}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &5357800581257752099
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8459369083141396275}
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: 3001
mClipTexture: {fileID: 0}
mAlpha: 1
mClipping: 3
mClipRange: {x: 0, y: 0, z: 1126, w: 2000}
mClipSoftness: {x: 4, y: 10}
mDepth: 2
mSortingOrder: 0
mClipOffset: {x: 0, y: 0}
--- !u!114 &5804642261774301127
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8459369083141396275}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d81807633ea807d4c8e3fff7e10c6000, type: 3}
m_Name:
m_EditorClassIdentifier:
movement: 1
dragEffect: 2
restrictWithinPanel: 1
disableDragIfFits: 1
smoothDragStart: 1
iOSDragEmulation: 1
scrollWheelFactor: 0.25
momentumAmount: 35
dampenStrength: 9
horizontalScrollBar: {fileID: 0}
verticalScrollBar: {fileID: 0}
showScrollBars: 1
customMovement: {x: 1, y: 0}
contentPivot: 1
scale: {x: 0, y: 0, z: 0}
relativePositionOnReset: {x: 0, y: 0}
centerOnChild: {fileID: 0}

7
Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewFollow.prefab.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 64ca0328d02744dfc8fb317b511c3dbd
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

52
Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelTasks.prefab
View File

@@ -26,7 +26,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2039622863}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -1, y: -597, z: 0}
m_LocalPosition: {x: -1, y: -512, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2079010362}
@@ -421,7 +421,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 428542163589643225}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -414, y: -180, z: 0}
m_LocalPosition: {x: -414, y: -163, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 8257572729724756153}
@@ -1267,7 +1267,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1376936709712484390}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -342, y: 0, z: 0}
m_LocalPosition: {x: -340, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 6408538999124103677}
@@ -1323,6 +1323,7 @@ GameObject:
m_Component:
- component: {fileID: 7548019791029906313}
- component: {fileID: 80533903860256992}
- component: {fileID: 4315794307739012614}
m_Layer: 5
m_Name: SpriteBg2
m_TagString: Untagged
@@ -1338,7 +1339,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1606320567603967605}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -1, y: -360, z: 0}
m_LocalPosition: {x: -1, y: -311, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2079010362}
@@ -1357,25 +1358,25 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
leftAnchor:
target: {fileID: 2039622864}
target: {fileID: 0}
relative: 0
absolute: 50
rightAnchor:
target: {fileID: 2039622864}
target: {fileID: 0}
relative: 1
absolute: -50
bottomAnchor:
target: {fileID: 6245682048333409472}
target: {fileID: 0}
relative: 0
absolute: -300
topAnchor:
target: {fileID: 6245682048333409472}
relative: 0
target: {fileID: 0}
relative: 1
absolute: -80
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 1
mWidth: 1029
mWidth: 1025
mHeight: 220
mDepth: 1
autoResizeBoxCollider: 0
@@ -1397,6 +1398,21 @@ MonoBehaviour:
mSpriteName: work_work_bg_shadow
mFillCenter: 1
isGrayMode: 0
--- !u!114 &4315794307739012614
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1606320567603967605}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3}
m_Name:
m_EditorClassIdentifier:
widget: {fileID: 80533903860256992}
offset: 50
sizeAdjust: 1
--- !u!1 &1776223273951753645
GameObject:
m_ObjectHideFlags: 0
@@ -1423,7 +1439,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1776223273951753645}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -271, y: -151, z: 0}
m_LocalPosition: {x: -271, y: -134, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2079010362}
@@ -1832,7 +1848,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2627781041010536112}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 406, y: -182, z: 0}
m_LocalPosition: {x: 406, y: -165, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 3138439517586622980}
@@ -2735,7 +2751,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4359412390550565533}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -440, z: 0}
m_LocalPosition: {x: 0, y: -390.5, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 6633121965301904038}
@@ -2769,19 +2785,19 @@ MonoBehaviour:
relative: 0
absolute: 0
topAnchor:
target: {fileID: 7548019791029906313}
target: {fileID: 0}
relative: 1
absolute: -80
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 1
mWidth: 100
mHeight: 1998
mHeight: 1847
mDepth: 0
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 12.5
aspectRatio: 0.054141853
--- !u!114 &4454270940782324022
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -5076,7 +5092,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7313975369804211593}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 342, y: 0, z: 0}
m_LocalPosition: {x: 340, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 6786339620859650700}
@@ -5668,7 +5684,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8373088910775864060}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -271, y: -244, z: 0}
m_LocalPosition: {x: -271, y: -227, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2079010362}

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewFollow.unity3d Normal file
View File

Binary file not shown.

7
Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewFollow.unity3d.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 814230e9f4c4a4eee87e98bd8d55fd64
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

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

Binary file not shown.

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

@@ -1 +1 @@
r8 (trCRM/resVer/Android/VerCtl/priority.ver8,9fa2159c6c0cc795c6ff005efa12916c8 %trCRM/resVer/Android/VerCtl/other.ver8,f015b5161f131b75152dbc02ba015a33
r8 (trCRM/resVer/Android/VerCtl/priority.ver8,cdf75ce3bff25ef5479dfe2b87de83aa8 %trCRM/resVer/Android/VerCtl/other.ver8,f015b5161f131b75152dbc02ba015a33

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

Binary file not shown.

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

Binary file not shown.