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

android

Browse Source
This commit is contained in:
陈彬
2020-07-16 23:44:17 +08:00
parent 4221cf486c
commit 262987fdaa
24 changed files with 743 additions and 744 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Assets/trCRM/upgradeRes4Dev/priority/lua/CLLMainLua.lua
View File

@@ -69,12 +69,11 @@ CLLMainLua.init = function()
end
function CLLMainLua.setAndroidStatusBar()
printe(SystemInfo.deviceName, "====", SystemInfo.deviceModel)
if CLPathCfg.self.platform ~= "Android" then
return
end
local mode = SystemInfo.deviceModel
if string.find(mode, "huawei") then
local mode = string.upper( SystemInfo.deviceModel)
if string.find(mode, "HUAWEI") then
AndroidStatusBar.setFlags(AndroidStatusBar.WINDOW_FLAG_FORCE_NOT_FULLSCREEN)
AndroidStatusBar.setColor(AndroidStatusBar.DEFAULT_BACKGROUND_COLOR)
else

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

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

2
Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelLogin.prefab
View File

@@ -840,7 +840,7 @@ MonoBehaviour:
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: 0
skipColorEffect: 1
dragHighlight: 0
hoverSprite:
pressedSprite:

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

@@ -26,7 +26,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2039622863}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -1, y: 0, z: 0}
m_LocalPosition: {x: -1, y: -597, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2079010362}
@@ -62,14 +62,14 @@ MonoBehaviour:
absolute: 0
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 1
mPivot: 7
mWidth: 1129
mHeight: 720
mHeight: 900
mDepth: 0
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 1.5680555
aspectRatio: 1.2544445
mType: 4
mFillDirection: 4
mFillAmount: 1
@@ -421,7 +421,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 428542163589643225}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -414, y: -312, z: 0}
m_LocalPosition: {x: -414, y: -180, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 8257572729724756153}
@@ -1338,7 +1338,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1606320567603967605}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -1, y: -492, z: 0}
m_LocalPosition: {x: -1, y: -360, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2079010362}
@@ -1423,7 +1423,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1776223273951753645}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -271, y: -273, z: 0}
m_LocalPosition: {x: -271, y: -151, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2079010362}
@@ -1832,7 +1832,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2627781041010536112}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 406, y: -304, z: 0}
m_LocalPosition: {x: 406, y: -182, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 3138439517586622980}
@@ -2735,7 +2735,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4359412390550565533}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -572, z: 0}
m_LocalPosition: {x: 0, y: -440, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 6633121965301904038}
@@ -2776,7 +2776,7 @@ MonoBehaviour:
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 1
mWidth: 100
mHeight: 8
mHeight: 1998
mDepth: 0
autoResizeBoxCollider: 0
hideIfOffScreen: 0
@@ -5668,7 +5668,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8373088910775864060}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -271, y: -366, z: 0}
m_LocalPosition: {x: -271, y: -244, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2079010362}
@@ -6297,7 +6297,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8955698659341431204}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -1, y: 10, z: 0}
m_LocalPosition: {x: -1, y: -212, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2972147043370464305}
@@ -6330,17 +6330,17 @@ MonoBehaviour:
topAnchor:
target: {fileID: 2972147043370464305}
relative: 1
absolute: -130
absolute: -574
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4
mWidth: 1125
mHeight: 2024
mHeight: 1580
mDepth: -1
autoResizeBoxCollider: 1
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 0.55583006
aspectRatio: 0.71247625
--- !u!65 &4584927893713608480
BoxCollider:
m_ObjectHideFlags: 0
@@ -6352,7 +6352,7 @@ BoxCollider:
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1125, y: 2024, z: 0}
m_Size: {x: 1125, y: 1580, z: 0}
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &9073211477204691680
MonoBehaviour: