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

up

Browse Source
This commit is contained in:
陈彬
2020-07-11 17:07:30 +08:00
parent e84465cd64
commit d587401a58
56 changed files with 6913 additions and 5316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBUser.lua
View File

@@ -25,7 +25,11 @@ function DBUser.getPopList()
end
function DBUser.getUserById(loginNo)
return db[loginNo]
local user = db[loginNo]
if user == nil then
printe("get user is nil=", loginNo)
end
return user
end
function DBUser.getIcon(loginNo, callback)

3
Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/MyUtl.lua
View File

@@ -105,4 +105,7 @@ MyUtl.toastE = function(msg, staySec)
CLToastRoot.toast(msg, CLToastRoot.Type.error, staySec)
end
MyUtl.confirm = function(msg, callback, buttonName)
getPanelAsy("PanelConfirm2", onLoadedPanelTT, {msg = msg, callback = callback, buttonName = buttonName})
end
return MyUtl

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

@@ -211,7 +211,7 @@ function CLLPStart.doEnterGame()
end
end
if useOldCurrGroup then
getPanelAsy("PanelConnect", onLoadedPanelTT)
getPanelAsy("PanelConnect", onLoadedPanel)
else
---@type _ParamTRPSelectGroup
local d = {}

59
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPMine.lua
View File

@@ -6,6 +6,7 @@ local transform = nil
CSPMine.sizeAdjust = 1
CSPMine.contentRect = Vector4.zero
local objs = {}
local headData = {}
-- 初始化，只会调用一次
function CSPMine.init(csObj)
@@ -14,9 +15,12 @@ function CSPMine.init(csObj)
CSPMine.contentRect = MyUtl.getUIContent(csSelf, nil, nil, true)
objs.Content = getCC(transform, "PanelContent", "UIPanel")
objs.Content.transform.localPosition = Vector3.zero
objs.Content.clipOffset = Vector2.zero
objs.Content.baseClipRegion = CSPMine.contentRect
MyUtl.setContentView(objs.Content, 147 + 370)
---@type CLUIFormRoot
objs.Top = getCC(transform, "Top", "CLUIFormRoot")
---@type UITexture
objs.HeadIcon = getCC(objs.Top.transform, "SpriteHeadBg/SpriteHeadIcon", "UITexture")
---@type UIScrollView
objs.scrollView = objs.Content:GetComponent("UIScrollView")
@@ -24,14 +28,35 @@ end
-- 设置数据
function CSPMine.setData(paras)
-- 初始化顶部数据
local currGroup = Prefs.getCurrGroup(Prefs.getUserName())
local companyInfro = json.decode(currGroup)
local user = DBUser.getUserById(companyInfro.login_no)
headData.company_id = companyInfro.company_id
headData.company_name = companyInfro.company_name
if user then
headData.loginNo = user.loginNo
headData.loginName = user.loginName
headData.imageUrl = user.imageUrl
else
printe("账号信息未取得！")
end
end
-- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh
function CSPMine.show()
CSPMine.setHeadInfor()
objs.scrollView:ResetPosition()
end
function CSPMine.onClickBottonBtn(cell)
function CSPMine.setHeadInfor()
objs.Top:setValue(headData)
DBUser.getIcon(
headData.loginNo,
function(content)
objs.HeadIcon.mainTexture = content
end
)
end
-- 刷新
@@ -44,37 +69,17 @@ end
-- 网络请求的回调；cmd：指命，succ：成功失败，msg：消息；paras：服务器下行数据
function CSPMine.procNetwork(cmd, succ, msg, paras)
--[[
if(succ == 1) then
if(cmd == "xxx") then
-- TODO:
end
end
--]]
end
-- 处理ui上的事件，例如点击等
function CSPMine.uiEventDelegate(go)
local goName = go.name
if (goName == "Button01") then
--[[
if isNilOrEmpty(__uid__) then
getPanelAsy("PanelLogin", onLoadedPanelTT, {function (uid)
if uid then
getPanelAsy("PanelPasswordSave", onLoadedPanelTT)
end
end}
)
else
-- 密码保护
getPanelAsy("PanelPasswordSave", onLoadedPanelTT)
end
--]]
getPanelAsy("PanelPasswordSave", onLoadedPanelTT)
elseif goName == "ButtonQR" then
if goName == "ButtonMyCheck" then
showHotWheel()
-- CSPMine.onGetLocation(json.encode({code = 0, latitude = "116.404", longitude = "39.915"}))
MyLocation.self:getMyLocation(CSPMine.onGetLocation)
elseif goName == "ButtonSetting" or goName == "ButtonMySetting" then
getPanelAsy("PanelSetting", onLoadedPanelTT)
end
end

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

