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

upgrade

Browse Source
This commit is contained in:
陈彬
2020-07-05 15:44:30 +08:00
parent a8f02e4da5
commit e344c54d82
32 changed files with 647 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/trCRM/DistSpringWebsocketClient/Client.cs
View File

@@ -276,7 +276,6 @@ namespace Dist.SpringWebsocket
}
public void DisConnect()
{
_send(StompCommandEnum.DISCONNECT.ToString() + LF + LF + NULL);
ArrayList list = new ArrayList();
list.AddRange(subscribes.Keys);
foreach (var key in list)
@@ -285,6 +284,7 @@ namespace Dist.SpringWebsocket
}
this.callbacks.Clear();
this.subscribes.Clear();
_send(StompCommandEnum.DISCONNECT.ToString() + LF + LF + NULL);
this.connected = false;
isSending = false;
}

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

@@ -46,7 +46,7 @@ MonoBehaviour:
material: {fileID: 0}
mSprites: []
mPixelSize: 1
mReplacement: {fileID: 0}
mReplacement: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
mCoordinates: 0
sprites: []
_isBorrowSpriteMode: 1

1
Assets/trCRM/Scripts/xLua/XluaGenCodeConfig.cs
View File

@@ -198,6 +198,7 @@ public static class XluaGenCodeConfig
typeof(Mp3PlayerByUrl),
typeof(CLUICheckbox),
typeof(CLUIPopListPanel),
typeof(CLUIScrollViewWithEvent),
};
//C#静态调用Lua的配置（包括事件的原型），仅可以配delegate，interface

6
Assets/trCRM/_scene/Main.unity
View File

@@ -668,7 +668,7 @@ MonoBehaviour:
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 16
aspectRatio: 17.5
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 0}
mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -1143,7 +1143,7 @@ MonoBehaviour:
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 9.45
aspectRatio: 9.25
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 0}
mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -1806,7 +1806,7 @@ MonoBehaviour:
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 13.2
aspectRatio: 4.1555557
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 0}
mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}

1
Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLInclude.lua
View File

@@ -261,6 +261,7 @@ Mp3PlayerByUrl = CS.Mp3PlayerByUrl
CLUICheckbox = CS.CLUICheckbox
---@type CLUIPopListPanel
CLUIPopListPanel = CS.CLUIPopListPanel
CLUIScrollViewWithEvent= CS.CLUIScrollViewWithEvent
-------------------------------------------------------
json = require("json.json")

32
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustList.lua
View File

