This commit is contained in:
2020-07-15 23:35:13 +08:00
parent 2092e4ef94
commit 17d9f47d49
27 changed files with 790 additions and 767 deletions

View File

@@ -32,7 +32,7 @@ CLLMainLua.init = function()
-- 日志logveiw
if ReporterMessageReceiver.self ~= nil then
ReporterMessageReceiver.self.gameObject:SetActive(true)
ReporterMessageReceiver.self.luaPath = "trCrm/upgradeRes/priority/lua/toolkit/KKLogListener.lua"
ReporterMessageReceiver.self.luaPath = "trCRM/upgradeRes/priority/lua/toolkit/KKLogListener.lua"
ReporterMessageReceiver.self:setLua()
end
-- 设置显示状态栏
@@ -43,7 +43,7 @@ CLLMainLua.init = function()
-- AndroidStatusBar.setFlags(AndroidStatusBar.WINDOW_FLAG_FORCE_NOT_FULLSCREEN)
-- CS.ApplicationChrome.statusBarState = CS.ApplicationChrome.States.Visible
-- CS.ApplicationChrome.dimmed = false
CS.ApplicationChrome.setSoftInputMode(CS.ApplicationChrome.ADJUST_PAN);
CS.ApplicationChrome.setSoftInputMode(CS.ApplicationChrome.ADJUST_RESIZE);
--设置帧率
Application.targetFrameRate = 10

View File

@@ -53,13 +53,13 @@ MyUtl.callCust = function(cust)
if attr.attrType == DBCust.FieldType.phone then
local phNo = cust.jsonStr[joinStr(attr.id, "_", attr.attrName)]
if not isNilOrEmpty(phNo) then
phones:Add(joinStr(attr.attrName, ": ", phNo))
phones:Add(joinStr(attr.attrName, ": ", MyUtl.hidePhone(phNo)))
phonesVal:Add(phNo)
end
end
end
if phones.Count > 0 then
phones:Insert(0, joinStr("默认: ", cust.phoneNo))
phones:Insert(0, joinStr("默认: ", MyUtl.hidePhone(cust.phoneNo)))
phonesVal:Insert(0, cust.phoneNo)
CLUIPopListPanel.show(
phones,

View File

@@ -207,7 +207,7 @@ function TRPNewCust:setElementMode(el)
local boxcollider = el:GetComponent("BoxCollider")
local ButtonReset = getCC(el.transform, "ButtonReset", "MyInputReset")
if (not self.isNewCust) and (el.jsonKey == "taskId" or el.jsonKey == "phoneNo") then
if (not self.isNewCust) and (el.jsonKey == "taskId" or el.jsonKey == "_phoneNo") then
boxcollider.enabled = false
else
boxcollider.enabled = true

View File

@@ -329,7 +329,7 @@ function TRPNewOrder:setElementMode(el)
ButtonReset.disabled = (not self.isNewOrder)
end
if el.jsonKey == "taskId" or el.jsonKey == "phoneNo" then
if el.jsonKey == "taskId" or el.jsonKey == "_phoneNo" then
boxcollider.enabled = false
if ButtonReset then
ButtonReset.disabled = true

View File

@@ -296,7 +296,7 @@ MonoBehaviour:
updateAnchors: 0
mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1}
mPivot: 3
mWidth: 230
mWidth: 270
mHeight: 46
mDepth: 2
autoResizeBoxCollider: 0
@@ -636,7 +636,7 @@ MonoBehaviour:
anchorOffset: 0
softBorderPadding: 1
renderQueue: 0
startingRenderQueue: 3000
startingRenderQueue: 3004
mClipTexture: {fileID: 0}
mAlpha: 1
mClipping: 0
@@ -1310,7 +1310,7 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1}
mPivot: 4
mWidth: 106
mWidth: 114
mHeight: 30
mDepth: 6
autoResizeBoxCollider: 0
@@ -1785,6 +1785,7 @@ GameObject:
m_Component:
- component: {fileID: 5299475966247548410}
- component: {fileID: 4341456103792157616}
- component: {fileID: 1631128404000565697}
m_Layer: 5
m_Name: SpriteBg
m_TagString: Untagged
@@ -1840,10 +1841,10 @@ MonoBehaviour:
mWidth: 1025
mHeight: 600
mDepth: 0
autoResizeBoxCollider: 0
autoResizeBoxCollider: 1
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 4.9533334
aspectRatio: 1.7083334
mType: 1
mFillDirection: 4
mFillAmount: 1
@@ -1859,6 +1860,19 @@ MonoBehaviour:
mSpriteName: work_work_bg_noshadow
mFillCenter: 1
isGrayMode: 0
--- !u!65 &1631128404000565697
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7840171909153566017}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1025, y: 600, z: 0}
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &8195777696415727407
GameObject:
m_ObjectHideFlags: 0
@@ -1922,7 +1936,7 @@ MonoBehaviour:
updateAnchors: 0
mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1}
mPivot: 5
mWidth: 230
mWidth: 270
mHeight: 46
mDepth: 2
autoResizeBoxCollider: 0