@@ -41,6 +41,7 @@ function CSPTasks.setData(paras)
headData.company_id = companyInfro.company_id
headData.company_name = companyInfro.company_name
if user then
headData.loginNo = user.loginNo
headData.loginName = user.loginName
headData.imageUrl = user.imageUrl
else
@@ -74,25 +75,12 @@ end
function CSPTasks.setHeadInfor()
uiobjs.Top:setValue(headData)
if not isNilOrEmpty(headData.imageurl) then
if uiobjs.HeadIcon.mainTexture == nil or uiobjs.HeadIcon.mainTexture.name ~= headData.imageurl then
WWWEx.get(
headData.imageurl,
nil,
CLAssetType.texture,
function(content, orgs)
content.name = headData.imageurl
uiobjs.HeadIcon.mainTexture = content
end,
function()
printe("取得头像失败")
end,
nil,
true,
2
)
DBUser.getIcon(
headData.loginNo,
function(content)
uiobjs.HeadIcon.mainTexture = content
end
end
)
end
-- 关闭页面

73
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPConfirm2.lua Normal file
View File

@@ -0,0 +1,73 @@

---@type IDBasePanel
local TRBasePanel = require("ui.panel.TRBasePanel")
---@class TRPConfirm2:TRBasePanel 邮件列表
local TRPConfirm2 = class("TRPConfirm2", TRBasePanel)
local uiobjs = {}
-- 初始化，只会调用一次
function TRPConfirm2:init(csObj)
TRPConfirm2.super.init(self, csObj)
uiobjs.LabelTitle = getCC(self.transform, "Bottom/offset/LabelTitle", "UILabel")
uiobjs.ButtonOkayLb = getCC(self.transform, "Bottom/offset/ButtonOkay/Label", "UILabel")
self:setEventDelegate()
end
-- 设置数据
---@param paras _ParamTRPConfirm2
function TRPConfirm2:setData(paras)
self.mdata = paras
end
-- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh
function TRPConfirm2:show()
uiobjs.LabelTitle.text = self.mdata.msg
uiobjs.ButtonOkayLb.text = self.mdata.buttonName or "确定"
end
-- 刷新
function TRPConfirm2:refresh()
end
-- 关闭页面
function TRPConfirm2:hide()
end
-- 网络请求的回调；cmd：指命，succ：成功失败，msg：消息；paras：服务器下行数据
function TRPConfirm2:procNetwork(cmd, succ, msg, paras)
if (succ == NetSuccess) then
--[[
if cmd == xx then
end
]]
end
end
function TRPConfirm2:setEventDelegate()
self.EventDelegate = {
SpriteBg = function()
hideTopPanel(self.csSelf)
end,
ButtonClose = function()
hideTopPanel(self.csSelf)
end,
ButtonOkay = function()
hideTopPanel(self.csSelf)
Utl.doCallback(self.mdata.callback)
end
}
end
-- 处理ui上的事件，例如点击等
function TRPConfirm2:uiEventDelegate(go)
local func = self.EventDelegate[go.name]
if func then
func()
end
end
-- 当顶层页面发生变化时回调
function TRPConfirm2:onTopPanelChange(topPanel)
end
--------------------------------------------
return TRPConfirm2

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

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