@@ -12,12 +12,18 @@ function TRPCustList:init(csObj)
uiobjs.InputSeachKey = getCC(self.transform, "Top/InputSeachKey", "UIInput")
uiobjs.ButtonFilterSp = getCC(self.transform, "Top/ButtonFilter", "UISprite")
uiobjs.ButtonFilterLb = getCC(uiobjs.ButtonFilterSp.transform, "Label", "UILabel")
---@type UIScrollView
uiobjs.scrollView = getCC(self.transform, "PanelContent", "UIScrollView")
---@type CLUIScrollViewWithEvent
uiobjs.scrollView = getCC(self.transform, "PanelContent", "CLUIScrollViewWithEvent")
uiobjs.scrollView:init(
self:wrapFunc(self.onShowRefreshFlg),
self:wrapFunc(self.onhideRefreshFlg),
self:wrapFunc(self.refreshList)
)
---@type Coolape.CLUILoopGrid
uiobjs.Grid = getCC(uiobjs.scrollView.transform, "Grid", "CLUILoopGrid")
uiobjs.ButtonEndList = getChild(uiobjs.Grid.transform, "ButtonEndList")
uiobjs.ButtonEndListLb = getCC(uiobjs.ButtonEndList, "Label", "UILabel")
uiobjs.ButtonHeadList = getChild(uiobjs.Grid.transform, "ButtonHeadList")
end
-- 设置数据
@@ -35,6 +41,7 @@ function TRPCustList:show()
end
function TRPCustList:showList(list)
SetActive(uiobjs.ButtonHeadList.gameObject, false)
SetActive(uiobjs.ButtonEndList.gameObject, false)
uiobjs.Grid:setList(
list or {},
@@ -50,8 +57,25 @@ function TRPCustList:appList(list)
uiobjs.Grid:appendList(list)
end
function TRPCustList:onShowRefreshFlg()
-- printe("TRPCustList:onShowRefreshFlg")
uiobjs.ButtonHeadList.transform.localPosition = Vector3(0, 250, 0)
SetActive(uiobjs.ButtonHeadList.gameObject, true)
end
function TRPCustList:onhideRefreshFlg()
-- printe("TRPCustList:onhideRefreshFlg")
SetActive(uiobjs.ButtonHeadList.gameObject, false)
end
function TRPCustList:refreshList()
local queryKey = uiobjs.InputSeachKey.value
showHotWheel()
NetProto.send.list_customers(self.filterValue, queryKey, 1)
end
function TRPCustList:onHeadList(head)
printw("到最顶端了")
-- uiobjs.ButtonHeadList.transform.localPosition = Vector3(0, 250, 0)
-- SetActive(uiobjs.ButtonHeadList.gameObject, true)
end
function TRPCustList:onEndList(tail)
@@ -171,9 +195,9 @@ function TRPCustList:onSetFilter(filters, queryKey)
showHotWheel()
self.filterValue = self:getFilterStr()
-- if oldqueryKey == queryKey then
NetProto.send.list_customers(self.filterValue, queryKey, 1)
NetProto.send.list_customers(self.filterValue, queryKey, 1)
-- else
-- 会触发input的onChange事件
-- 会触发input的onChange事件
-- end
end

223
Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustList.prefab
View File

@@ -125,6 +125,101 @@ MonoBehaviour:
valueIsNumber: 0
isPhoneNum: 0
inValidColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
--- !u!1 &307354104191689337
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1817071848449545757}
- component: {fileID: 1255883272435087888}
- component: {fileID: 685137555730920873}
- component: {fileID: 7518047985787852399}
m_Layer: 5
m_Name: ButtonHeadList
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1817071848449545757
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 307354104191689337}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -390, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4027989637601392902}
m_Father: {fileID: 3624471334851081428}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &1255883272435087888
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 307354104191689337}
m_Material: {fileID: 0}
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1125, y: 87.74999, z: 0}
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &685137555730920873
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 307354104191689337}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3}
m_Name:
m_EditorClassIdentifier:
tweenTarget: {fileID: 1505692092124808818}
hover: {r: 0.88235295, g: 0.78431374, b: 0.5882353, a: 1}
pressed: {r: 0.7176471, g: 0.6392157, b: 0.48235294, a: 1}
disabledColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
duration: 0.2
skipColorEffect: 1
dragHighlight: 0
hoverSprite:
pressedSprite:
disabledSprite:
hoverSprite2D: {fileID: 0}
pressedSprite2D: {fileID: 0}
disabledSprite2D: {fileID: 0}
pixelSnap: 0
onClick:
- mTarget: {fileID: 1048171421149951831}
mMethodName: uiEventDelegate
mParameters:
- obj: {fileID: 0}
field:
name: go
oneShot: 0
--- !u!114 &7518047985787852399
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 307354104191689337}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f02842fa4878db54f9587ff4de7d9f2d, type: 3}
m_Name:
m_EditorClassIdentifier:
scrollView: {fileID: 0}
draggablePanel: {fileID: 0}
--- !u!1 &389313710132268000
GameObject:
m_ObjectHideFlags: 0
@@ -774,6 +869,106 @@ MonoBehaviour:
mSpriteName: cust_peo
mFillCenter: 1
isGrayMode: 0
--- !u!1 &1505692092124808818
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4027989637601392902}
- component: {fileID: 5378230218683319699}
m_Layer: 5
m_Name: Label
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4027989637601392902
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1505692092124808818}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1817071848449545757}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &5378230218683319699
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1505692092124808818}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3}
m_Name:
m_EditorClassIdentifier:
leftAnchor:
target: {fileID: 0}
relative: 0
absolute: 0
rightAnchor:
target: {fileID: 0}
relative: 1
absolute: 0
bottomAnchor:
target: {fileID: 0}
relative: 0
absolute: 0
topAnchor:
target: {fileID: 0}
relative: 1
absolute: 0
updateAnchors: 1
mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
mPivot: 4
mWidth: 1125
mHeight: 50
mDepth: 11
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 22.5
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 0}
mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
mText: "\u4E0B\u62C9\u5237\u65B0"
mFontSize: 46
mFontStyle: 0
mAlignment: 0
mEncoding: 1
mMaxLineCount: 0
mEffectStyle: 0
mEffectColor: {r: 0, g: 0, b: 0, a: 1}
mSymbols: 1
mEffectDistance: {x: 1, y: 1}
mOverflow: 0
mMaterial: {fileID: 0}
mApplyGradient: 0
mGradientTop: {r: 1, g: 1, b: 1, a: 1}
mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1}
mSpacingX: 0
mSpacingY: 0
mUseFloatSpacing: 0
mFloatSpacingX: 0
mFloatSpacingY: 0
mShrinkToFit: 0
mMaxLineWidth: 0
mMaxLineHeight: 0
mLineWidth: 0
mMultiline: 1
isAppendEndingString: 0
AppendString: '...'
fontName: EmptyFont
--- !u!1 &1699006725816610221
GameObject:
m_ObjectHideFlags: 0
@@ -1205,7 +1400,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f02842fa4878db54f9587ff4de7d9f2d, type: 3}
m_Name:
m_EditorClassIdentifier:
scrollView: {fileID: 864282778871564554}
scrollView: {fileID: 0}
draggablePanel: {fileID: 0}
--- !u!1 &3115549559286401799
GameObject:
@@ -1912,7 +2107,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f02842fa4878db54f9587ff4de7d9f2d, type: 3}
m_Name:
m_EditorClassIdentifier:
scrollView: {fileID: 864282778871564554}
scrollView: {fileID: 1671106021289561463}
draggablePanel: {fileID: 0}
--- !u!1 &4485536130544330055
GameObject:
@@ -2052,7 +2247,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f02842fa4878db54f9587ff4de7d9f2d, type: 3}
m_Name:
m_EditorClassIdentifier:
scrollView: {fileID: 864282778871564554}
scrollView: {fileID: 0}
draggablePanel: {fileID: 0}
--- !u!114 &198079275
MonoBehaviour:
@@ -2085,7 +2280,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &4807452480724246282
Transform:
m_ObjectHideFlags: 0
@@ -2394,7 +2589,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f02842fa4878db54f9587ff4de7d9f2d, type: 3}
m_Name:
m_EditorClassIdentifier:
scrollView: {fileID: 864282778871564554}
scrollView: {fileID: 0}
draggablePanel: {fileID: 0}
--- !u!1 &5762016920945874999
GameObject:
@@ -2631,7 +2826,7 @@ GameObject:
m_Component:
- component: {fileID: 2115892174431337330}
- component: {fileID: 3820752014185389156}
- component: {fileID: 864282778871564554}
- component: {fileID: 1671106021289561463}
m_Layer: 5
m_Name: PanelContent
m_TagString: Untagged
@@ -2700,7 +2895,7 @@ MonoBehaviour:
mDepth: 2
mSortingOrder: 0
mClipOffset: {x: 0, y: 0}
--- !u!114 &864282778871564554
--- !u!114 &1671106021289561463
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -2709,13 +2904,13 @@ MonoBehaviour:
m_GameObject: {fileID: 6640636915241325103}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d81807633ea807d4c8e3fff7e10c6000, type: 3}
m_Script: {fileID: 11500000, guid: e5c85efbbc1ec4b75939e6d7f077e68c, type: 3}
m_Name:
m_EditorClassIdentifier:
movement: 1
dragEffect: 2
restrictWithinPanel: 1
disableDragIfFits: 1
disableDragIfFits: 0
smoothDragStart: 1
iOSDragEmulation: 1
scrollWheelFactor: 0.25
@@ -2724,11 +2919,13 @@ MonoBehaviour:
horizontalScrollBar: {fileID: 0}
verticalScrollBar: {fileID: 0}
showScrollBars: 1
customMovement: {x: 1, y: 0}
customMovement: {x: 0, y: 1}
contentPivot: 1
scale: {x: 0, y: 0, z: 0}
relativePositionOnReset: {x: 0, y: 0}
centerOnChild: {fileID: 0}
loopGrid: {fileID: 1265675470708273447}
thresholDelta: {x: 0, y: -100}
--- !u!1 &8147424317762133719
GameObject:
m_ObjectHideFlags: 0
@@ -2876,7 +3073,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f02842fa4878db54f9587ff4de7d9f2d, type: 3}
m_Name:
m_EditorClassIdentifier:
scrollView: {fileID: 864282778871564554}
scrollView: {fileID: 0}
draggablePanel: {fileID: 0}
--- !u!1 &8218860318568637904
GameObject:
@@ -3351,6 +3548,7 @@ Transform:
m_Children:
- {fileID: 3897974101900603345}
- {fileID: 4807452480724246282}
- {fileID: 1817071848449545757}
m_Father: {fileID: 2115892174431337330}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -3399,3 +3597,6 @@ MonoBehaviour:
itemList: []
grid: {fileID: 0}
panel: {fileID: 0}
OnShowHeadListCallbacks: []
OnHideHeadListCallbacks: []
OnEndListCallbacks: []

