diff --git a/Assets/CoolapeFrame/3rd/NGUI_Enhance/Scripts/Interaction/UIScrollView.cs b/Assets/CoolapeFrame/3rd/NGUI_Enhance/Scripts/Interaction/UIScrollView.cs
index 0342210..218b5ca 100644
--- a/Assets/CoolapeFrame/3rd/NGUI_Enhance/Scripts/Interaction/UIScrollView.cs
+++ b/Assets/CoolapeFrame/3rd/NGUI_Enhance/Scripts/Interaction/UIScrollView.cs
@@ -39,6 +39,7 @@ public class UIScrollView : MonoBehaviour
WhenDragging,
}
+ [XLua.CSharpCallLua]
public delegate void OnDragNotification ();
///
@@ -129,29 +130,35 @@ public class UIScrollView : MonoBehaviour
/// Event callback to trigger when the drag process begins.
///
+ [XLua.CSharpCallLua]
public OnDragNotification onDragStarted;
///
/// Event callback to trigger when the drag process finished. Can be used for additional effects, such as centering on some object.
///
+ [XLua.CSharpCallLua]
public OnDragNotification onDragFinished;
///
/// Event callback triggered when the scroll view is moving as a result of momentum in between of OnDragFinished and OnStoppedMoving.
///
- ///
+ ///
+ [XLua.CSharpCallLua]
public OnDragNotification onMomentumMove;
- public OnDragNotification onDragmMove;
+ [XLua.CSharpCallLua]
+ public OnDragNotification onDragmMove;
- ///
- /// Event callback to trigger when the scroll view's movement ends.
- ///
+ ///
+ /// Event callback to trigger when the scroll view's movement ends.
+ ///
- public OnDragNotification onStoppedMoving;
+ [XLua.CSharpCallLua]
+ public OnDragNotification onStoppedMoving;
+ [XLua.CSharpCallLua]
public OnDragNotification onStartCenterOnChild; // add by chenbin
// Deprecated functionality. Use 'movement' instead.
diff --git a/Assets/CoolapeFrame/3rd/NGUI_Enhance/Scripts/UI/UIPanel.cs b/Assets/CoolapeFrame/3rd/NGUI_Enhance/Scripts/UI/UIPanel.cs
index ad1d906..3f4e73e 100644
--- a/Assets/CoolapeFrame/3rd/NGUI_Enhance/Scripts/UI/UIPanel.cs
+++ b/Assets/CoolapeFrame/3rd/NGUI_Enhance/Scripts/UI/UIPanel.cs
@@ -122,12 +122,14 @@ public class UIPanel : UIRect
[System.NonSerialized]
public Vector4 drawCallClipRange = new Vector4(0f, 0f, 1f, 1f);
+ [XLua.CSharpCallLua]
public delegate void OnClippingMoved (UIPanel panel);
///
/// Event callback that's triggered when the panel's clip region gets moved.
///
+ [XLua.CSharpCallLua]
public OnClippingMoved onClipMove;
// Clip texture feature contributed by the community: http://www.tasharen.com/forum/index.php?topic=9268.0
diff --git a/Assets/CoolapeFrame/Scripts/toolkit/Callback.cs b/Assets/CoolapeFrame/Scripts/toolkit/Callback.cs
index a0a231a..1fe4db5 100644
--- a/Assets/CoolapeFrame/Scripts/toolkit/Callback.cs
+++ b/Assets/CoolapeFrame/Scripts/toolkit/Callback.cs
@@ -24,8 +24,12 @@
namespace Coolape
{
- public delegate void Callback (params object[] objs);
- public delegate void Callback (T arg1);
- public delegate void Callback (T arg1, U arg2);
- public delegate void Callback (T arg1, U arg2, V arg3);
+ [XLua.CSharpCallLua]
+ public delegate void Callback (params object[] objs);
+ [XLua.CSharpCallLua]
+ public delegate void Callback (T arg1);
+ [XLua.CSharpCallLua]
+ public delegate void Callback (T arg1, U arg2);
+ [XLua.CSharpCallLua]
+ public delegate void Callback (T arg1, U arg2, V arg3);
}
diff --git a/Assets/CoolapeFrameData/cfg/publishChannel.cfg b/Assets/CoolapeFrameData/cfg/publishChannel.cfg
index f2f75f7..d5f8ab0 100644
--- a/Assets/CoolapeFrameData/cfg/publishChannel.cfg
+++ b/Assets/CoolapeFrameData/cfg/publishChannel.cfg
@@ -1 +1 @@
-tBchannelMapr?generalp'FmBuildLocation@iosBuildDmProductNameD添添办公CisThirdExitJmBundleVersionCode
DmCtccChannel7CmSubChannel<1000FmBundleVersion=0.992ImKeystoreNamePath8 +Assets/trCRM/xRes/keystore/tianrun.keystoreEisUseUnityIAPEmKeyaliasPassCtianrun2020BisMoreGameGisSwitchAccountMmCreateEclipseProjectLmLicenseVerificationJmBundleIndentifierHcom.cdtianrun.moEmCopyDirPathsUAmPlatform?androidEmKeyaliasName?tianrun8(mOtherScriptingDefineSymbolsKUSE_LOCATION_SERVERAserverKey8,d265697d3e1ff6fe9435580ea91c4482Cmd5SignCode7BmAlertDesc7JisBuildWithLogView@mChlNmae?GeneralHmSplashImagePath7EmKeystorePassCtianrun2020HmDefaultIconPathv=72x72OtrCRM/xRes/icon/114.png?192x192OtrCRM/xRes/icon/180.png=48x48OtrCRM/xRes/icon/114.png=36x36OtrCRM/xRes/icon/114.png=96x96OtrCRM/xRes/icon/114.png?144x144OtrCRM/xRes/icon/180.pngBgeneraliOSp'FmBuildLocation@iosBuildDmProductNameD添添办公CisThirdExitJmBundleVersionCodeDmCtccChannel7FmBundleVersion;0.5ImKeystoreNamePath8 +Assets/trCRM/xRes/keystore/tianrun.keystoreEisUseUnityIAPCmSubChannel<2000EmKeyaliasPassCtianrun2020BisMoreGameGisSwitchAccountMmCreateEclipseProjectLmLicenseVerificationJmBundleIndentifierHcom.cdtianrun.moEmCopyDirPathsUAmPlatform;iosEmKeyaliasName?tianrun8(mOtherScriptingDefineSymbolsKUSE_LOCATION_SERVERAserverKey8,d265697d3e1ff6fe9435580ea91c4482Cmd5SignCode7BmAlertDesc7JisBuildWithLogView@mChlNmaeBGeneraliOSHmSplashImagePath7EmKeystorePassCtianrun2020HmDefaultIconPathp#?152x152OtrCRM/xRes/icon/180.png=76x76OtrCRM/xRes/icon/114.pngL1024x1024(App Store)PtrCRM/xRes/icon/1024.png=57x57OtrCRM/xRes/icon/114.png?120x120OtrCRM/xRes/icon/120.pngK20x20(Notification)OtrCRM/xRes/icon/114.png?144x144OtrCRM/xRes/icon/180.png=96x96OtrCRM/xRes/icon/114.png?192x192OtrCRM/xRes/icon/180.pngH40x40(Spotlight)OtrCRM/xRes/icon/114.pngJ120x120(Spotlight)OtrCRM/xRes/icon/120.pngK60x60(Notification)OtrCRM/xRes/icon/114.png=48x48OtrCRM/xRes/icon/114.pngK40x40(Notification)OtrCRM/xRes/icon/114.png=72x72OtrCRM/xRes/icon/114.png?180x180OtrCRM/xRes/icon/180.png=36x36OtrCRM/xRes/icon/114.pngG29x29(Settings)OtrCRM/xRes/icon/114.png?114x114OtrCRM/xRes/icon/114.pngG58x58(Settings)OtrCRM/xRes/icon/114.pngH80x80(Spotlight)OtrCRM/xRes/icon/114.pngG87x87(Settings)OtrCRM/xRes/icon/114.png?167x167OtrCRM/xRes/icon/180.pngCchannelEnumX?GeneralBGeneraliOSBchannelKeyX?generalBgeneraliOSHchannelAliasEnumX>通用A通用iOS
\ No newline at end of file
+tBchannelMapr?generalp'FmBuildLocation@iosBuildDmProductNameD添添办公CisThirdExitJmBundleVersionCode
DmCtccChannel7CmSubChannel<1000FmBundleVersion=0.992ImKeystoreNamePath8 +Assets/trCRM/xRes/keystore/tianrun.keystoreEisUseUnityIAPEmKeyaliasPassCtianrun2020BisMoreGameGisSwitchAccountMmCreateEclipseProjectLmLicenseVerificationJmBundleIndentifierHcom.cdtianrun.moEmCopyDirPathsUAmPlatform?androidEmKeyaliasName?tianrun8(mOtherScriptingDefineSymbolsKUSE_LOCATION_SERVERAserverKey8,d265697d3e1ff6fe9435580ea91c4482Cmd5SignCode7BmAlertDesc7JisBuildWithLogView@mChlNmae?GeneralHmSplashImagePath7EmKeystorePassCtianrun2020HmDefaultIconPathv=72x72OtrCRM/xRes/icon/114.png?192x192OtrCRM/xRes/icon/180.png=48x48OtrCRM/xRes/icon/114.png=36x36OtrCRM/xRes/icon/114.png=96x96OtrCRM/xRes/icon/114.png?144x144OtrCRM/xRes/icon/180.pngBgeneraliOSp'FmBuildLocation@iosBuildDmProductNameD添添办公CisThirdExitJmBundleVersionCodeDmCtccChannel7FmBundleVersion;0.6ImKeystoreNamePath8 +Assets/trCRM/xRes/keystore/tianrun.keystoreEisUseUnityIAPCmSubChannel<2000EmKeyaliasPassCtianrun2020BisMoreGameGisSwitchAccountMmCreateEclipseProjectLmLicenseVerificationJmBundleIndentifierHcom.cdtianrun.moEmCopyDirPathsUAmPlatform;iosEmKeyaliasName?tianrun8(mOtherScriptingDefineSymbolsKUSE_LOCATION_SERVERAserverKey8,d265697d3e1ff6fe9435580ea91c4482Cmd5SignCode7BmAlertDesc7JisBuildWithLogView@mChlNmaeBGeneraliOSHmSplashImagePath7EmKeystorePassCtianrun2020HmDefaultIconPathp#?152x152OtrCRM/xRes/icon/180.png=76x76OtrCRM/xRes/icon/114.pngL1024x1024(App Store)PtrCRM/xRes/icon/1024.png=57x57OtrCRM/xRes/icon/114.png?120x120OtrCRM/xRes/icon/120.pngK20x20(Notification)OtrCRM/xRes/icon/114.png=96x96OtrCRM/xRes/icon/114.png?192x192OtrCRM/xRes/icon/180.pngH40x40(Spotlight)OtrCRM/xRes/icon/114.png?167x167OtrCRM/xRes/icon/180.pngJ120x120(Spotlight)OtrCRM/xRes/icon/120.pngK60x60(Notification)OtrCRM/xRes/icon/114.pngH80x80(Spotlight)OtrCRM/xRes/icon/114.png=48x48OtrCRM/xRes/icon/114.pngK40x40(Notification)OtrCRM/xRes/icon/114.png=72x72OtrCRM/xRes/icon/114.png=36x36OtrCRM/xRes/icon/114.pngG29x29(Settings)OtrCRM/xRes/icon/114.png?114x114OtrCRM/xRes/icon/114.pngG58x58(Settings)OtrCRM/xRes/icon/114.png?144x144OtrCRM/xRes/icon/180.pngG87x87(Settings)OtrCRM/xRes/icon/114.png?180x180OtrCRM/xRes/icon/180.pngCchannelEnumX?GeneralBGeneraliOSBchannelKeyX?generalBgeneraliOSHchannelAliasEnumX>通用A通用iOS
\ No newline at end of file
diff --git a/Assets/CoolapeFrameData/verControl/.resModifyDate.v b/Assets/CoolapeFrameData/verControl/.resModifyDate.v
index b684d28..59972e6 100644
--- a/Assets/CoolapeFrameData/verControl/.resModifyDate.v
+++ b/Assets/CoolapeFrameData/verControl/.resModifyDate.v
@@ -318,7 +318,7 @@
/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua.meta,132289129810000000
/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui.meta,132289129800000000
/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/www.meta,132352746190000000
-/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/atlas/atlasAllReal.prefab,132410232500000000
+/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/atlas/atlasAllReal.prefab,132410556790000000
/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/atlas/atlasAllReal.prefab.meta,132289129810000000
/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/localization/Chinese.txt,132385110800000000
/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/localization/Chinese.txt.meta,132289129810000000
@@ -377,7 +377,7 @@
/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/net/CLLNetSerialize.lua.meta,132289129800000000
/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/net/NetProto.lua,132408045760000000
/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/net/NetProto.lua.meta,132355452450000000
-/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLInclude.lua,132409407720000000
+/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLInclude.lua,132410275990000000
/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLInclude.lua.meta,132289129810000000
/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLIncludeBase.lua,132409407720000000
/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLIncludeBase.lua.meta,132291379270000000
@@ -519,7 +519,7 @@
/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPMine.lua.meta,132290982930000000
/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPMsg.lua,132410231480000000
/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPMsg.lua.meta,132300378700000000
-/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPTasks.lua,132410231480000000
+/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPTasks.lua,132410556740000000
/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPTasks.lua.meta,132289134270000000
/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRBasePanel.lua,132370001540000000
/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRBasePanel.lua.meta,132355739310000000
diff --git a/Assets/CoolapeFrameData/verControl/IOS/ver4DevelopeMd5.v b/Assets/CoolapeFrameData/verControl/IOS/ver4DevelopeMd5.v
index 425766c..716cdc9 100644
Binary files a/Assets/CoolapeFrameData/verControl/IOS/ver4DevelopeMd5.v and b/Assets/CoolapeFrameData/verControl/IOS/ver4DevelopeMd5.v differ
diff --git a/Assets/CoolapeFrameData/verControl/IOS/ver4Publish.v b/Assets/CoolapeFrameData/verControl/IOS/ver4Publish.v
index 466ad0e..511c79a 100644
--- a/Assets/CoolapeFrameData/verControl/IOS/ver4Publish.v
+++ b/Assets/CoolapeFrameData/verControl/IOS/ver4Publish.v
@@ -155,10 +155,10 @@ trCRM/upgradeRes4Publish/priority/lua/city/CLLCity.lua,b7ee9fffacb28d09ab08728a4
trCRM/upgradeRes4Publish/priority/lua/db/DBCust.lua,273bb2a70bb044a204392904889b074f
trCRM/upgradeRes4Publish/priority/lua/db/DBMessage.lua,a80d8448cfdaebb072b3d7ec5f40bb60
trCRM/upgradeRes4Publish/priority/lua/db/DBOrder.lua,7f2087299796c187eb9866c14f4afcf8
-trCRM/upgradeRes4Publish/priority/lua/db/DBRoot.lua,2fac1189744a4e00891b46d79cf037ac
-trCRM/upgradeRes4Publish/priority/lua/db/DBStatistics.lua,e64ad532dabb2cb70c4053e223770969
+trCRM/upgradeRes4Publish/priority/lua/db/DBRoot.lua,3b2f7f6d066a93d94754334c6b0b8ba3
+trCRM/upgradeRes4Publish/priority/lua/db/DBStatistics.lua,1f1fe6971f4702b5879e30715fb349e6
trCRM/upgradeRes4Publish/priority/lua/db/DBTextures.lua,55ddfb8bcb4af790b9da55626412e92a
-trCRM/upgradeRes4Publish/priority/lua/db/DBUser.lua,c9708d4e6c1d5427d57a7a9f98d1118b
+trCRM/upgradeRes4Publish/priority/lua/db/DBUser.lua,4b287e00da702dc06ba1acb5206f5e0a
trCRM/upgradeRes4Publish/priority/lua/json/json.lua,a2914572290611d3da35f4a7eec92022
trCRM/upgradeRes4Publish/priority/lua/json/rpc.lua,28c2f09ceb729d01052d8408eed0b57a
trCRM/upgradeRes4Publish/priority/lua/json/rpcserver.lua,48b8f5e53a1141652c38f8a5a8a77928
@@ -166,7 +166,7 @@ trCRM/upgradeRes4Publish/priority/lua/net/CLLNet.lua,947abdf2c019f44a26211acf6f3
trCRM/upgradeRes4Publish/priority/lua/net/CLLNetSerialize.lua,30c24f11d46d7b887bf32177acb92c81
trCRM/upgradeRes4Publish/priority/lua/net/NetProto.lua,f000f7d25ec91a2208d2c18493fec81a
trCRM/upgradeRes4Publish/priority/lua/net/NetProtoUsermgrClient.lua,f65df462666ca9fca7f16c2954984527
-trCRM/upgradeRes4Publish/priority/lua/public/CLLInclude.lua,9632bef1d1bbe5c30c5f7f055c984213
+trCRM/upgradeRes4Publish/priority/lua/public/CLLInclude.lua,a83b770e54fae3e1a7e682f30b41ecbe
trCRM/upgradeRes4Publish/priority/lua/public/CLLIncludeBase.lua,4820cbe7f1f16ec63ed1dd8426533483
trCRM/upgradeRes4Publish/priority/lua/public/CLLPool.lua,3e6a97eb07cfdff7c399eb3e956ba77c
trCRM/upgradeRes4Publish/priority/lua/public/CLLPrefs.lua,1719d57c97fe0d8f2c9d1596cb6e2ac8
@@ -179,7 +179,7 @@ trCRM/upgradeRes4Publish/priority/lua/toolkit/CLLUpdateUpgrader.lua,bfff3548aa7c
trCRM/upgradeRes4Publish/priority/lua/toolkit/CLLVerManager.lua,39b154e796d60c2c40ebcc427a5c05e8
trCRM/upgradeRes4Publish/priority/lua/toolkit/KKLogListener.lua,85784ec79aefde29be3ef308e7b5203b
trCRM/upgradeRes4Publish/priority/lua/toolkit/LuaUtl.lua,cde8ec272382f95abe0320714201b387
-trCRM/upgradeRes4Publish/priority/lua/toolkit/MyUtl.lua,97c49c665b4f8cd7ea4aa1e7fbe59c19
+trCRM/upgradeRes4Publish/priority/lua/toolkit/MyUtl.lua,cff73cd564d54caaa97d74ac808e2d07
trCRM/upgradeRes4Publish/priority/lua/toolkit/curve-families.png,d0b6b9b8a623a188aeae2fb688a8a0e5
trCRM/upgradeRes4Publish/priority/lua/toolkit/curve.lua,f97735ed6c39accb55cdae44b62b5b38
trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLCellToast.lua,6e350721fca8167bd621df86ad982326
@@ -216,9 +216,9 @@ trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellProccessHis.lua,aa7171042577
trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellProductList.lua,078920175f85f04660584bddb359b7ab
trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellProductSelected.lua,e7f4b1e06a54d5fa52cf9a4ed00f5233
trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellRecord.lua,ca94ed9775ca9f03569e49d4ad1f3e14
-trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellReportform1.lua,d31b42aa50089defb22bde59b5c0474d
-trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellReportform2.lua,47ac1164b1ffb27397953ccb032fd2d7
-trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellReportform3.lua,f83300f176e1c35d62e00e69539998f3
+trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellReportform1.lua,3b291f38637590e0fca816cae521a4f0
+trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellReportform2.lua,e62a82bcc9fb817a4460e82b6351e18f
+trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellReportform3.lua,8f055265d33f40a2278e159a8ebf2b56
trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellSysMessageList.lua,1ce46f4b3a1a8b728e447c12e7df1831
trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellTaskList.lua,d51c12f9e5de1f5db917d82a63585b85
trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPBackplate.lua,ae946f1cec5baad680f4e8a0f7e71223
@@ -230,57 +230,57 @@ trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPLoginCoolape.lua,5873be60edc8
trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPPopList.lua,896c4b35a6cd0d4f86ed5c0ba532ea00
trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPPopTime.lua,0e26b4cf8f9bfde695d5fcd64009c06a
trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPSceneManager.lua,b1b848791df37e59bdf7d5acf9cb9273
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPSplash.lua,553833fd9a7e590ecc216f27f06e6954
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPSplash.lua,6418723ac66fc8ab625db8d61cd2c07d
trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPStart.lua,2b1cfdf95c65071b1f480d8015615c78
trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPWWWProgress.lua,b713ddf9f0af8602ec48f71162181d6d
trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPWebView.lua,093deec807e28be04df4d593bcff9e38
trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMain.lua,24f616b9384dc0eefa9955fabb1d05f1
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMine.lua,5b25a51eed2e704282548d90961076a1
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMsg.lua,d6391fba95cc1e47d6110091209578f9
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPTasks.lua,8cca9814b1002af33eeb1288432750b9
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMine.lua,0be1d92322048e7747b85f824bda77ec
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMsg.lua,07126517955d022169bbd02def384ade
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPTasks.lua,006f377723dc559415eeb80a4987eb3f
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRBasePanel.lua,dc088058987b435c998a9709297a88e6
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPAbout.lua,71d2cb408fb525eaf6873ef6a1e6ea33
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPAbout.lua,dae2d1afc8a5e2d7c996c6056aa42dc4
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPBatchGetCusts.lua,824f77c2486687108fa391a8fb08a405
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPBindPhone.lua,c7ad2d414659e2aeecff5bba7f9f758d
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPComFilter.lua,c040b1943969ac6b45490cefd11d56ed
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPComFilter.lua,522e60b5e11321ef12cb2466b5b249d2
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPConfirm2.lua,bd0ea9f50708dedd598b517c1dfc739f
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPConnect.lua,24712c363be3eef2c7e32413cc9f146d
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCusFilter.lua,f0452e3d6cfa59244dc7b9dd8f5a475d
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustDetail.lua,6b6bd07455bdee8e74ee39eda0aafd05
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustDetailSimple.lua,29adc9bfa2c554aded7b025e032e9c40
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustDetail.lua,152602fd1be6119a10e28e488090baa7
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustDetailSimple.lua,7528caabcee343a09a3bb7a67a56010f
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustFilter.lua,450e7e75ebfe83bb65d59beb3ce60782
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustList.lua,3ff82a44063ae45c15a4d4bcaa99ff3f
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustListProc.lua,ed63252ecb5ba3c85bd6f03741c3ea2e
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustList.lua,bcebb5a35d387e2bb40771169017f69a
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustListProc.lua,5173a3a248c9989a58e6097a409a94e7
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPEditPrice.lua,ceb906ae12222324b9a61f4b83ec7e58
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPFollowFilter.lua,557000073e3da28450e4d476b25dd398
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPFollowList.lua,0cc07b44a903641398d6c296b5df2721
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPFollowFilter.lua,f436c880f71e048db7b82de41e881b8f
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPFollowList.lua,1fed6ece17c84668a9a8ac23bdb6ce13
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPGuid.lua,ee29c8c2537cd4c445afe1397450cdae
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPLogin.lua,3cc9a59870684a589fbdb2567cff402d
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPModifyFiled.lua,99b250c386ce8dad9c10c8f4fe9874f1
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPMoreProc4Cust.lua,d75b0e5651468028373c4f326937d460
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPMyInfor.lua,969c4735df749df41cb9a07b80e6a5f8
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewCust.lua,c4cd6ec5f8d5904422650c4b87e784ee
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollow.lua,6d4d720014af3d81a8939c6db2ff6b77
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollowSimple.lua,08efdc6a2d7e8cbcc566c165f8be1228
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollowTask.lua,642ddf850a0f1f2c20b23d2cccaac415
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewOrder.lua,49926a1da54d63038c01bcb2ee05c415
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOceanList.lua,0d3aebdcc462cf629b226b8f3062f43c
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOrderDetail.lua,6237287e52af8af3de8ffced10ef5d9e
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOrderList.lua,ccefe1d1013cb50451beb1a1bce080f0
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPMyInfor.lua,630b2e9e9355cbd9106b36b35d20fd3d
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewCust.lua,602888a7dd58a9fe98a61ee9c829aa84
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollow.lua,44d27d9aa244dd7bb4d039d627a96ad7
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollowSimple.lua,35ac4acdd74e7c09950bbb26fed5d010
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollowTask.lua,32466ec1a4b799de26e447f17cabc760
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewOrder.lua,6e2e45005c89570bae55b3df5a0148f7
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOceanList.lua,0e9abcbfdd89a4264c02d1b1fd94cd10
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOrderDetail.lua,d69a767e5d6a6a5cc33fce98464d3bc1
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOrderList.lua,dad09d99c3d896f7c1ce1c1c854073ea
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPPlaySoundRecord.lua,ded1f35f04bd0d84bfa8fd74ddf926aa
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPPopCheckBoxs.lua,508171a924c113573b01a396e8217cc2
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPProductDetail.lua,d1f8d07d0f1f956e3f2c1c5c0a987b9c
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPProductList.lua,69e0f8071709a1d510030a4dc8ab5f99
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPProductDetail.lua,3dc8162a924b39216912d011f05ee774
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPProductList.lua,58bf1853609c6bd92a81fac50f5e1efc
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPResetPasswordStep1.lua,e60401c35bddbb36174a5dce4334213c
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPResetPasswordStep2.lua,23c1f8a0e9f8df7cc569803f3e553729
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,54c833b711f3dea947b5db57dbc4f367
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSelectProduct.lua,6f04603760bd1ceed90cba39d1207228
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSelectServer.lua,50a46489d0d704df26d61ae9a2f5d5fe
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSetting.lua,08c71eabfdf2735604a5f44b2533288b
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSysMsgDetail.lua,478ea086d35467ce7f99c2a77feeb83f
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSysMsgList.lua,6886a2c8ed19484ae5c4e715a5615dac
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPTaskList.lua,79d40e9adae8a9ea488eb5c73857b335
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSetting.lua,3f0976bdbc070d9cebc936e5c21735f1
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSysMsgDetail.lua,fd4b28f1cdf003bb4207e7a3064cffb8
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSysMsgList.lua,64012de583f1cd85584903ce68a0c812
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPTaskList.lua,1798231882ed1ffee8ce2fe6492c7b36
trCRM/upgradeRes4Publish/priority/ui/other/IOS/AlertRoot.unity3d,eebc730459217511668036a3271830cb
trCRM/upgradeRes4Publish/priority/ui/other/IOS/EmptySpace.unity3d,f31364f6bf0af550da34b54cbe567791
trCRM/upgradeRes4Publish/priority/ui/other/IOS/Frame1.unity3d,e0760bb76b26b81b295e4a1d55cacd65
@@ -303,7 +303,7 @@ trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelComFilter.unity3d,9586725145
trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelConfirm.unity3d,f9191300dcd87528fdd3631b751728e2
trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelConfirm2.unity3d,ad24a77e6cd58b9d89fd442efdfa05e6
trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelConnect.unity3d,8b75761010993e44fabc270719df036e
-trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelCustDetail.unity3d,16cd668619af041e54b7931a1bcdded0
+trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelCustDetail.unity3d,e89b0adec50280b6160b8b36a8c0ad68
trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelCustDetailSimple.unity3d,5f706ca8a29db94a29193cc212fb2d9a
trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelCustList.unity3d,f245c5f6cbe6e928b73a436a302d65fe
trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelCustListProc.unity3d,6d34a582e26398cc21b51fdee50c05c4
@@ -318,7 +318,7 @@ trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelMask4Panel.unity3d,6df5d4b74
trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelMine.unity3d,5cedc775762a1849f2e76767e92adbb2
trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelModifyFiled.unity3d,687e89480fdd9d074d1ae636b070951d
trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelMoreProc4Cust.unity3d,52958f3469055cfa60179175a07ca9fe
-trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelMsg.unity3d,4ed953856a5dd4a6944a76694aaf5a80
+trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelMsg.unity3d,1184f5588d2c8b676323c2eeb70b788d
trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelMyInfor.unity3d,c6640ed473b69f3c72d9f4639cf66eb6
trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelNewCust.unity3d,dab39d6090cd685f97211dbdf1f36a7b
trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelNewFollow.unity3d,80fe716f1f5cd445cdc7092e4f3bf10b
@@ -326,8 +326,8 @@ trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelNewFollowSimple.unity3d,ebb0
trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelNewFollowTask.unity3d,ea596f54f78cd1d64032701cc286e4bb
trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelNewOrder.unity3d,2453a96b8c8782ebe965c57d202b79ec
trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelOceanList.unity3d,ca10d10d7a0bfd527593b59ccca3cb0f
-trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelOrderDetail.unity3d,2ae19d5ad04f92a593030b2f2c038aa9
-trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelOrderList.unity3d,c9cf54e06cfd16b43d2cda40d8761e3a
+trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelOrderDetail.unity3d,a1731cc1271cfd808fc7e2471d0335fe
+trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelOrderList.unity3d,b6ad0bb8c86aff4c0ff48fffa58d153e
trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelPlaySoundRecord.unity3d,58c4a9930f351265342a31a37b11c7a0
trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelPopCheckBoxs.unity3d,eeb63a97df92c49a16d1cb8684f4d38f
trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelPopList.unity3d,c581aa0663d7621cf179161466b484f4
@@ -347,7 +347,7 @@ trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelStart.unity3d,f86ac64b15f6d8
trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelSysMsgDetail.unity3d,f8ea95854ab994cc6e06e2166967c0b3
trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelSysMsgList.unity3d,3d0a1fd9c4b5d05b268bb73d3c810127
trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelTaskList.unity3d,179f04012a054bea4339cc2e36d39ece
-trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelTasks.unity3d,17da44d92370fe86f001258a0a122246
+trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelTasks.unity3d,848c55fad144ffeda12f4882ca8793c0
trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelWWWProgress.unity3d,86786bd679b1592402f9cd98ba1bc0cf
trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelWebView.unity3d,18c6bf9e3f56cfe57f6d0dece1b40843
trCRM/upgradeRes4Publish/priority/ui/panel/IOS/ToastRoot.unity3d,f0660c39395e81fccc4c3862779d66aa
diff --git a/Assets/CoolapeFrameData/verControl/IOS/ver4Upgrade.v b/Assets/CoolapeFrameData/verControl/IOS/ver4Upgrade.v
index 2e56377..5ea9f2d 100644
--- a/Assets/CoolapeFrameData/verControl/IOS/ver4Upgrade.v
+++ b/Assets/CoolapeFrameData/verControl/IOS/ver4Upgrade.v
@@ -1,6 +1,5 @@
trCRM/upgradeRes/priority/ui/panel/IOS/PanelSysMsgList.unity3d,3d0a1fd9c4b5d05b268bb73d3c810127
trCRM/upgradeRes/priority/lua/ui/cell/TRCellExtendField.lua,dba644a81c6214e4804eaebc0931382f
-trCRM/upgradeRes/priority/lua/ui/panel/TRPMoreProc4Cust.lua,d75b0e5651468028373c4f326937d460
trCRM/upgradeRes/priority/lua/public/CLLIncludeBase.lua,4820cbe7f1f16ec63ed1dd8426533483
trCRM/upgradeRes/priority/lua/ui/panel/CSPMain.lua,24f616b9384dc0eefa9955fabb1d05f1
trCRM/upgradeRes/priority/lua/json/json.lua,a2914572290611d3da35f4a7eec92022
@@ -11,6 +10,7 @@ trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustFilterGroup.lua,93cdb67f51a62110
trCRM/upgradeRes/other/uiAtlas/mine/IOS/myset_check.unity3d,c374b4c94e874e2602d8c2293981c22e
trCRM/upgradeRes/other/uiAtlas/coolape/IOS/name.unity3d,36243d44e09cf15a30c136f4e8f7b06e
trCRM/upgradeRes/other/uiAtlas/public/IOS/tips_4.unity3d,ff6d1ab367bc0bfd8603ac8f246cb66c
+trCRM/upgradeRes/other/uiAtlas/coolape/IOS/password.unity3d,584af77561cb1dfe6aca0640a6a2b9cf
trCRM/upgradeRes/other/uiAtlas/news/IOS/news_bg.unity3d,64c5142dc2ace4a338bac2b103207f36
trCRM/upgradeRes/other/uiAtlas/cust/IOS/pause.unity3d,8eff010febb0a0d6365a65fed01cf38d
trCRM/upgradeRes/other/uiAtlas/coolape/IOS/user.unity3d,5e6e50cd8a40d64ae2c58a2d531676fa
@@ -33,13 +33,14 @@ trCRM/upgradeRes/priority/ui/panel/IOS/PanelBatchGetCusts.unity3d,1887b44254dd18
trCRM/upgradeRes/priority/ui/panel/IOS/PanelPopCheckBoxs.unity3d,eeb63a97df92c49a16d1cb8684f4d38f
trCRM/upgradeRes/other/uiAtlas/mine/IOS/myset_data.unity3d,d2c0627b468f06867987c41b74c84dce
trCRM/upgradeRes/priority/lua/toolkit/LuaUtl.lua,cde8ec272382f95abe0320714201b387
-trCRM/upgradeRes/priority/lua/ui/cell/CLLUICellPopTime.lua,04eda18a177de8ef755cbade62b61097
+trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustProc.lua,3f9f33de3630a03463952058ba795128
trCRM/upgradeRes/other/uiAtlas/public/IOS/check_full.unity3d,d2a9f4ed2598e59dc161cce43869979d
trCRM/upgradeRes/priority/lua/net/NetProtoUsermgrClient.lua,f65df462666ca9fca7f16c2954984527
trCRM/upgradeRes/other/uiAtlas/order/IOS/ipt_bg.unity3d,b1698fd4a965642b0908672fbc283a64
trCRM/upgradeRes/priority/ui/panel/IOS/PanelSceneManager.unity3d,7c9a53dc83974a6cab329f0987511428
trCRM/upgradeRes/priority/ui/panel/IOS/PanelFollowFilter.unity3d,cc3fedaa66097cf230aaf9b3767e6766
trCRM/upgradeRes/other/uiAtlas/work/IOS/work_icon_1.unity3d,0ce47cb41a1c039d116f0a1176ffdc82
+trCRM/upgradeRes/other/uiAtlas/cust/IOS/peo.unity3d,0d912c6c28bf962b0e1f28ac4f76d2ba
trCRM/upgradeRes/priority/lua/ui/panel/CLLPSplash.lua,6418723ac66fc8ab625db8d61cd2c07d
trCRM/upgradeRes/priority/ui/panel/IOS/PanelBindPhone.unity3d,58f85410d5d614196793a0ce1eceb800
trCRM/upgradeRes/priority/lua/ui/cell/CLLCellWWWProgress.lua,ec0258e77f76c8b681d0f02e7a5ff342
@@ -51,7 +52,6 @@ trCRM/upgradeRes/priority/lua/ui/panel/TRPGuid.lua,ee29c8c2537cd4c445afe1397450c
trCRM/upgradeRes/other/uiAtlas/public/IOS/radio.unity3d,0c43a7ba6ffa8229a8639635ce0ce238
trCRM/upgradeRes/other/uiAtlas/cust/IOS/right.unity3d,3d5aa57f1b9a4c63ceac9f3f8e9a588a
trCRM/upgradeRes/priority/ui/panel/IOS/PanelLogin.unity3d,68658d870bfd42c01e8ef7f0c5438644
-trCRM/upgradeRes/other/uiAtlas/public/IOS/company_bg.unity3d,6d7720ce23e31c17a508386fe837ab12
trCRM/upgradeRes/other/uiAtlas/public/IOS/_empty.unity3d,8e127e3490c9651f0756f621dc2fb1a6
trCRM/upgradeRes/priority/lua/ui/panel/TRPSetting.lua,3f0976bdbc070d9cebc936e5c21735f1
trCRM/upgradeRes/priority/lua/ui/panel/TRPNewOrder.lua,6e2e45005c89570bae55b3df5a0148f7
@@ -63,7 +63,7 @@ trCRM/upgradeRes/priority/ui/other/IOS/InputDate.unity3d,5823a644a38f4cb6ae2c87c
trCRM/upgradeRes/priority/ui/panel/IOS/PanelEditPrice.unity3d,556928848822b2e59c2e1bd0e399281f
trCRM/upgradeRes/priority/ui/panel/IOS/PanelCustListProc.unity3d,6d34a582e26398cc21b51fdee50c05c4
trCRM/upgradeRes/other/txt/IOS/serviceProto.unity3d,b4a711698317a7a9198dc4632fd3795a
-trCRM/upgradeRes/priority/lua/ui/cell/TRCellReportform1.lua,3b291f38637590e0fca816cae521a4f0
+trCRM/upgradeRes/priority/ui/panel/IOS/PanelWebView.unity3d,18c6bf9e3f56cfe57f6d0dece1b40843
trCRM/upgradeRes/other/uiAtlas/public/IOS/button2.unity3d,40d97a2e75c6356efc74c2615133c2a7
trCRM/upgradeRes/other/uiAtlas/mine/IOS/me_order.unity3d,4761f197ec41cf9d98ad4be47bed3d1a
trCRM/upgradeRes/other/uiAtlas/cust/IOS/cus_followup.unity3d,53f6896e2d1d3bbb17bf916c681575ec
@@ -83,31 +83,32 @@ trCRM/upgradeRes/priority/ui/panel/IOS/PanelSetting.unity3d,dc3b37bba3b707fcd07f
trCRM/upgradeRes/other/uiAtlas/news/IOS/new2_unread.unity3d,11f64f47835f9a2dc98f55d5d95d524a
trCRM/upgradeRes/other/uiAtlas/work/IOS/work_icon_3.unity3d,af4d8fecaed77fb37428cbd9c347f919
trCRM/upgradeRes/other/uiAtlas/cust/IOS/limt.unity3d,e40d61488fa008460f97c9e44b2956c7
-trCRM/upgradeRes/other/uiAtlas/cust/IOS/funnel.unity3d,9eabb57135190dc338da14a450b63e72
+trCRM/upgradeRes/priority/lua/ui/cell/CLLUICellPopTime.lua,04eda18a177de8ef755cbade62b61097
trCRM/upgradeRes/other/uiAtlas/work/IOS/work_bg_shadow.unity3d,787c967d2f66f1047de67b68f47c35b2
trCRM/upgradeRes/other/uiAtlas/news/IOS/news_4.unity3d,ae0c7c492a9ff216765d0a98f32604db
trCRM/upgradeRes/other/uiAtlas/hotwheel/IOS/hotWheel_prog.unity3d,f71546fbb57c422c80f6fe06648c0e96
trCRM/upgradeRes/priority/ui/other/IOS/Frame2.unity3d,7dcd1d4f4868681c0e942ef76b8e0ae3
trCRM/upgradeRes/priority/lua/ui/panel/CLLPSceneManager.lua,b1b848791df37e59bdf7d5acf9cb9273
trCRM/upgradeRes/other/uiAtlas/public/IOS/check.unity3d,615efa024329ca180668ab885cded3c7
-trCRM/upgradeRes/other/uiAtlas/order/IOS/upload.unity3d,595de11108017f12c98da808c51ce0fe
+trCRM/upgradeRes/priority/ui/panel/IOS/PanelAbout.unity3d,5973617a53e87793dd18f06d5e9d47f7
trCRM/upgradeRes/priority/ui/panel/IOS/PanelNewFollow.unity3d,80fe716f1f5cd445cdc7092e4f3bf10b
trCRM/upgradeRes/other/uiAtlas/public/IOS/radio_full.unity3d,cc41b26969b05580412381ffcf7019cd
trCRM/upgradeRes/priority/lua/ui/cell/TRCellAttachment.lua,a2a2646b04e3de80a094bdb73ba1d3bc
-trCRM/upgradeRes/other/uiAtlas/cust/IOS/border.unity3d,29a0e90c8c75eaac236a3bf65ee28fd3
trCRM/upgradeRes/priority/lua/ui/cell/CLLUICalenderMonth.lua,a0528f4babd35af565034c810be1c101
trCRM/upgradeRes/other/uiAtlas/public/IOS/tips_2.unity3d,09643bb6fdab7301459fa4206afe89ee
trCRM/upgradeRes/other/uiAtlas/logo/IOS/512.unity3d,5eb2ccd0ff5993c567417936bf584055
trCRM/upgradeRes/priority/ui/panel/IOS/PanelNewCust.unity3d,dab39d6090cd685f97211dbdf1f36a7b
trCRM/upgradeRes/priority/lua/ui/panel/TRPCustDetailSimple.lua,7528caabcee343a09a3bb7a67a56010f
trCRM/upgradeRes/priority/ui/panel/IOS/PanelSelectProduct.unity3d,43fe0b426e702a034c3641692fa12147
+trCRM/upgradeRes/priority/lua/ui/cell/TRCellComFilter.lua,2fb22f9248e4af86ab42482151a5b141
trCRM/upgradeRes/priority/lua/ui/panel/TRPCustListProc.lua,5173a3a248c9989a58e6097a409a94e7
trCRM/upgradeRes/other/uiAtlas/cust/IOS/remove.unity3d,773dc01867e41eabf23bf22dc4c35507
trCRM/upgradeRes/other/uiAtlas/cust/IOS/more.unity3d,7d7a478fdc0c1cc0506c6fd92d230b3f
trCRM/upgradeRes/priority/lua/toolkit/CLLPrintEx.lua,86d891ec4d8bfa5533704c142fc97235
trCRM/upgradeRes/priority/lua/ui/panel/TRPResetPasswordStep1.lua,e60401c35bddbb36174a5dce4334213c
+trCRM/upgradeRes/priority/lua/db/DBOrder.lua,7f2087299796c187eb9866c14f4afcf8
trCRM/upgradeRes/priority/ui/panel/IOS/PanelSysMsgDetail.unity3d,f8ea95854ab994cc6e06e2166967c0b3
-trCRM/upgradeRes/other/uiAtlas/work/IOS/work_bg.unity3d,b014274b898e403aa52277f9a5978776
+trCRM/upgradeRes/other/uiAtlas/icon/IOS/icon_26_no.unity3d,d39394e00d037c17920ed100a1d4be40
trCRM/upgradeRes/priority/ui/panel/IOS/PanelTasks.unity3d,848c55fad144ffeda12f4882ca8793c0
trCRM/upgradeRes/other/uiAtlas/news/IOS/news_bg_num1.unity3d,244cfbdb8f31592e89902640ce1abeb6
trCRM/upgradeRes/priority/ui/panel/IOS/PanelHotWheel.unity3d,df8e2af7c56b7911ab45f4d92ef35961
@@ -131,13 +132,11 @@ trCRM/upgradeRes/other/uiAtlas/order/IOS/system.unity3d,f5f16b0b52fb5f0c303a7b20
trCRM/upgradeRes/other/uiAtlas/work/IOS/work_bg_noshadow.unity3d,c56930cafa0823cbe54854859039cc43
trCRM/upgradeRes/other/uiAtlas/mine/IOS/log_bg.unity3d,6e86477cb2815f29ab537aa085b88b85
trCRM/upgradeRes/other/uiAtlas/icon/IOS/company_1.unity3d,3ff3b66fd2476d8245f07daeda300ab2
-trCRM/upgradeRes/priority/lua/ui/panel/TRPSelectCompany.lua,28ca57d169af022ec621dece879bdcfc
-trCRM/upgradeRes/other/uiAtlas/cust/IOS/cus_task.unity3d,747e55b8f7096ca0aad8270690100afd
+trCRM/upgradeRes/priority/lua/ui/cell/TRCellPopCheckbox.lua,25adbf58789186d43c15cfe65d2e8501
trCRM/upgradeRes/other/uiAtlas/guid/IOS/3.unity3d,c811075966bb6d036edcc94bb84302af
trCRM/upgradeRes/other/uiAtlas/public/IOS/tips_3.unity3d,d095dbcdbab9d44c6aa63fa92e5f984b
trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustFilter.lua,2fb22f9248e4af86ab42482151a5b141
trCRM/upgradeRes/priority/lua/db/DBTextures.lua,55ddfb8bcb4af790b9da55626412e92a
-trCRM/upgradeRes/priority/ui/panel/IOS/PanelWebView.unity3d,18c6bf9e3f56cfe57f6d0dece1b40843
trCRM/upgradeRes/priority/lua/ui/panel/TRPComFilter.lua,522e60b5e11321ef12cb2466b5b249d2
trCRM/upgradeRes/other/uiAtlas/work/IOS/380bg.unity3d,2d66070d4c85a3d0d9b06bb68260f2b7
trCRM/upgradeRes/priority/lua/ui/panel/CSPMine.lua,0be1d92322048e7747b85f824bda77ec
@@ -157,7 +156,7 @@ trCRM/upgradeRes/priority/lua/city/CLLCity.lua,b7ee9fffacb28d09ab08728a49dedc8e
trCRM/upgradeRes/priority/ui/panel/IOS/PanelCustList.unity3d,f245c5f6cbe6e928b73a436a302d65fe
trCRM/upgradeRes/priority/lua/ui/panel/TRPFollowList.lua,1fed6ece17c84668a9a8ac23bdb6ce13
trCRM/upgradeRes/priority/lua/public/CLLStack.lua,579069654d88a15e43c818a6b8079b15
-trCRM/upgradeRes/priority/lua/db/DBOrder.lua,7f2087299796c187eb9866c14f4afcf8
+trCRM/upgradeRes/priority/lua/ui/panel/TRPResetPasswordStep2.lua,23c1f8a0e9f8df7cc569803f3e553729
trCRM/upgradeRes/priority/lua/ui/panel/CSPMsg.lua,07126517955d022169bbd02def384ade
trCRM/upgradeRes/priority/ui/panel/IOS/PanelMine.unity3d,5cedc775762a1849f2e76767e92adbb2
trCRM/upgradeRes/other/uiAtlas/cust/IOS/bg.unity3d,bd8a8bbae53c33e67e357862b7e6228a
@@ -165,7 +164,6 @@ trCRM/upgradeRes/other/uiAtlas/login/IOS/log_sms.unity3d,64043728c70f02d54320813
trCRM/upgradeRes/priority/lua/ui/panel/TRPLogin.lua,3cc9a59870684a589fbdb2567cff402d
trCRM/upgradeRes/other/uiAtlas/login/IOS/log_invisible.unity3d,3f52b93a1cffe3583e34c9252554483a
trCRM/upgradeRes/priority/lua/cfg/DBCfgTool.lua,a6760e05dcc5f91202e3659179a464e7
-trCRM/upgradeRes/other/uiAtlas/order/IOS/icon_3.unity3d,4ba8140bcf5996c22461673f7bb40b8b
trCRM/upgradeRes/other/uiAtlas/public/IOS/tips_1.unity3d,f8e9f5aec240b7818a58b7674fd14939
trCRM/upgradeRes/priority/ui/panel/IOS/PanelCustDetail.unity3d,e89b0adec50280b6160b8b36a8c0ad68
trCRM/upgradeRes/priority/lua/ui/panel/CLLPLoginCoolape.lua,5873be60edc8f1407dc9fb53ec567ebf
@@ -187,15 +185,17 @@ trCRM/upgradeRes/priority/ui/panel/IOS/PanelProductList.unity3d,07dbbf1f88c3e10e
trCRM/upgradeRes/priority/ui/panel/IOS/PanelConnect.unity3d,8b75761010993e44fabc270719df036e
trCRM/upgradeRes/priority/lua/ui/panel/TRPConfirm2.lua,bd0ea9f50708dedd598b517c1dfc739f
trCRM/upgradeRes/priority/lua/ui/panel/TRPBindPhone.lua,c7ad2d414659e2aeecff5bba7f9f758d
+trCRM/upgradeRes/priority/ui/panel/IOS/PanelOrderList.unity3d,b6ad0bb8c86aff4c0ff48fffa58d153e
trCRM/upgradeRes/other/uiAtlas/order/IOS/icon_6.unity3d,6ca952b69c2297e56f3d30d68ad88b28
trCRM/upgradeRes/priority/lua/ui/panel/TRBasePanel.lua,dc088058987b435c998a9709297a88e6
trCRM/upgradeRes/priority/lua/public/class.lua,cc0f201cc55c59f8bc8f623853382b9c
trCRM/upgradeRes/priority/ui/other/IOS/EmptySpace.unity3d,f31364f6bf0af550da34b54cbe567791
trCRM/upgradeRes/priority/ui/other/IOS/InputCheckboxs.unity3d,fe4c73b8a6322152fad7ad979437665b
+trCRM/upgradeRes/priority/lua/ui/panel/CLLPWWWProgress.lua,b713ddf9f0af8602ec48f71162181d6d
trCRM/upgradeRes/priority/ui/other/IOS/InputPoplist.unity3d,23d3e12b541d9eb26d0f83a29145e62f
trCRM/upgradeRes/other/uiAtlas/cust/IOS/task.unity3d,aa21e488c5f526e12886cae586f30375
trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustStar.lua,ed39330cf68d1e1e062bc8311d1e8d44
-trCRM/upgradeRes/priority/lua/ui/cell/TRCellOceanList.lua,911d6edb241c34ee721815622ea707c3
+trCRM/upgradeRes/priority/ui/panel/IOS/PanelTaskList.unity3d,179f04012a054bea4339cc2e36d39ece
trCRM/upgradeRes/other/uiAtlas/news/IOS/news_2.unity3d,5b2f3543562cb611fd5b986f93b9d450
trCRM/upgradeRes/other/uiAtlas/main/IOS/icon_news2.unity3d,534faecceb533b756cb7df4aa8f13d05
trCRM/upgradeRes/other/uiAtlas/hotwheel/IOS/loading.unity3d,ae3b70b6c5220e215b73d037edd9a45a
@@ -203,12 +203,12 @@ trCRM/upgradeRes/other/uiAtlas/main/IOS/icon_work2.unity3d,8579e52d8aa949abce514
trCRM/upgradeRes/priority/www/baidumap.html,d210e48796dd96343f9c17bc1d230136
trCRM/upgradeRes/priority/lua/ui/panel/TRPProductList.lua,58bf1853609c6bd92a81fac50f5e1efc
trCRM/upgradeRes/priority/lua/ui/panel/CLLPHotWheel.lua,1760aa9933da4b421f1c6093d802cb4f
-trCRM/upgradeRes/priority/lua/ui/cell/TRCellPopCheckbox.lua,25adbf58789186d43c15cfe65d2e8501
trCRM/upgradeRes/priority/lua/db/DBUser.lua,4b287e00da702dc06ba1acb5206f5e0a
+trCRM/upgradeRes/priority/lua/ui/panel/TRPResetPasswordStep3.lua,0d3be662e0a236b709d8f1f9d6b3321e
trCRM/upgradeRes/priority/lua/ui/cell/CLLFrame1.lua,1fd4e80adb13bd0d3cb0d7449922667b
trCRM/upgradeRes/other/uiAtlas/work/IOS/work_icon_4.unity3d,d98d7815445c18b51e8c2abcc382f764
trCRM/upgradeRes/other/uiAtlas/news/IOS/news_3.unity3d,267178166037b19856d0a3a481ee810d
-trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustProc.lua,3f9f33de3630a03463952058ba795128
+trCRM/upgradeRes/other/uiAtlas/cust/IOS/phone.unity3d,917fe8084ceb86ffe99a91119401b398
trCRM/upgradeRes/other/uiAtlas/public/IOS/on_off.unity3d,1bd2636935bdcbcf3d55a69f873c44ad
trCRM/upgradeRes/other/uiAtlas/news/IOS/new2_notice.unity3d,6ebfcad9d2385d00b275e41b69bf5633
trCRM/upgradeRes/priority/lua/toolkit/MyUtl.lua,cff73cd564d54caaa97d74ac808e2d07
@@ -221,7 +221,7 @@ trCRM/upgradeRes/other/uiAtlas/mine/IOS/me_set.unity3d,855ee24944fb29abc087341b9
trCRM/upgradeRes/other/uiAtlas/cust/IOS/record.unity3d,ed6faf19e45aa99e37c622ef92e131dc
trCRM/upgradeRes/other/uiAtlas/news/IOS/new2_wait.unity3d,a593ecf733c7c21e1f754328c9601139
trCRM/upgradeRes/priority/lua/ui/panel/TRPNewFollow.lua,44d27d9aa244dd7bb4d039d627a96ad7
-trCRM/upgradeRes/other/uiAtlas/coolape/IOS/password.unity3d,584af77561cb1dfe6aca0640a6a2b9cf
+trCRM/upgradeRes/priority/lua/ui/panel/TRPSysMsgList.lua,64012de583f1cd85584903ce68a0c812
trCRM/upgradeRes/other/uiAtlas/cust/IOS/search.unity3d,e47e0f93cf36d5b583ed74dd599e6036
trCRM/upgradeRes/other/uiAtlas/work/IOS/work_color.unity3d,0f386613e266039c15d6dc1dfa8643bc
trCRM/upgradeRes/priority/ui/panel/IOS/PanelMask4Panel.unity3d,6df5d4b74cb3e18589239a4f5a0f2988
@@ -231,14 +231,14 @@ trCRM/upgradeRes/other/uiAtlas/news/IOS/news_1.unity3d,aba0d05e735d2f90eff16694e
trCRM/upgradeRes/priority/lua/ui/cell/CSCellBottomBtn.lua,afbf445995d42e012635f3d355ce6d9e
trCRM/upgradeRes/other/uiAtlas/mine/IOS/myset_fingerprint.unity3d,c8c718e4646589cb5c1e9fa92165ae98
trCRM/upgradeRes/other/uiAtlas/mine/IOS/me_enterprise.unity3d,a8b0984f1a0b1b8dd9ceb487cc7d1884
-trCRM/upgradeRes/priority/ui/panel/IOS/PanelAbout.unity3d,5973617a53e87793dd18f06d5e9d47f7
trCRM/upgradeRes/priority/ui/panel/IOS/PanelCalender.unity3d,a0357a0f5d338ebfdd32c3f7ccfbdbbf
-trCRM/upgradeRes/priority/lua/ui/panel/TRPResetPasswordStep3.lua,0d3be662e0a236b709d8f1f9d6b3321e
+trCRM/upgradeRes/priority/lua/ui/cell/TRCellReportform1.lua,3b291f38637590e0fca816cae521a4f0
trCRM/upgradeRes/other/uiAtlas/mine/IOS/me_about.unity3d,e38e9dcd1c3460227594821595e9e7e9
trCRM/upgradeRes/other/uiAtlas/cust/IOS/time.unity3d,3798702a6f194c1ce9e5e9b15836239f
-trCRM/upgradeRes/priority/lua/ui/panel/CSPTasks.lua,59990f469a3b4c4d3cb6f9d6ca518a99
+trCRM/upgradeRes/priority/lua/ui/panel/CSPTasks.lua,a6dc405916d51c97422bf1862f3a8f5b
trCRM/upgradeRes/priority/lua/ui/cell/CLLUICellPoplist.lua,18d47301d459fd66ed63b902546e8619
trCRM/upgradeRes/priority/lua/ui/panel/TRPNewFollowTask.lua,32466ec1a4b799de26e447f17cabc760
+trCRM/upgradeRes/other/uiAtlas/order/IOS/upload.unity3d,595de11108017f12c98da808c51ce0fe
trCRM/upgradeRes/priority/lua/ui/panel/TRPTaskList.lua,1798231882ed1ffee8ce2fe6492c7b36
trCRM/upgradeRes/priority/lua/net/CLLNet.lua,947abdf2c019f44a26211acf6f31e2dd
trCRM/upgradeRes/priority/lua/CLLMainLua.lua,03e0034303243936aec483752bdecfc9
@@ -248,9 +248,8 @@ trCRM/upgradeRes/priority/ui/other/IOS/InputTime.unity3d,8033c91366ec43b1f7f0b89
trCRM/upgradeRes/priority/lua/toolkit/KKLogListener.lua,85784ec79aefde29be3ef308e7b5203b
trCRM/upgradeRes/priority/lua/ui/cell/CLLFrame2.lua,e25ce84ca55cd643d527d09cedd6228a
trCRM/upgradeRes/priority/ui/panel/IOS/PanelCustFilter.unity3d,feab38851af1648a9254df68957e776c
-trCRM/upgradeRes/other/uiAtlas/cust/IOS/play2.unity3d,41dc3f7483b566a92f22718cc1363f12
+trCRM/upgradeRes/priority/lua/ui/panel/TRPSelectCompany.lua,28ca57d169af022ec621dece879bdcfc
trCRM/upgradeRes/other/uiAtlas/mine/IOS/myset_password2.unity3d,e87a02a038d312d2a30260aa585d80fb
-trCRM/upgradeRes/other/uiAtlas/cust/IOS/order.unity3d,e30128770395be6e2634c10acdedb730
trCRM/upgradeRes/priority/lua/bio/BioInputStream.lua,b3f94b1017db307427c6e39a8ee4d60e
trCRM/upgradeRes/priority/lua/ui/panel/CLLPConfirm.lua,e652190d378dc120a0805230692f0fc9
trCRM/upgradeRes/priority/lua/ui/cell/TRCellRecord.lua,ca94ed9775ca9f03569e49d4ad1f3e14
@@ -267,34 +266,35 @@ trCRM/upgradeRes/other/uiAtlas/cust/IOS/follow.unity3d,6ec5096b527145f85d42630f1
trCRM/upgradeRes/priority/lua/net/NetProto.lua,f000f7d25ec91a2208d2c18493fec81a
trCRM/upgradeRes/other/uiAtlas/order/IOS/xuanze_bg.unity3d,6cef123588b571983c5169aec50fcd8a
trCRM/upgradeRes/other/uiAtlas/work/IOS/work_icon_2.unity3d,f8983e295d741411b2dbc2cfa1646ce3
-trCRM/upgradeRes/other/uiAtlas/public/IOS/button.unity3d,4a1c28e520ccb1f66e038bfe4e8057ab
trCRM/upgradeRes/priority/lua/ui/cell/CLCellToast.lua,6e350721fca8167bd621df86ad982326
trCRM/upgradeRes/priority/ui/panel/IOS/PanelNewFollowTask.unity3d,ea596f54f78cd1d64032701cc286e4bb
trCRM/upgradeRes/priority/ui/panel/IOS/PanelSelectServer.unity3d,ad1eb38eafa99ef0bd5298a55c11720e
+trCRM/upgradeRes/other/uiAtlas/cust/IOS/cus_task.unity3d,747e55b8f7096ca0aad8270690100afd
trCRM/upgradeRes/priority/lua/toolkit/CLLUpdateUpgrader.lua,bfff3548aa7cd983c3de46e5defae423
trCRM/upgradeRes/other/uiAtlas/login/IOS/log_visible.unity3d,af743a8a46a78caa3aab15ecb2d4f73d
trCRM/upgradeRes/priority/ui/panel/IOS/PanelPopList.unity3d,c581aa0663d7621cf179161466b484f4
+trCRM/upgradeRes/other/uiAtlas/cust/IOS/write.unity3d,46db82a1fde728812cfa97c68aca4020
trCRM/upgradeRes/priority/lua/ui/cell/TRCellProductSelected.lua,e7f4b1e06a54d5fa52cf9a4ed00f5233
trCRM/upgradeRes/priority/ui/panel/IOS/PanelNewOrder.unity3d,2453a96b8c8782ebe965c57d202b79ec
trCRM/upgradeRes/priority/lua/ui/panel/TRPCustList.lua,bcebb5a35d387e2bb40771169017f69a
trCRM/upgradeRes/other/uiAtlas/logo/IOS/logo2.unity3d,41c5912127597703a9c1ab2848c89ff6
trCRM/upgradeRes/other/uiAtlas/cust/IOS/del.unity3d,d2c4a7e271dac1f816115acd9caf6873
trCRM/upgradeRes/priority/lua/cfg/DBCfg.lua,3d0e60dbcdaa61b8553eee17f4d68b32
-trCRM/upgradeRes/other/uiAtlas/cust/IOS/peo.unity3d,0d912c6c28bf962b0e1f28ac4f76d2ba
+trCRM/upgradeRes/priority/lua/toolkit/curve.lua,f97735ed6c39accb55cdae44b62b5b38
trCRM/upgradeRes/priority/lua/db/DBRoot.lua,3b2f7f6d066a93d94754334c6b0b8ba3
trCRM/upgradeRes/other/uiAtlas/work/IOS/work_ranking.unity3d,d6ec636ccfbf0c4525703871069765c5
trCRM/upgradeRes/other/uiAtlas/cust/IOS/oean.unity3d,2220377e30d7a40b551ff00531cde4b0
trCRM/upgradeRes/other/uiAtlas/main/IOS/icon_me2.unity3d,f7a5b3fdea590751dea5877236e013c8
trCRM/upgradeRes/other/uiAtlas/guid/IOS/2.unity3d,2953bdc65ac46367feda300cfecd11bf
trCRM/upgradeRes/other/uiAtlas/cust/IOS/cus_tel.unity3d,ec81ebdafd1aa4d439f1a10d71c079af
-trCRM/upgradeRes/priority/lua/ui/panel/CLLPWWWProgress.lua,b713ddf9f0af8602ec48f71162181d6d
+trCRM/upgradeRes/other/uiAtlas/cust/IOS/play2.unity3d,41dc3f7483b566a92f22718cc1363f12
trCRM/upgradeRes/priority/lua/ui/cell/CLLCellServer.lua,52979aedf684a79bc667bbe73b508aca
trCRM/upgradeRes/other/uiAtlas/login/IOS/log_people.unity3d,834fdf5f5868cc4c905e95f8e41dbf20
trCRM/upgradeRes/priority/lua/ui/panel/TRPModifyFiled.lua,99b250c386ce8dad9c10c8f4fe9874f1
trCRM/upgradeRes/priority/lua/ui/panel/TRPOrderDetail.lua,d69a767e5d6a6a5cc33fce98464d3bc1
trCRM/upgradeRes/other/uiAtlas/coolape/IOS/input.unity3d,85676a4ff405d2c3bf8bdabd99d40745
+trCRM/upgradeRes/priority/lua/ui/panel/TRPEditPrice.lua,ceb906ae12222324b9a61f4b83ec7e58
trCRM/upgradeRes/other/uiAtlas/cust/IOS/check.unity3d,8617a2ac9187216cfb81f8b712181055
-trCRM/upgradeRes/priority/lua/ui/panel/TRPResetPasswordStep2.lua,23c1f8a0e9f8df7cc569803f3e553729
trCRM/upgradeRes/priority/lua/ui/panel/TRPCustDetail.lua,152602fd1be6119a10e28e488090baa7
trCRM/upgradeRes/other/uiAtlas/order/IOS/icon_1.unity3d,e0bb2894cfbec37f0512353e65845fa7
trCRM/upgradeRes/priority/ui/panel/IOS/PanelModifyFiled.unity3d,687e89480fdd9d074d1ae636b070951d
@@ -304,16 +304,16 @@ trCRM/upgradeRes/other/uiAtlas/mine/IOS/me_set2.unity3d,bca882d59188e7765fb55f9c
trCRM/upgradeRes/priority/ui/panel/IOS/PanelProductDetail.unity3d,aeb96cb6c88cae10674923cb78088673
trCRM/upgradeRes/priority/lua/ui/panel/TRPSysMsgDetail.lua,fd4b28f1cdf003bb4207e7a3064cffb8
trCRM/upgradeRes/priority/lua/ui/panel/TRPSelectProduct.lua,6f04603760bd1ceed90cba39d1207228
+trCRM/upgradeRes/other/uiAtlas/work/IOS/work_head_bg.unity3d,4621f18a14df4d78d9f8475b6b561467
trCRM/upgradeRes/other/uiAtlas/mine/IOS/myset_remind.unity3d,28b12417bc85c9ba865a36339c5df145
trCRM/upgradeRes/other/uiAtlas/cust/IOS/play.unity3d,87cd04e1f707b587132b189c72823f7d
trCRM/upgradeRes/priority/lua/ui/panel/TRPProductDetail.lua,3dc8162a924b39216912d011f05ee774
-trCRM/upgradeRes/priority/lua/ui/panel/TRPSysMsgList.lua,64012de583f1cd85584903ce68a0c812
trCRM/upgradeRes/priority/lua/ui/cell/TRCellTaskList.lua,d51c12f9e5de1f5db917d82a63585b85
-trCRM/upgradeRes/other/uiAtlas/cust/IOS/phone.unity3d,917fe8084ceb86ffe99a91119401b398
+trCRM/upgradeRes/priority/lua/ui/panel/TRPMoreProc4Cust.lua,d75b0e5651468028373c4f326937d460
trCRM/upgradeRes/priority/lua/ui/panel/CLLPPopTime.lua,0e26b4cf8f9bfde695d5fcd64009c06a
trCRM/upgradeRes/other/uiAtlas/order/IOS/add.unity3d,76e45a9f49114ef76b198d59e3f9b124
trCRM/upgradeRes/other/uiAtlas/order/IOS/icon_5.unity3d,9a7f3f3e1fc304d60b0e0149d7d73ce4
-trCRM/upgradeRes/other/uiAtlas/icon/IOS/icon_26_no.unity3d,d39394e00d037c17920ed100a1d4be40
+trCRM/upgradeRes/priority/lua/ui/cell/TRCellOceanList.lua,911d6edb241c34ee721815622ea707c3
trCRM/upgradeRes/other/uiAtlas/mine/IOS/me_customer.unity3d,eba6ba58a8149e369e8e02b8cac777c8
trCRM/upgradeRes/priority/lua/ui/panel/TRPPlaySoundRecord.lua,ded1f35f04bd0d84bfa8fd74ddf926aa
trCRM/upgradeRes/priority/lua/json/rpcserver.lua,48b8f5e53a1141652c38f8a5a8a77928
@@ -321,17 +321,17 @@ trCRM/upgradeRes/other/uiAtlas/cust/IOS/full_star.unity3d,1e26fbb1830f8f2b34f5cc
trCRM/upgradeRes/priority/lua/ui/panel/TRPBatchGetCusts.lua,824f77c2486687108fa391a8fb08a405
trCRM/upgradeRes/priority/lua/ui/panel/TRPConnect.lua,24712c363be3eef2c7e32413cc9f146d
trCRM/upgradeRes/priority/lua/ui/cell/CLLUICalenderDay.lua,6e7400e2dd535ced93960c1e18fa2458
-trCRM/upgradeRes/priority/ui/panel/IOS/PanelTaskList.unity3d,179f04012a054bea4339cc2e36d39ece
+trCRM/upgradeRes/other/uiAtlas/public/IOS/company_bg.unity3d,6d7720ce23e31c17a508386fe837ab12
trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustList.lua,035626bac75e16f15bc825f6e0ded212
trCRM/upgradeRes/priority/lua/ui/panel/TRPPopCheckBoxs.lua,508171a924c113573b01a396e8217cc2
trCRM/upgradeRes/other/uiAtlas/cust/IOS/msg.unity3d,62a51311105a27bfca2fc2ac35c9aab8
-trCRM/upgradeRes/other/uiAtlas/work/IOS/work_head_bg.unity3d,4621f18a14df4d78d9f8475b6b561467
+trCRM/upgradeRes/other/uiAtlas/work/IOS/work_bg.unity3d,b014274b898e403aa52277f9a5978776
trCRM/upgradeRes/other/uiAtlas/order/IOS/sort.unity3d,93ec07e5dd76e80c3b0708d28c4415e0
trCRM/upgradeRes/other/uiAtlas/order/IOS/xuanze.unity3d,dd97c2c26ce6ee06837604e4766645e6
trCRM/upgradeRes/other/uiAtlas/news/IOS/new2_time.unity3d,79a2d5d9c6d24cc63998911a623d9244
-trCRM/upgradeRes/priority/lua/public/CLLInclude.lua,9632bef1d1bbe5c30c5f7f055c984213
+trCRM/upgradeRes/priority/lua/public/CLLInclude.lua,a83b770e54fae3e1a7e682f30b41ecbe
trCRM/upgradeRes/priority/lua/ui/panel/CLLPBackplate.lua,ae946f1cec5baad680f4e8a0f7e71223
-trCRM/upgradeRes/priority/ui/panel/IOS/PanelOrderList.unity3d,b6ad0bb8c86aff4c0ff48fffa58d153e
+trCRM/upgradeRes/other/uiAtlas/cust/IOS/order.unity3d,e30128770395be6e2634c10acdedb730
trCRM/upgradeRes/priority/ui/panel/IOS/PanelWWWProgress.unity3d,86786bd679b1592402f9cd98ba1bc0cf
trCRM/upgradeRes/other/uiAtlas/public/IOS/choose.unity3d,ebc64a7c7ed8354e57deb1938557c9d8
trCRM/upgradeRes/other/uiAtlas/cust/IOS/star.unity3d,3bcf43f59ae8c6b2920fbdfd3a5a3252
@@ -340,13 +340,13 @@ trCRM/upgradeRes/other/uiAtlas/work/IOS/yuyue.unity3d,266cd2ffefcb8ded9f59a00a66
trCRM/upgradeRes/other/uiAtlas/main/IOS/icon_me.unity3d,546388655250fedaa50785dd824d30ac
trCRM/upgradeRes/priority/ui/other/IOS/InputText.unity3d,25f8a9252f35debc4d68444440c03fad
trCRM/upgradeRes/priority/lua/ui/panel/TRPOrderList.lua,dad09d99c3d896f7c1ce1c1c854073ea
-trCRM/upgradeRes/priority/lua/ui/cell/TRCellComFilter.lua,2fb22f9248e4af86ab42482151a5b141
+trCRM/upgradeRes/other/uiAtlas/cust/IOS/funnel.unity3d,9eabb57135190dc338da14a450b63e72
trCRM/upgradeRes/other/uiAtlas/work/IOS/icon_bg.unity3d,8f588f9da85d79f734701f7bde8d35da
-trCRM/upgradeRes/priority/lua/ui/panel/TRPEditPrice.lua,ceb906ae12222324b9a61f4b83ec7e58
-trCRM/upgradeRes/other/uiAtlas/cust/IOS/write.unity3d,46db82a1fde728812cfa97c68aca4020
+trCRM/upgradeRes/other/uiAtlas/cust/IOS/border.unity3d,29a0e90c8c75eaac236a3bf65ee28fd3
+trCRM/upgradeRes/other/uiAtlas/public/IOS/button.unity3d,4a1c28e520ccb1f66e038bfe4e8057ab
trCRM/upgradeRes/other/uiAtlas/public/IOS/on_off_bg.unity3d,7a6e9b072b57dc847ede7eb1c679ee62
trCRM/upgradeRes/priority/ui/panel/IOS/PanelFollowList.unity3d,bdb65aa651377613c26ce1b1bf6671f2
-trCRM/upgradeRes/priority/lua/toolkit/curve.lua,f97735ed6c39accb55cdae44b62b5b38
+trCRM/upgradeRes/other/uiAtlas/order/IOS/icon_3.unity3d,4ba8140bcf5996c22461673f7bb40b8b
trCRM/upgradeRes/priority/lua/ui/panel/TRPFollowFilter.lua,f436c880f71e048db7b82de41e881b8f
trCRM/upgradeRes/priority/lua/ui/panel/TRPAbout.lua,dae2d1afc8a5e2d7c996c6056aa42dc4
trCRM/upgradeRes/priority/ui/panel/IOS/PanelPlaySoundRecord.unity3d,58c4a9930f351265342a31a37b11c7a0
diff --git a/Assets/CoolapeFrameData/verControl/IOS/ver4UpgradeList.v b/Assets/CoolapeFrameData/verControl/IOS/ver4UpgradeList.v
index 51903ae..5e882dd 100644
--- a/Assets/CoolapeFrameData/verControl/IOS/ver4UpgradeList.v
+++ b/Assets/CoolapeFrameData/verControl/IOS/ver4UpgradeList.v
@@ -1 +1 @@
-[{"md5":"7cea40769130dc5038fe89c11a8a93b4", "name":"2020_07_10_22_48_57", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"8d20a2ebc95c3de0326c2268cd0a5b3e", "name":"2020_07_10_23_32_42", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"f4a725f0bda3498aacbbad2c8a62b085", "name":"2020_07_10_23_40_12", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"b30346bad7f0a7817ec446846d9448f7", "name":"2020_07_10_23_42_46", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"9b0766ddc30e9eb0c3fb26346ec2c09d", "name":"2020_07_10_23_46_04", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"95b27778bfd5966abe00749d5c0cc698", "name":"2020_07_10_23_48_21", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"82545003cc15d2908472019870d6e65c", "name":"2020_07_11_10_51_04", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"be70573a2a73960dbf92dbe764f1f7c2", "name":"2020_07_11_11_36_22", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"9a0408961fb319f2aed9b08915565dc4", "name":"2020_07_11_12_31_17", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"1b5c44c805ac41d990e8c011ee43e638", "name":"2020_07_11_12_33_33", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"9e04af0c4ae5b56f18f230fa12231e1e", "name":"2020_07_11_12_36_25", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"6bd2990a8512191575b07055d9d513b6", "name":"2020_07_11_17_12_00", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"01cec030fdadb6d2fbf27f5152419c59", "name":"2020_07_11_17_28_20", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"75db55deb1c5d18d22d5c2b420b58eb4", "name":"2020_07_11_17_28_28", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"5534a8103096a4e2a7cfcec7ef47ebd7", "name":"2020_07_11_17_31_27", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"4dc638b45b740131d5f22585c40cf387", "name":"2020_07_11_17_41_15", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"890806f5a75ee8564f6dd5948850f477", "name":"2020_07_11_17_42_40", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c8d92b485eb8e9655e4c74b16752d5df", "name":"2020_07_11_17_45_47", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"e7dc6aa1b1b266de6491a77105bf41b7", "name":"2020_07_11_17_47_42", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"e26aa371a8288edb400a1467cae3a33a", "name":"2020_07_11_17_49_40", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c52c364cf1f90096ae4606694e03b6a6", "name":"2020_07_11_18_32_40", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"a99e8d6448735aa77058741ec4bb75aa", "name":"2020_07_11_20_55_20", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"352d384522981bf1438027ff3dfd2053", "name":"2020_07_11_21_03_47", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"a5bb15a810f464404044cc16e0e56d17", "name":"2020_07_11_21_33_59", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"266edce5f25b7d9291132019d76fa032", "name":"2020_07_11_21_45_15", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"71dc4e8f51270030d1685387728dfcc2", "name":"2020_07_11_21_46_51", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"a859708964c5c1cfb3ac62d4da5fa162", "name":"2020_07_14_22_08_15", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"3c9361752e3e009a68bc34be39eaa146", "name":"2020_07_15_20_12_12", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"1262cc1e850deb68ccba6c345074f413", "name":"2020_07_16_07_13_35", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"f1b5547270c3bd91a7b3e1e5c19edd9e", "name":"2020_07_16_08_57_14", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"2e1fe2b2d5913bd872275080b6dd03bb", "name":"2020_07_16_10_35_29", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"e11b0c19bff384c0e3efe7814c8a2559", "name":"2020_07_16_10_46_14", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"0728cafe0cdf174b3d99ffb094263d99", "name":"2020_07_16_23_47_33", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"9dfbd130bf411d921725d2b8351c0762", "name":"2020_07_18_21_16_48", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"239fb6e343bbdc33e12a06ca47cfe24b", "name":"2020_07_18_22_28_02", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"37140e27aaa9d33b86d430a4821aa27c", "name":"2020_07_18_22_52_32", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"40e7f6adf78bb775f5b6588be3b003af", "name":"2020_07_19_12_55_29", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"49f7f4b59c71b45d5e587b0e4163bf71", "name":"2020_07_20_22_23_20", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"e953b814cf1abfcd147b71361e445d0a", "name":"2020_07_26_11_14_37", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"07d66fe9dcf0ae63898464b4d7ce64ce", "name":"2020_07_26_13_03_24", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"9b483995708629b33f45f4b9b3509c8a", "name":"2020_07_28_21_11_33", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"f3dfa90afbd3cf2f60be7ded76769e5b", "name":"2020_07_28_21_53_41", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"758eb21fc8b09ce9ca9961881e465d9a", "name":"2020_07_28_22_02_44", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"15a773fd14721bd9b53f34def635d078", "name":"2020_07_28_22_07_14", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"98fbfa34f30d30101e89598e35081564", "name":"2020_08_03_23_08_09", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"a6968fb46e31b36375187db2432b5a57", "name":"2020_08_04_22_01_00", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}]
\ No newline at end of file
+[{"md5":"7cea40769130dc5038fe89c11a8a93b4", "name":"2020_07_10_22_48_57", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"8d20a2ebc95c3de0326c2268cd0a5b3e", "name":"2020_07_10_23_32_42", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"f4a725f0bda3498aacbbad2c8a62b085", "name":"2020_07_10_23_40_12", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"b30346bad7f0a7817ec446846d9448f7", "name":"2020_07_10_23_42_46", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"9b0766ddc30e9eb0c3fb26346ec2c09d", "name":"2020_07_10_23_46_04", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"95b27778bfd5966abe00749d5c0cc698", "name":"2020_07_10_23_48_21", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"82545003cc15d2908472019870d6e65c", "name":"2020_07_11_10_51_04", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"be70573a2a73960dbf92dbe764f1f7c2", "name":"2020_07_11_11_36_22", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"9a0408961fb319f2aed9b08915565dc4", "name":"2020_07_11_12_31_17", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"1b5c44c805ac41d990e8c011ee43e638", "name":"2020_07_11_12_33_33", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"9e04af0c4ae5b56f18f230fa12231e1e", "name":"2020_07_11_12_36_25", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"6bd2990a8512191575b07055d9d513b6", "name":"2020_07_11_17_12_00", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"01cec030fdadb6d2fbf27f5152419c59", "name":"2020_07_11_17_28_20", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"75db55deb1c5d18d22d5c2b420b58eb4", "name":"2020_07_11_17_28_28", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"5534a8103096a4e2a7cfcec7ef47ebd7", "name":"2020_07_11_17_31_27", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"4dc638b45b740131d5f22585c40cf387", "name":"2020_07_11_17_41_15", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"890806f5a75ee8564f6dd5948850f477", "name":"2020_07_11_17_42_40", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c8d92b485eb8e9655e4c74b16752d5df", "name":"2020_07_11_17_45_47", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"e7dc6aa1b1b266de6491a77105bf41b7", "name":"2020_07_11_17_47_42", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"e26aa371a8288edb400a1467cae3a33a", "name":"2020_07_11_17_49_40", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c52c364cf1f90096ae4606694e03b6a6", "name":"2020_07_11_18_32_40", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"a99e8d6448735aa77058741ec4bb75aa", "name":"2020_07_11_20_55_20", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"352d384522981bf1438027ff3dfd2053", "name":"2020_07_11_21_03_47", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"a5bb15a810f464404044cc16e0e56d17", "name":"2020_07_11_21_33_59", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"266edce5f25b7d9291132019d76fa032", "name":"2020_07_11_21_45_15", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"71dc4e8f51270030d1685387728dfcc2", "name":"2020_07_11_21_46_51", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"a859708964c5c1cfb3ac62d4da5fa162", "name":"2020_07_14_22_08_15", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"3c9361752e3e009a68bc34be39eaa146", "name":"2020_07_15_20_12_12", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"1262cc1e850deb68ccba6c345074f413", "name":"2020_07_16_07_13_35", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"f1b5547270c3bd91a7b3e1e5c19edd9e", "name":"2020_07_16_08_57_14", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"2e1fe2b2d5913bd872275080b6dd03bb", "name":"2020_07_16_10_35_29", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"e11b0c19bff384c0e3efe7814c8a2559", "name":"2020_07_16_10_46_14", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"0728cafe0cdf174b3d99ffb094263d99", "name":"2020_07_16_23_47_33", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"9dfbd130bf411d921725d2b8351c0762", "name":"2020_07_18_21_16_48", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"239fb6e343bbdc33e12a06ca47cfe24b", "name":"2020_07_18_22_28_02", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"37140e27aaa9d33b86d430a4821aa27c", "name":"2020_07_18_22_52_32", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"40e7f6adf78bb775f5b6588be3b003af", "name":"2020_07_19_12_55_29", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"49f7f4b59c71b45d5e587b0e4163bf71", "name":"2020_07_20_22_23_20", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"e953b814cf1abfcd147b71361e445d0a", "name":"2020_07_26_11_14_37", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"07d66fe9dcf0ae63898464b4d7ce64ce", "name":"2020_07_26_13_03_24", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"9b483995708629b33f45f4b9b3509c8a", "name":"2020_07_28_21_11_33", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"f3dfa90afbd3cf2f60be7ded76769e5b", "name":"2020_07_28_21_53_41", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"758eb21fc8b09ce9ca9961881e465d9a", "name":"2020_07_28_22_02_44", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"15a773fd14721bd9b53f34def635d078", "name":"2020_07_28_22_07_14", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"98fbfa34f30d30101e89598e35081564", "name":"2020_08_03_23_08_09", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"a6968fb46e31b36375187db2432b5a57", "name":"2020_08_04_22_01_00", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"9a66c2386ae53241a681c636d6169513", "name":"2020_08_04_23_02_40", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"703a25b92712f18a6cf2bbd31a7703b2", "name":"2020_08_04_23_05_01", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"52630e72a09a48a69c2e7d883fe8abac", "name":"2020_08_04_23_12_10", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"8412050454bc8072f8e06d96f5e85b73", "name":"2020_08_04_23_13_51", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"623d6eda830b6c771ea6ce1a148d1fc6", "name":"2020_08_05_07_00_55", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}]
\ No newline at end of file
diff --git a/Assets/CoolapeFrameData/verControl/IOS/ver4UpgradeMd5.v b/Assets/CoolapeFrameData/verControl/IOS/ver4UpgradeMd5.v
index b1e2468..9de5fa9 100644
--- a/Assets/CoolapeFrameData/verControl/IOS/ver4UpgradeMd5.v
+++ b/Assets/CoolapeFrameData/verControl/IOS/ver4UpgradeMd5.v
@@ -237,7 +237,7 @@ trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelCalender.unity3d,a0357a0f5d3
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPResetPasswordStep3.lua,0d3be662e0a236b709d8f1f9d6b3321e
trCRM/upgradeRes4Publish/other/uiAtlas/mine/IOS/me_about.unity3d,e38e9dcd1c3460227594821595e9e7e9
trCRM/upgradeRes4Publish/other/uiAtlas/cust/IOS/time.unity3d,3798702a6f194c1ce9e5e9b15836239f
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPTasks.lua,59990f469a3b4c4d3cb6f9d6ca518a99
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPTasks.lua,a6dc405916d51c97422bf1862f3a8f5b
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPResetPasswordStep2.lua,23c1f8a0e9f8df7cc569803f3e553729
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollowTask.lua,32466ec1a4b799de26e447f17cabc760
trCRM/upgradeRes4Publish/other/uiAtlas/order/IOS/upload.unity3d,595de11108017f12c98da808c51ce0fe
@@ -247,7 +247,7 @@ trCRM/upgradeRes4Publish/priority/lua/net/CLLNet.lua,947abdf2c019f44a26211acf6f3
trCRM/upgradeRes4Publish/priority/lua/CLLMainLua.lua,03e0034303243936aec483752bdecfc9
trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendFieldRoot.lua,0b73bcac6356a8a632785e860e684878
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustFilter.lua,450e7e75ebfe83bb65d59beb3ce60782
-trCRM/upgradeRes4Publish/priority/lua/public/CLLInclude.lua,9632bef1d1bbe5c30c5f7f055c984213
+trCRM/upgradeRes4Publish/priority/lua/public/CLLInclude.lua,a83b770e54fae3e1a7e682f30b41ecbe
trCRM/upgradeRes4Publish/priority/lua/toolkit/KKLogListener.lua,85784ec79aefde29be3ef308e7b5203b
trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLFrame2.lua,e25ce84ca55cd643d527d09cedd6228a
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSelectCompany.lua,28ca57d169af022ec621dece879bdcfc
diff --git a/Assets/XLua/CHANGELOG.txt b/Assets/XLua/CHANGELOG.txt
old mode 100755
new mode 100644
index bcbf2f4..6e5904d
--- a/Assets/XLua/CHANGELOG.txt
+++ b/Assets/XLua/CHANGELOG.txt
@@ -1,4 +1,27 @@
-v2.1.14 2019年2月27日
+v2.1.15 2020年6月24日
+新增特性
+1、生成代码过滤器
+2、优化反射查找delegate匹配bridge的性能
+3、unity 2019.2以上版本手机版本注入不了的问题
+
+变更
+
+bug修复
+1、反射查找同名delegate桥接在不生成代码的时候表现不一致
+2、嵌套struct标注为PackAsTable时生成代码报错
+3、反射wrap代码加入栈空间检查
+4、如果枚举定义了很多个值（几千个），会触发unity在android下的一个bug：函数体很大而且有很多分支，执行该函数会crash
+5、chunkname和脚本文件名不一致的问题
+6、最小生成模式枚举生成代码报错
+7、当采用反射方式注册枚举值时，如果一个枚举有多个相同的值，比如A,B都是1，那么在lua里头访问B将会为空
+8、sbyte[]在.net 4下push到lua变成字符串的问题
+9、泛型导致生成代码失败的问题
+10、非Assembly-CSharp程序集注入时，out参数处理有误
+11、内嵌类通过xlua.private_accessible设置私有访问可能失败的问题
+12、cecil插入指令后，并未自动更新offset，某种情况下会导致计算偏移量错误
+
+
+v2.1.14 2019年2月27日
新增特性
1、新增nintento switch的支持
2、unity 2018兼容
diff --git a/Assets/XLua/CHANGELOG.txt.meta b/Assets/XLua/CHANGELOG.txt.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Doc.meta b/Assets/XLua/Doc.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Doc/Add_Remove_Lua_Lib.md b/Assets/XLua/Doc/Add_Remove_Lua_Lib.md
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Doc/Add_Remove_Lua_Lib.md.meta b/Assets/XLua/Doc/Add_Remove_Lua_Lib.md.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Doc/Configure_EN.md b/Assets/XLua/Doc/Configure_EN.md
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Doc/Configure_EN.md.meta b/Assets/XLua/Doc/Configure_EN.md.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Doc/Custom_Generate_EN.md b/Assets/XLua/Doc/Custom_Generate_EN.md
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Doc/Custom_Generate_EN.md.meta b/Assets/XLua/Doc/Custom_Generate_EN.md.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Doc/Faq_EN.md b/Assets/XLua/Doc/Faq_EN.md
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Doc/Faq_EN.md.meta b/Assets/XLua/Doc/Faq_EN.md.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Doc/Hotfix_EN.md b/Assets/XLua/Doc/Hotfix_EN.md
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Doc/Hotfix_EN.md.meta b/Assets/XLua/Doc/Hotfix_EN.md.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Doc/Materials.meta b/Assets/XLua/Doc/Materials.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Doc/Materials/logo.mat.meta b/Assets/XLua/Doc/Materials/logo.mat.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Doc/XLua_API.doc b/Assets/XLua/Doc/XLua_API.doc
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Doc/XLua_API.doc.meta b/Assets/XLua/Doc/XLua_API.doc.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Doc/XLua_API.md b/Assets/XLua/Doc/XLua_API.md
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Doc/XLua_API.md.meta b/Assets/XLua/Doc/XLua_API.md.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Doc/XLua_API_EN.md b/Assets/XLua/Doc/XLua_API_EN.md
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Doc/XLua_API_EN.md.meta b/Assets/XLua/Doc/XLua_API_EN.md.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Doc/XLua_Tutorial_EN.md b/Assets/XLua/Doc/XLua_Tutorial_EN.md
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Doc/XLua_Tutorial_EN.md.meta b/Assets/XLua/Doc/XLua_Tutorial_EN.md.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Doc/XLua增加删除第三方lua库.doc b/Assets/XLua/Doc/XLua增加删除第三方lua库.doc
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Doc/XLua增加删除第三方lua库.doc.meta b/Assets/XLua/Doc/XLua增加删除第三方lua库.doc.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Doc/XLua增加删除第三方lua库.md b/Assets/XLua/Doc/XLua增加删除第三方lua库.md
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Doc/XLua增加删除第三方lua库.md.meta b/Assets/XLua/Doc/XLua增加删除第三方lua库.md.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Doc/XLua复杂值类型（struct）gc优化指南.doc b/Assets/XLua/Doc/XLua复杂值类型（struct）gc优化指南.doc
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Doc/XLua复杂值类型（struct）gc优化指南.doc.meta b/Assets/XLua/Doc/XLua复杂值类型（struct）gc优化指南.doc.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Doc/XLua复杂值类型（struct）gc优化指南.md b/Assets/XLua/Doc/XLua复杂值类型（struct）gc优化指南.md
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Doc/XLua复杂值类型（struct）gc优化指南.md.meta b/Assets/XLua/Doc/XLua复杂值类型（struct）gc优化指南.md.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Doc/XLua性能分析工具.doc b/Assets/XLua/Doc/XLua性能分析工具.doc
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Doc/XLua性能分析工具.doc.meta b/Assets/XLua/Doc/XLua性能分析工具.doc.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Doc/XLua性能分析工具.md b/Assets/XLua/Doc/XLua性能分析工具.md
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Doc/XLua性能分析工具.md.meta b/Assets/XLua/Doc/XLua性能分析工具.md.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Doc/XLua教程.doc b/Assets/XLua/Doc/XLua教程.doc
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Doc/XLua教程.doc.meta b/Assets/XLua/Doc/XLua教程.doc.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Doc/XLua教程.md b/Assets/XLua/Doc/XLua教程.md
old mode 100755
new mode 100644
index 6c60560..334b1de
--- a/Assets/XLua/Doc/XLua教程.md
+++ b/Assets/XLua/Doc/XLua教程.md
@@ -243,7 +243,7 @@ C#的delegate调用：和调用普通lua函数一样
##### 64位整数支持
- Lua53版本64位整数（long，ulong）映射到原生的64未整数，而luajit版本，相当于lua5.1的标准，本身不支持64位，xlua做了个64位支持的扩展库，C#的long和ulong都将映射到userdata：
+ Lua53版本64位整数（long，ulong）映射到原生的64位整数，而luajit版本，相当于lua5.1的标准，本身不支持64位，xlua做了个64位支持的扩展库，C#的long和ulong都将映射到userdata：
支持在lua里头进行64位的运算，比较，打印
diff --git a/Assets/XLua/Doc/XLua教程.md.meta b/Assets/XLua/Doc/XLua教程.md.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Doc/XLua的配置.doc b/Assets/XLua/Doc/XLua的配置.doc
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Doc/XLua的配置.doc.meta b/Assets/XLua/Doc/XLua的配置.doc.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Doc/compatible_bytecode.md b/Assets/XLua/Doc/compatible_bytecode.md
old mode 100755
new mode 100644
index 8ca2f55..5d43303
--- a/Assets/XLua/Doc/compatible_bytecode.md
+++ b/Assets/XLua/Doc/compatible_bytecode.md
@@ -30,7 +30,7 @@ pause
## 2、编译能生成兼容格式的luac（后续只能用这特定的luac和步骤1的Plugins配套使用）
-到[这里](build/luac/)，如果你想编译window版本的，执行make_win64.bat，如果你要编译mac或者linux的，用make_unix.sh
+到[这里](../../../build/luac/)，如果你想编译window版本的，执行make_win64.bat，如果你要编译mac或者linux的，用make_unix.sh
## 3、加载字节码
diff --git a/Assets/XLua/Doc/compatible_bytecode.md.meta b/Assets/XLua/Doc/compatible_bytecode.md.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Doc/configure.md b/Assets/XLua/Doc/configure.md
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Doc/configure.md.meta b/Assets/XLua/Doc/configure.md.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Doc/custom_generate.md b/Assets/XLua/Doc/custom_generate.md
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Doc/custom_generate.md.meta b/Assets/XLua/Doc/custom_generate.md.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Doc/faq.md b/Assets/XLua/Doc/faq.md
old mode 100755
new mode 100644
index 3136ce1..e6390d8
--- a/Assets/XLua/Doc/faq.md
+++ b/Assets/XLua/Doc/faq.md
@@ -34,7 +34,7 @@ il2cpp默认会对诸如引擎、c#系统api，第三方dll等等进行代码剪
解决办法：增加引用（比如配置到LuaCallCSharp，或者你自己C#代码增加那函数的访问），或者通过link.xml配置（当配置了ReflectionUse后，xlua会自动帮你配置到link.xml）告诉il2cpp别剪裁某类型。
-## Unity 2018兼容性问题解决
+## Unity 2018及以上版本兼容性问题解决
2.1.14前的版本都建议先升级到2.1.14，升级后，还有如下两个使用注意事项：
@@ -52,7 +52,7 @@ il2cpp默认会对诸如引擎、c#系统api，第三方dll等等进行代码剪
编译链接的是：unity安装目录\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\mscorlib.dll
-解决办法：2.1.14支持外部mono环境，安装个Unity2017，然后把Unity2017安装目录下的MonoBleedingEdge目录拷贝到工程目录下的Tools目录下即可。
+解决办法：用黑名单排除报错方法即可。不过2019年8月6号以前的版本的黑名单配置对泛型不友好，要一个个泛型实例的配置（比如，Dictionary和Dictionary要分别配置），而目前发现该问题主要出在泛型Dictionary上。可以更新到2019年8月6号之后的版本，该版本支持配置一个过滤器对泛型方法过滤。这里有对unity 2018的Dictionary的[针对性配置](https://github.com/Tencent/xLua/blob/master/Assets/XLua/Editor/ExampleConfig.cs#L277)，直接拷贝使用，如果碰到其它泛型也有多出来的方法，参考Dictionary进行配置。
## Plugins源码在哪里可以找到，怎么使用？
diff --git a/Assets/XLua/Doc/faq.md.meta b/Assets/XLua/Doc/faq.md.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Doc/features.md b/Assets/XLua/Doc/features.md
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Doc/features.md.meta b/Assets/XLua/Doc/features.md.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Doc/hotfix.md b/Assets/XLua/Doc/hotfix.md
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Doc/hotfix.md.meta b/Assets/XLua/Doc/hotfix.md.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Doc/logo.png b/Assets/XLua/Doc/logo.png
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Doc/logo.png.meta b/Assets/XLua/Doc/logo.png.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Doc/signature.md b/Assets/XLua/Doc/signature.md
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Doc/signature.md.meta b/Assets/XLua/Doc/signature.md.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Doc/xLua.png b/Assets/XLua/Doc/xLua.png
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Doc/xLua.png.meta b/Assets/XLua/Doc/xLua.png.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Editor.meta b/Assets/XLua/Editor.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Editor/ExampleConfig.cs b/Assets/XLua/Editor/ExampleConfig.cs
old mode 100755
new mode 100644
index a1cb916..a4c3dd5
--- a/Assets/XLua/Editor/ExampleConfig.cs
+++ b/Assets/XLua/Editor/ExampleConfig.cs
@@ -131,7 +131,7 @@ public static class ExampleConfig
// }
// }
// }
- // return delegate_types.Distinct().ToList();
+ // return delegate_types.Where(t => t.BaseType == typeof(MulticastDelegate) && !hasGenericParameter(t) && !delegateHasEditorRef(t)).Distinct().ToList();
// }
//}
//--------------end 纯lua编程配置参考----------------------------
@@ -142,9 +142,9 @@ public static class ExampleConfig
//{
// get
// {
- // return (from type in Assembly.Load("Assembly-CSharp").GetExportedTypes()
- // where type.Namespace == null || !type.Namespace.StartsWith("XLua")
- // select type);
+ // return (from type in Assembly.Load("Assembly-CSharp").GetTypes()
+ // where type.Namespace == null || !type.Namespace.StartsWith("XLua")
+ // select type);
// }
//}
//--------------begin 热补丁自动化配置-------------------------
@@ -273,4 +273,35 @@ public static class ExampleConfig
new List(){"System.IO.DirectoryInfo", "Create", "System.Security.AccessControl.DirectorySecurity"},
new List(){"UnityEngine.MonoBehaviour", "runInEditMode"},
};
+
+#if UNITY_2018_1_OR_NEWER
+ [BlackList]
+ public static Func MethodFilter = (memberInfo) =>
+ {
+ if (memberInfo.DeclaringType.IsGenericType && memberInfo.DeclaringType.GetGenericTypeDefinition() == typeof(Dictionary<,>))
+ {
+ if (memberInfo.MemberType == MemberTypes.Constructor)
+ {
+ ConstructorInfo constructorInfo = memberInfo as ConstructorInfo;
+ var parameterInfos = constructorInfo.GetParameters();
+ if (parameterInfos.Length > 0)
+ {
+ if (typeof(System.Collections.IEnumerable).IsAssignableFrom(parameterInfos[0].ParameterType))
+ {
+ return true;
+ }
+ }
+ }
+ else if (memberInfo.MemberType == MemberTypes.Method)
+ {
+ var methodInfo = memberInfo as MethodInfo;
+ if (methodInfo.Name == "TryAdd" || methodInfo.Name == "Remove" && methodInfo.GetParameters().Length == 2)
+ {
+ return true;
+ }
+ }
+ }
+ return false;
+ };
+#endif
}
diff --git a/Assets/XLua/Editor/ExampleConfig.cs.meta b/Assets/XLua/Editor/ExampleConfig.cs.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Plugins/Android.meta b/Assets/XLua/Plugins/Android.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Plugins/Android/libs.meta b/Assets/XLua/Plugins/Android/libs.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Plugins/Android/libs/arm64-v8a.meta b/Assets/XLua/Plugins/Android/libs/arm64-v8a.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Plugins/Android/libs/arm64-v8a/libxlua.so b/Assets/XLua/Plugins/Android/libs/arm64-v8a/libxlua.so
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Plugins/Android/libs/arm64-v8a/libxlua.so.meta b/Assets/XLua/Plugins/Android/libs/arm64-v8a/libxlua.so.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Plugins/Android/libs/armeabi-v7a.meta b/Assets/XLua/Plugins/Android/libs/armeabi-v7a.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Plugins/Android/libs/armeabi-v7a/libxlua.so b/Assets/XLua/Plugins/Android/libs/armeabi-v7a/libxlua.so
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Plugins/Android/libs/armeabi-v7a/libxlua.so.meta b/Assets/XLua/Plugins/Android/libs/armeabi-v7a/libxlua.so.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Plugins/Android/libs/x86.meta b/Assets/XLua/Plugins/Android/libs/x86.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Plugins/Android/libs/x86/libxlua.so b/Assets/XLua/Plugins/Android/libs/x86/libxlua.so
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Plugins/Android/libs/x86/libxlua.so.meta b/Assets/XLua/Plugins/Android/libs/x86/libxlua.so.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Plugins/WSA.meta b/Assets/XLua/Plugins/WSA.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Plugins/WSA/ARM.meta b/Assets/XLua/Plugins/WSA/ARM.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Plugins/WSA/ARM/xlua.dll b/Assets/XLua/Plugins/WSA/ARM/xlua.dll
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Plugins/WSA/ARM/xlua.dll.meta b/Assets/XLua/Plugins/WSA/ARM/xlua.dll.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Plugins/WSA/x64.meta b/Assets/XLua/Plugins/WSA/x64.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Plugins/WSA/x64/xlua.dll b/Assets/XLua/Plugins/WSA/x64/xlua.dll
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Plugins/WSA/x64/xlua.dll.meta b/Assets/XLua/Plugins/WSA/x64/xlua.dll.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Plugins/WSA/x86.meta b/Assets/XLua/Plugins/WSA/x86.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Plugins/WSA/x86/xlua.dll b/Assets/XLua/Plugins/WSA/x86/xlua.dll
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Plugins/WSA/x86/xlua.dll.meta b/Assets/XLua/Plugins/WSA/x86/xlua.dll.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Plugins/WebGL.meta b/Assets/XLua/Plugins/WebGL.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Plugins/WebGL/xlua_webgl.cpp b/Assets/XLua/Plugins/WebGL/xlua_webgl.cpp
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Plugins/WebGL/xlua_webgl.cpp.meta b/Assets/XLua/Plugins/WebGL/xlua_webgl.cpp.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Plugins/iOS.meta b/Assets/XLua/Plugins/iOS.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Plugins/iOS/HotfixFlags.cpp b/Assets/XLua/Plugins/iOS/HotfixFlags.cpp
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Plugins/iOS/HotfixFlags.cpp.meta b/Assets/XLua/Plugins/iOS/HotfixFlags.cpp.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Plugins/iOS/libxlua.a b/Assets/XLua/Plugins/iOS/libxlua.a
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Plugins/iOS/libxlua.a.meta b/Assets/XLua/Plugins/iOS/libxlua.a.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Plugins/x86.meta b/Assets/XLua/Plugins/x86.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Plugins/x86/libxlua.so b/Assets/XLua/Plugins/x86/libxlua.so
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Plugins/x86/libxlua.so.meta b/Assets/XLua/Plugins/x86/libxlua.so.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Plugins/x86/xlua.dll b/Assets/XLua/Plugins/x86/xlua.dll
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Plugins/x86/xlua.dll.meta b/Assets/XLua/Plugins/x86/xlua.dll.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Plugins/x86_64.meta b/Assets/XLua/Plugins/x86_64.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Plugins/x86_64/libxlua.so b/Assets/XLua/Plugins/x86_64/libxlua.so
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Plugins/x86_64/libxlua.so.meta b/Assets/XLua/Plugins/x86_64/libxlua.so.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Plugins/x86_64/xlua.dll b/Assets/XLua/Plugins/x86_64/xlua.dll
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Plugins/x86_64/xlua.dll.meta b/Assets/XLua/Plugins/x86_64/xlua.dll.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Plugins/xlua.bundle.meta b/Assets/XLua/Plugins/xlua.bundle.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Plugins/xlua.bundle/Contents.meta b/Assets/XLua/Plugins/xlua.bundle/Contents.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Plugins/xlua.bundle/Contents/Info.plist b/Assets/XLua/Plugins/xlua.bundle/Contents/Info.plist
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Plugins/xlua.bundle/Contents/Info.plist.meta b/Assets/XLua/Plugins/xlua.bundle/Contents/Info.plist.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Plugins/xlua.bundle/Contents/MacOS.meta b/Assets/XLua/Plugins/xlua.bundle/Contents/MacOS.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Plugins/xlua.bundle/Contents/MacOS/xlua b/Assets/XLua/Plugins/xlua.bundle/Contents/MacOS/xlua
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Plugins/xlua.bundle/Contents/MacOS/xlua.meta b/Assets/XLua/Plugins/xlua.bundle/Contents/MacOS/xlua.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Resources.meta b/Assets/XLua/Resources.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Resources/perf.meta b/Assets/XLua/Resources/perf.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Resources/perf/memory.lua.txt b/Assets/XLua/Resources/perf/memory.lua.txt
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Resources/perf/memory.lua.txt.meta b/Assets/XLua/Resources/perf/memory.lua.txt.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Resources/perf/profiler.lua.txt b/Assets/XLua/Resources/perf/profiler.lua.txt
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Resources/perf/profiler.lua.txt.meta b/Assets/XLua/Resources/perf/profiler.lua.txt.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Resources/xlua.meta b/Assets/XLua/Resources/xlua.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Resources/xlua/util.lua.txt b/Assets/XLua/Resources/xlua/util.lua.txt
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Resources/xlua/util.lua.txt.meta b/Assets/XLua/Resources/xlua/util.lua.txt.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Src.meta b/Assets/XLua/Src.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Src/CodeEmit.cs b/Assets/XLua/Src/CodeEmit.cs
old mode 100755
new mode 100644
index c628add..59ee770
--- a/Assets/XLua/Src/CodeEmit.cs
+++ b/Assets/XLua/Src/CodeEmit.cs
@@ -231,7 +231,7 @@ namespace XLua
{
var to_be_impl = group.Key;
- var method_builder = defineImplementMethod(impl_type_builder, to_be_impl, to_be_impl.Attributes, "Invoke" + (genID++));
+ var method_builder = defineImplementMethod(impl_type_builder, to_be_impl, to_be_impl.Attributes, "__Gen_Delegate_Imp" + (genID++));
emitMethodImpl(to_be_impl, method_builder.GetILGenerator(), false);
diff --git a/Assets/XLua/Src/CodeEmit.cs.meta b/Assets/XLua/Src/CodeEmit.cs.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Src/CopyByValue.cs b/Assets/XLua/Src/CopyByValue.cs
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Src/CopyByValue.cs.meta b/Assets/XLua/Src/CopyByValue.cs.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Src/DelegateBridge.cs b/Assets/XLua/Src/DelegateBridge.cs
old mode 100755
new mode 100644
index 4476165..c0e8eb0
--- a/Assets/XLua/Src/DelegateBridge.cs
+++ b/Assets/XLua/Src/DelegateBridge.cs
@@ -86,7 +86,7 @@ namespace XLua
public static class HotfixDelegateBridge
{
-#if UNITY_IPHONE && !UNITY_EDITOR
+#if (UNITY_IPHONE || UNITY_TVOS) && !UNITY_EDITOR
[DllImport("__Internal", CallingConvention = CallingConvention.Cdecl)]
public static extern bool xlua_get_hotfix_flag(int idx);
@@ -117,7 +117,7 @@ namespace XLua
DelegateBridge.DelegateBridgeList = newList;
}
DelegateBridge.DelegateBridgeList[idx] = val;
-#if UNITY_IPHONE && !UNITY_EDITOR
+#if (UNITY_IPHONE || UNITY_TVOS) && !UNITY_EDITOR
xlua_set_hotfix_flag(idx, val != null);
#endif
}
diff --git a/Assets/XLua/Src/DelegateBridge.cs.meta b/Assets/XLua/Src/DelegateBridge.cs.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Src/Editor.meta b/Assets/XLua/Src/Editor.meta
old mode 100755
new mode 100644
diff --git a/Assets/XLua/Src/Editor/Generator.cs b/Assets/XLua/Src/Editor/Generator.cs
index 400b67a..65b2a71 100644
--- a/Assets/XLua/Src/Editor/Generator.cs
+++ b/Assets/XLua/Src/Editor/Generator.cs
@@ -527,6 +527,14 @@ namespace CSObjectWrapEditor
if (mb is FieldInfo && (mb as FieldInfo).FieldType.IsPointer) return true;
if (mb is PropertyInfo && (mb as PropertyInfo).PropertyType.IsPointer) return true;
+ foreach(var filter in memberFilters)
+ {
+ if (filter(mb))
+ {
+ return true;
+ }
+ }
+
foreach (var exclude in BlackList)
{
if (mb.DeclaringType.ToString() == exclude[0] && mb.Name == exclude[1])
@@ -544,7 +552,15 @@ namespace CSObjectWrapEditor
//指针目前不支持，先过滤
if (mb.GetParameters().Any(pInfo => pInfo.ParameterType.IsPointer)) return true;
- if (mb is MethodInfo && (mb as MethodInfo).ReturnType.IsPointer) return false;
+ if (mb is MethodInfo && (mb as MethodInfo).ReturnType.IsPointer) return true;
+
+ foreach (var filter in memberFilters)
+ {
+ if (filter(mb))
+ {
+ return true;
+ }
+ }
foreach (var exclude in BlackList)
{
@@ -618,20 +634,28 @@ namespace CSObjectWrapEditor
GenOne(null, (type, type_info) =>
{
+ var type2fields = luaenv.NewTable();
+ foreach(var _type in types)
+ type2fields.Set(_type, _type.GetFields(BindingFlags.Public | BindingFlags.Static).Where(x => !isMemberInBlackList(x)).ToArray());
+ type_info.Set("type2fields", type2fields);
type_info.Set("types", types.ToList());
}, templateRef.LuaEnumWrap, textWriter);
textWriter.Close();
}
+ static string NonmalizeName(string name)
+ {
+ return name.Replace("+", "_").Replace(".", "_").Replace("`", "_").Replace("&", "_").Replace("[", "_").Replace("]", "_").Replace(",", "_");
+ }
+
static void GenInterfaceBridge(IEnumerable types, string save_path)
{
foreach (var wrap_type in types)
{
if (!wrap_type.IsInterface) continue;
- string filePath = save_path + wrap_type.ToString().Replace("+", "").Replace(".", "")
- .Replace("`", "").Replace("&", "").Replace("[", "").Replace("]", "").Replace(",", "") + "Bridge.cs";
+ string filePath = save_path + NonmalizeName(wrap_type.ToString()) + "Bridge.cs";
StreamWriter textWriter = new StreamWriter(filePath, false, Encoding.UTF8);
GenOne(wrap_type, (type, type_info) =>
{
@@ -839,7 +863,8 @@ namespace CSObjectWrapEditor
}
}
- return true;
+ var lastPos = xParams.Length - 1;
+ return lastPos < 0 || xParams[lastPos].IsParamArray == yParams[lastPos].IsParamArray;
}
public int GetHashCode(MethodInfoSimulation obj)
{
@@ -927,6 +952,7 @@ namespace CSObjectWrapEditor
}
var delegates_groups = types.Select(delegate_type => makeMethodInfoSimulation(delegate_type.GetMethod("Invoke")))
+ .Where(d => d.DeclaringType.FullName != null)
.Concat(hotfxDelegates)
.GroupBy(d => d, comparer).Select((group) => new { Key = group.Key, Value = group.ToList()});
GenOne(typeof(DelegateBridge), (type, type_info) =>
@@ -973,8 +999,7 @@ namespace CSObjectWrapEditor
foreach (var wrap_type in types)
{
- string filePath = save_path + wrap_type.ToString().Replace("+", "").Replace(".", "")
- .Replace("`", "").Replace("&", "").Replace("[", "").Replace("]", "").Replace(",", "") + "Wrap.cs";
+ string filePath = save_path + NonmalizeName(wrap_type.ToString()) + "Wrap.cs";
StreamWriter textWriter = new StreamWriter(filePath, false, Encoding.UTF8);
if (wrap_type.IsEnum)
{
@@ -1096,7 +1121,7 @@ namespace CSObjectWrapEditor
var extension_methods_from_lcs = (from t in LuaCallCSharp
where isDefined(t, typeof(ExtensionAttribute))
from method in t.GetMethods(BindingFlags.Static | BindingFlags.Public)
- where isDefined(method, typeof(ExtensionAttribute))
+ where isDefined(method, typeof(ExtensionAttribute)) && !isObsolete(method)
where !method.ContainsGenericParameters || isSupportedGenericMethod(method)
select makeGenericMethodIfNeeded(method))
.Where(method => !lookup.ContainsKey(method.GetParameters()[0].ParameterType));
@@ -1104,7 +1129,7 @@ namespace CSObjectWrapEditor
var extension_methods = (from t in ReflectionUse
where isDefined(t, typeof(ExtensionAttribute))
from method in t.GetMethods(BindingFlags.Static | BindingFlags.Public)
- where isDefined(method, typeof(ExtensionAttribute))
+ where isDefined(method, typeof(ExtensionAttribute)) && !isObsolete(method)
where !method.ContainsGenericParameters || isSupportedGenericMethod(method)
select makeGenericMethodIfNeeded(method)).Concat(extension_methods_from_lcs);
GenOne(typeof(DelegateBridgeBase), (type, type_info) =>
@@ -1264,6 +1289,8 @@ namespace CSObjectWrapEditor
public static List assemblyList = null;
+ public static List> memberFilters = null;
+
static void AddToList(List list, Func