6
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPResetPasswordStep1.lua
View File

@@ -25,7 +25,11 @@ function TRPResetPasswordStep1:onShowFrame(cs)
if cs.frameObj then
---@type _BGFrame1Param
local d = {}
d.title = cs.titleKeyName
if self.mData.isModify then
d.title = "重置密码"
else
d.title = "寻找密码"
end
d.panel = cs
d.isHideCloseBtn = true
cs.frameObj:init(d)

10
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPResetPasswordStep2.lua
View File

@@ -26,7 +26,11 @@ function TRPResetPasswordStep2:onShowFrame(cs)
if cs.frameObj then
---@type _BGFrame1Param
local d = {}
d.title = cs.titleKeyName
if self.mData.isModify then
d.title = "重置密码"
else
d.title = "寻找密码"
end
d.panel = cs
d.isHideCloseBtn = true
cs.frameObj:init(d)
@@ -88,7 +92,9 @@ function TRPResetPasswordStep2:setEventDelegate()
if not isNilOrEmpty(uiobjs.formRoot:checkValid()) then
return
end
getPanelAsy("PanelResetPasswordStep3", onLoadedPanelTT, uiobjs.formRoot:getValue(self.mData, true))
local data = uiobjs.formRoot:getValue(self.mData, true)
data.isModify = self.mData.isModify
getPanelAsy("PanelResetPasswordStep3", onLoadedPanelTT, data)
end,
ButtonReGetCode = function()
if self.canReGetcode then

6
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPResetPasswordStep3.lua
View File

@@ -28,7 +28,11 @@ function TRPResetPasswordStep3:onShowFrame(cs)
if cs.frameObj then
---@type _BGFrame1Param
local d = {}
d.title = cs.titleKeyName
if self.mData.isModify then
d.title = "重置密码"
else
d.title = "寻找密码"
end
d.panel = cs
d.isHideCloseBtn = true
cs.frameObj:init(d)

103
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSetting.lua Normal file
View File

@@ -0,0 +1,103 @@
---@type IDBasePanel
local TRBasePanel = require("ui.panel.TRBasePanel")
---@class TRPSetting:TRBasePanel 邮件列表
local TRPSetting = class("TRPSetting", TRBasePanel)
local uiobjs = {}
-- 初始化，只会调用一次
function TRPSetting:init(csObj)
TRPSetting.super.init(self, csObj)
uiobjs.content = getChild(self.transform, "PanelContent")
MyUtl.setContentView(uiobjs.content)
---@type UIScrollView
uiobjs.scrollview = getCC(self.transform, "PanelContent", "UIScrollView")
self:setEventDelegate()
end
-- 设置数据
---@param paras _ParamTRPSetting
function TRPSetting:setData(paras)
self.mdata = paras
end
-- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh
function TRPSetting:show()
uiobjs.scrollview:ResetPosition()
end
-- 刷新
function TRPSetting:refresh()
end
-- 关闭页面
function TRPSetting:hide()
end
-- 网络请求的回调；cmd：指命，succ：成功失败，msg：消息；paras：服务器下行数据
function TRPSetting:procNetwork(cmd, succ, msg, paras)
if (succ == NetSuccess) then
--[[
if cmd == xx then
end
]]
end
end
function TRPSetting:setEventDelegate()
self.EventDelegate = {
ButtonPassword = function()
getPanelAsy("PanelResetPasswordStep1", onLoadedPanelTT, {phone = Prefs.getUserName(), isModify = true})
end,
ButtonLogout = function()
MyUtl.confirm(
"确定要退出当前账号？",
function()
Prefs.setCurrGroup(Prefs.getUserName(), "")
Prefs.setUserPsd("")
hideTopPanel(self.csSelf)
hideTopPanel()
hideTopPanel()
getPanelAsy("PanelLogin", onLoadedPanel)
end,
"退出账号"
)
end,
ButtonClearCache = function()
MyUtl.confirm(
"确定要清空缓存？",
function()
PlayerPrefs.DeleteAll()
--- 释放资源开始-------------------------------
local cleanRes = function()
pcall(doSomethingBeforeRestart)
pcall(releaseRes4GC, true)
end
--- 释放资源结束-------------------------------
pcall(cleanRes)
local panel = CLPanelManager.getPanel(CLMainBase.self.firstPanel)
if panel then
CLPanelManager.showPanel(panel)
end
CLMainBase.self:reStart()
end,
"确定清空"
)
end
}
end
-- 处理ui上的事件，例如点击等
function TRPSetting:uiEventDelegate(go)
local func = self.EventDelegate[go.name]
if func then
func()
end
end
-- 当顶层页面发生变化时回调
function TRPSetting:onTopPanelChange(topPanel)
end
--------------------------------------------
return TRPSetting

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

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