19
Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMsg.prefab
View File

@@ -785,6 +785,9 @@ MonoBehaviour:
itemList: []
grid: {fileID: 0}
panel: {fileID: 0}
OnShowHeadListCallbacks: []
OnHideHeadListCallbacks: []
OnEndListCallbacks: []
--- !u!1 &4440088906197307186
GameObject:
m_ObjectHideFlags: 0
@@ -843,7 +846,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f02842fa4878db54f9587ff4de7d9f2d, type: 3}
m_Name:
m_EditorClassIdentifier:
scrollView: {fileID: 7559427025382814607}
scrollView: {fileID: 0}
draggablePanel: {fileID: 0}
--- !u!114 &5936379021244286420
MonoBehaviour:
@@ -1308,7 +1311,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6904648129028073836}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -1, y: -118, z: 0}
m_LocalPosition: {x: -2, y: -118, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 3557982717651279387}
@@ -1522,7 +1525,7 @@ GameObject:
m_Component:
- component: {fileID: 7559427025382814600}
- component: {fileID: 7559427025382814606}
- component: {fileID: 7559427025382814607}
- component: {fileID: 7874584721905653174}
m_Layer: 5
m_Name: PanelContent
m_TagString: Untagged
@@ -1538,7 +1541,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7559427025382814601}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 918.79785, z: 0}
m_LocalPosition: {x: 1, y: 918.79785, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 7559427024191909535}
@@ -1590,8 +1593,8 @@ MonoBehaviour:
mClipSoftness: {x: 4, y: 10}
mDepth: 2
mSortingOrder: 0
mClipOffset: {x: 0, y: -918.79785}
--- !u!114 &7559427025382814607
mClipOffset: {x: -1, y: -918.79785}
--- !u!114 &7874584721905653174
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -1600,7 +1603,7 @@ MonoBehaviour:
m_GameObject: {fileID: 7559427025382814601}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d81807633ea807d4c8e3fff7e10c6000, type: 3}
m_Script: {fileID: 11500000, guid: e5c85efbbc1ec4b75939e6d7f077e68c, type: 3}
m_Name:
m_EditorClassIdentifier:
movement: 1
@@ -1620,6 +1623,8 @@ MonoBehaviour:
scale: {x: 0, y: 0, z: 0}
relativePositionOnReset: {x: 0, y: 0}
centerOnChild: {fileID: 0}
loopGrid: {fileID: 7651258732160335458}
thresholDelta: {x: 0, y: -100}
--- !u!1 &8441046789887697199
GameObject:
m_ObjectHideFlags: 0

BIN
Assets/trCRM/upgradeRes4Publish/priority/lua/public/CLLInclude.lua
View File

Binary file not shown.

BIN
Assets/trCRM/upgradeRes4Publish/priority/lua/toolkit/MyUtl.lua
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

@@ -1 +1 @@
r8 (trCRM/resVer/Android/VerCtl/priority.ver8,28ed951ffde0c0f4e52eac28ce452c198 %trCRM/resVer/Android/VerCtl/other.ver8,74d6c944ee66abd2c5865b56a49deba7
r8 (trCRM/resVer/Android/VerCtl/priority.ver8,fd3cafdbd4d3308b3c5777830a0247a38 %trCRM/resVer/Android/VerCtl/other.ver8,5d7652a6e041f6c69527bca78bcfb166

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

File diff suppressed because one or more lines are too long

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

Binary file not shown.