1133
Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConfirm2.prefab Normal file
View File

File diff suppressed because it is too large Load Diff

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

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

32
Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustFilter.prefab
View File

@@ -10,6 +10,7 @@ GameObject:
m_Component:
- component: {fileID: 215294782348184347}
- component: {fileID: 215294782348184344}
- component: {fileID: 5236480268661750874}
m_Layer: 5
m_Name: SpriteBg
m_TagString: Untagged
@@ -62,13 +63,13 @@ MonoBehaviour:
updateAnchors: 0
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 1
mWidth: 1127
mWidth: 1125
mHeight: 132
mDepth: 0
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 8.537879
aspectRatio: 8.522727
mType: 1
mFillDirection: 4
mFillAmount: 1
@@ -84,6 +85,21 @@ MonoBehaviour:
mSpriteName: cust_border
mFillCenter: 1
isGrayMode: 0
--- !u!114 &5236480268661750874
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 215294782348184346}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3}
m_Name:
m_EditorClassIdentifier:
widget: {fileID: 215294782348184344}
offset: 0
sizeAdjust: 1
--- !u!1 &215294782637470932
GameObject:
m_ObjectHideFlags: 0
@@ -264,7 +280,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 215294783250459624}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 447, y: -203, z: 0}
m_LocalPosition: {x: 446, y: -203, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 215294783001674502}
@@ -760,7 +776,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2088325436638624531}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -474, y: -203, z: 0}
m_LocalPosition: {x: -473, y: -203, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1030864173411183745}
@@ -780,8 +796,8 @@ BoxCollider:
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 687, y: 88, z: 0}
m_Center: {x: 343.5, y: 0, z: 0}
m_Size: {x: 685, y: 88, z: 0}
m_Center: {x: 342.5, y: 0, z: 0}
--- !u!114 &5619337202710833479
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -841,7 +857,7 @@ MonoBehaviour:
updateAnchors: 0
mColor: {r: 0.95686275, g: 0.95686275, b: 0.95686275, a: 1}
mPivot: 3
mWidth: 687
mWidth: 685
mHeight: 88
mDepth: 6
autoResizeBoxCollider: 1
@@ -2354,7 +2370,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8018611027450714218}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 645, y: 0, z: 0}
m_LocalPosition: {x: 643, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2821344152813474576}

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

@@ -248,7 +248,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 389313710132268000}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 645, y: 0, z: 0}
m_LocalPosition: {x: 643, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1216238761725616900}
@@ -1435,7 +1435,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3115549559286401799}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -474, y: -203, z: 0}
m_LocalPosition: {x: -473, y: -203, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4146059043221036181}
@@ -1455,8 +1455,8 @@ BoxCollider:
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 687, y: 88, z: 0}
m_Center: {x: 343.5, y: 0, z: 0}
m_Size: {x: 685, y: 88, z: 0}
m_Center: {x: 342.5, y: 0, z: 0}
--- !u!114 &8808049470203926867
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -1523,7 +1523,7 @@ MonoBehaviour:
updateAnchors: 0
mColor: {r: 0.95686275, g: 0.95686275, b: 0.95686275, a: 1}
mPivot: 3
mWidth: 687
mWidth: 685
mHeight: 88
mDepth: 6
autoResizeBoxCollider: 1
@@ -1555,6 +1555,7 @@ GameObject:
m_Component:
- component: {fileID: 3835798372870929167}
- component: {fileID: 3835798372870929164}
- component: {fileID: 6542442551606783541}
m_Layer: 5
m_Name: SpriteBg
m_TagString: Untagged
@@ -1607,13 +1608,13 @@ MonoBehaviour:
updateAnchors: 0
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 1
mWidth: 1127
mWidth: 1125
mHeight: 132
mDepth: 0
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 8.537879
aspectRatio: 8.522727
mType: 1
mFillDirection: 4
mFillAmount: 1
@@ -1629,6 +1630,21 @@ MonoBehaviour:
mSpriteName: cust_border
mFillCenter: 1
isGrayMode: 0
--- !u!114 &6542442551606783541
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3835798372870929166}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3}
m_Name:
m_EditorClassIdentifier:
widget: {fileID: 3835798372870929164}
offset: 0
sizeAdjust: 1
--- !u!1 &3835798373825950493
GameObject:
m_ObjectHideFlags: 0
@@ -1756,7 +1772,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3835798374104603644}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 447, y: -203, z: 0}
m_LocalPosition: {x: 446, y: -203, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 3835798373825950482}

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

File diff suppressed because it is too large Load Diff

45
Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelResetPasswordStep1.prefab
View File

@@ -174,7 +174,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1784228724026676672}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -439, y: 0, z: 0}
m_LocalPosition: {x: -460, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 3798672265178040260}
@@ -260,7 +260,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2691153983406664913}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 462, y: 0, z: 0}
m_LocalPosition: {x: 482, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 3798672265178040260}
@@ -277,7 +277,7 @@ BoxCollider:
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 80, y: 80, z: 0}
m_Size: {x: 100, y: 100, z: 0}
m_Center: {x: -20, y: 0, z: 0}
--- !u!114 &9064726627313867737
MonoBehaviour:
@@ -438,7 +438,7 @@ MonoBehaviour:
anchorOffset: 0
softBorderPadding: 1
renderQueue: 0
startingRenderQueue: 3002
startingRenderQueue: 3000
mClipTexture: {fileID: 0}
mAlpha: 1
mClipping: 0
@@ -691,7 +691,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7835803922911141286}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -387, y: 0, z: 0}
m_LocalPosition: {x: -407, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 3798672265178040260}
@@ -726,7 +726,7 @@ MonoBehaviour:
relative: 0.5
absolute: 18
updateAnchors: 0
mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
mColor: {r: 0.8, g: 0.8, b: 0.8, a: 1}
mPivot: 3
mWidth: 288
mHeight: 48
@@ -779,6 +779,7 @@ GameObject:
- component: {fileID: 4632458405731700042}
- component: {fileID: 613210021003175129}
- component: {fileID: 6515715913109646387}
- component: {fileID: 5863315751847802361}
m_Layer: 5
m_Name: InputPhoneNum
m_TagString: Untagged
@@ -794,7 +795,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7915883322358524394}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 865, z: 0}
m_LocalPosition: {x: 0, y: 855, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 8565687222082515275}
@@ -815,7 +816,7 @@ BoxCollider:
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 984, y: 140, z: 0}
m_Size: {x: 1025, y: 160, z: 0}
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &4632458405731700042
MonoBehaviour:
@@ -875,21 +876,21 @@ MonoBehaviour:
bottomAnchor:
target: {fileID: 4251711415222802831}
relative: 1
absolute: -357
absolute: -377
topAnchor:
target: {fileID: 4251711415222802831}
relative: 1
absolute: -217
updateAnchors: 0
mColor: {r: 0.95686275, g: 0.95686275, b: 0.95686275, a: 1}
mColor: {r: 1, g: 0.995283, b: 0.995283, a: 1}
mPivot: 4
mWidth: 984
mHeight: 140
mWidth: 1025
mHeight: 160
mDepth: 1
autoResizeBoxCollider: 0
autoResizeBoxCollider: 1
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 7.0285716
aspectRatio: 24.404762
mType: 1
mFillDirection: 4
mFillAmount: 1
@@ -927,7 +928,23 @@ MonoBehaviour:
maxLen: 0
spriteBg: {fileID: 0}
valueIsNumber: 0
isPhoneNum: 0
inValidColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
--- !u!114 &5863315751847802361
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7915883322358524394}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3}
m_Name:
m_EditorClassIdentifier:
widget: {fileID: 613210021003175129}
offset: 50
sizeAdjust: 1
--- !u!1 &8720512072303347033
GameObject:
m_ObjectHideFlags: 0

43
Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelResetPasswordStep2.prefab
View File

@@ -174,7 +174,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2185234361616187693}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -439, y: 0, z: 0}
m_LocalPosition: {x: -460, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 3613788834114048809}
@@ -381,7 +381,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4234450897637787428}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 462, y: 0, z: 0}
m_LocalPosition: {x: 482, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 3613788834114048809}
@@ -418,7 +418,7 @@ MonoBehaviour:
updateAnchors: 0
mColor: {r: 0.29803923, g: 0.29803923, b: 0.29803923, a: 1}
mPivot: 5
mWidth: 288
mWidth: 280
mHeight: 48
mDepth: 2
autoResizeBoxCollider: 0
@@ -558,7 +558,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7651342702076741963}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -387, y: 0, z: 0}
m_LocalPosition: {x: -407, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 3613788834114048809}
@@ -593,7 +593,7 @@ MonoBehaviour:
relative: 0.5
absolute: 18
updateAnchors: 0
mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
mColor: {r: 0.8, g: 0.8, b: 0.8, a: 1}
mPivot: 3
mWidth: 384
mHeight: 48
@@ -795,6 +795,7 @@ GameObject:
- component: {fileID: 5104994969091692967}
- component: {fileID: 1014390474836701236}
- component: {fileID: 8462743950832187672}
- component: {fileID: 2090372610755836664}
m_Layer: 5
m_Name: InputCode
m_TagString: Untagged
@@ -810,7 +811,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7731418809502448903}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 865, z: 0}
m_LocalPosition: {x: 0, y: 855, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 8092465665142711718}
@@ -831,7 +832,7 @@ BoxCollider:
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 984, y: 140, z: 0}
m_Size: {x: 1025, y: 160, z: 0}
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &5104994969091692967
MonoBehaviour:
@@ -891,21 +892,21 @@ MonoBehaviour:
bottomAnchor:
target: {fileID: 4436120956508884322}
relative: 1
absolute: -357
absolute: -377
topAnchor:
target: {fileID: 4436120956508884322}
relative: 1
absolute: -217
updateAnchors: 0
mColor: {r: 0.95686275, g: 0.95686275, b: 0.95686275, a: 1}
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4
mWidth: 984
mHeight: 140
mWidth: 1025
mHeight: 160
mDepth: 1
autoResizeBoxCollider: 0
autoResizeBoxCollider: 1
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 7.0285716
aspectRatio: 6.40625
mType: 1
mFillDirection: 4
mFillAmount: 1
@@ -943,7 +944,23 @@ MonoBehaviour:
maxLen: 0
spriteBg: {fileID: 0}
valueIsNumber: 0
isPhoneNum: 0
inValidColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
--- !u!114 &2090372610755836664
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7731418809502448903}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3}
m_Name:
m_EditorClassIdentifier:
widget: {fileID: 1014390474836701236}
offset: 50
sizeAdjust: 1
--- !u!1 &9193010148662137268
GameObject:
m_ObjectHideFlags: 0

43
Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelResetPasswordStep3.prefab
View File

@@ -25,7 +25,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1702322128475765493}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -439, y: 0, z: 0}
m_LocalPosition: {x: -460, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4317437097434540273}
@@ -260,7 +260,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3028072808294499300}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 462, y: 0, z: 0}
m_LocalPosition: {x: 482, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4317437097434540273}
@@ -277,7 +277,7 @@ BoxCollider:
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 80, y: 80, z: 0}
m_Size: {x: 100, y: 100, z: 0}
m_Center: {x: -20, y: 0, z: 0}
--- !u!114 &8255492506430239980
MonoBehaviour:
@@ -438,7 +438,7 @@ MonoBehaviour:
anchorOffset: 0
softBorderPadding: 1
renderQueue: 0
startingRenderQueue: 3002
startingRenderQueue: 3000
mClipTexture: {fileID: 0}
mAlpha: 1
mClipping: 0
@@ -500,6 +500,7 @@ GameObject:
- component: {fileID: 5698401558112510591}
- component: {fileID: 567322871121546220}
- component: {fileID: 9222845616595910156}
- component: {fileID: 1896688811287131012}
m_Layer: 5
m_Name: InputPassword
m_TagString: Untagged
@@ -515,7 +516,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7099884782718502623}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 865, z: 0}
m_LocalPosition: {x: 0, y: 855, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 8755676364694724222}
@@ -596,21 +597,21 @@ MonoBehaviour:
bottomAnchor:
target: {fileID: 3772920720035231418}
relative: 1
absolute: -357
absolute: -377
topAnchor:
target: {fileID: 3772920720035231418}
relative: 1
absolute: -217
updateAnchors: 0
mColor: {r: 0.95686275, g: 0.95686275, b: 0.95686275, a: 1}
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4
mWidth: 984
mHeight: 140
mWidth: 1025
mHeight: 160
mDepth: 1
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 23.428572
aspectRatio: 6.40625
mType: 1
mFillDirection: 4
mFillAmount: 1
@@ -648,7 +649,23 @@ MonoBehaviour:
maxLen: 0
spriteBg: {fileID: 0}
valueIsNumber: 0
isPhoneNum: 0
inValidColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
--- !u!114 &1896688811287131012
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7099884782718502623}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3}
m_Name:
m_EditorClassIdentifier:
widget: {fileID: 567322871121546220}
offset: 50
sizeAdjust: 1
--- !u!1 &7147556079211837258
GameObject:
m_ObjectHideFlags: 0
@@ -823,7 +840,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7197693662275711635}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -387, y: 0, z: 0}
m_LocalPosition: {x: -407, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4317437097434540273}
@@ -858,7 +875,7 @@ MonoBehaviour:
relative: 0.5
absolute: 18
updateAnchors: 0
mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
mColor: {r: 0.8, g: 0.8, b: 0.8, a: 1}
mPivot: 3
mWidth: 288
mHeight: 48
@@ -866,7 +883,7 @@ MonoBehaviour:
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 5
aspectRatio: 6
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 0}
mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}

2525
Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSetting.prefab
View File

File diff suppressed because it is too large Load Diff

BIN
Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBUser.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/CSPMine.lua
View File

Binary file not shown.

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

Binary file not shown.

BIN
Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPConfirm2.lua Normal file
View File

Binary file not shown.

7
Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPConfirm2.lua.meta Normal file
View File

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

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

7
Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSetting.lua.meta Normal file
View File

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

BIN
Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/AlertRoot.unity3d
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

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

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

Binary file not shown.

BIN
Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustFilter.unity3d
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/PanelMain.unity3d
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSetting.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,401cfac0e828e59143af1070a54c58d28 %trCRM/resVer/Android/VerCtl/other.ver8,a7d44349d0c8b0411713c8c78a36968e
r8 (trCRM/resVer/Android/VerCtl/priority.ver8,7abdb8203bc9be90f286f03beb0b708b8 %trCRM/resVer/Android/VerCtl/other.ver8,d79a3c0aefbd22f12dc67098634519d6

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.