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

upgrade

Browse Source
This commit is contained in:
陈彬
2021-03-31 22:22:59 +08:00
parent e913caa8f8
commit bf55cc7e54
41 changed files with 2182 additions and 1013 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBMessage.lua
View File

@@ -44,7 +44,8 @@ DBMessage.MsgType = {
SysNotice = 3, -- 系统通知
Task = 4,
Task4Cust = 5, -- 跟进客户
Task4Support = 6 -- 代办补货
Task4Support = 6, -- 代办补货
Timeout = 7 -- 到期提醒
}
DBMessage.ReadFlag = {
@@ -95,6 +96,7 @@ DBMessage.onGetMessage = function(type, list, meta)
end
---@param v _DBMessage
for i, v in ipairs(list) do
v.NOTICETYPE = type
table.insert(db.list[type], v) -- 倒序
end
-- //TODO:保存到本地
@@ -155,6 +157,14 @@ function DBMessage.getUnreadNum(type)
count = count + 1
end
end
elseif type == DBMessage.MsgType.Timeout then
local list = DBMessage.getMessages(DBMessage.MsgType.Timeout)
---@param v
for i, v in ipairs(list) do
if v.ReadFlag == DBMessage.ReadFlag.unread then
count = count + 1
end
end
end
return count

3
Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBRoot.lua
View File

@@ -33,6 +33,9 @@ DBRoot.funcs = {
[NetProto.cmds.replenish_query] = function(data) -- 待跟进客户
DBMessage.onGetMessage(DBMessage.MsgType.Task4Support, data.result.data)
end,
[NetProto.cmds.wforder_expiry_reminder] = function(data) -- 到期提醒
DBMessage.onGetMessage(DBMessage.MsgType.Timeout, data.result.data)
end,
[NetProto.cmds.filter_customers] = function(data) -- 过滤条件
DBCust.onGetFilter(data.result)
end,

11
Assets/trCRM/upgradeRes4Dev/priority/lua/net/NetProto.lua
View File

@@ -20,7 +20,7 @@ NetProto.setSever = function(_host, _port)
socketUrl = joinStr("ws://", host, ":", port, "/tr_socket/websocket/")
end
NetProto.isDebug = false
NetProto.isDebug = true
---@type Dist.SpringWebsocket.Client
local socket = Client4Stomp.self
@@ -276,6 +276,7 @@ NetProto.cmds = {
announcement_query = "announcement_query", -- 系统公告
booking_query = "booking_query", -- 待跟进客户
replenish_query = "replenish_query", -- 待补货
wforder_expiry_reminder = "wforder_expiry_reminder", -- 到期提醒
filter_customers = "filter_customers", -- 过滤条件
list_customers = "list_customers", -- 客户列表
person_view_query = "person_view_query", -- 头像
@@ -489,6 +490,14 @@ NetProto.send.booking_query = function(callback, timeOutSec)
NetProto.sendSocket(content, callback, timeOutSec)
end
---public 到期提醒
NetProto.send.wforder_expiry_reminder = function(callback, timeOutSec)
local content = {}
content.action = NetProto.cmds.wforder_expiry_reminder
content.groupId = NetProto.groupId
NetProto.sendSocket(content, callback, timeOutSec)
end
---public 待补货
NetProto.send.replenish_query = function(callback, timeOutSec)
local content = {}

9
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellMessageGroup.lua
View File

@@ -42,6 +42,15 @@ function _cell.show(go, data)
else
uiobjs.LabelTime.text = ""
end
elseif mData.type == DBMessage.MsgType.Timeout then
---@type _DBMessage
local newestMsg = DBMessage.getNewestMessage(mData.type)
uiobjs.LabelNewest.text = newestMsg and newestMsg.content or ""
if newestMsg then
uiobjs.LabelTime.text = newestMsg.createTime
else
uiobjs.LabelTime.text = ""
end
elseif mData.type == DBMessage.MsgType.Task then
---@type _DBTaskCust
-- local newestMsg = DBMessage.getNewestMessage(mData.type)

2
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellReportform3.lua
View File

@@ -47,7 +47,7 @@ function _cell.show(go, data)
mData.gap = math.abs(mData.gap)
uiobjs.SpritePersent.fillAmount = mData.finishPersent / 100
mData.finishPersent = string.format("%.2f", mData.finishPersent)
uiobjs.formRoot:setValue(mData)
end
end,

12
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellSysMessageList.lua
View File

@@ -24,14 +24,18 @@ function _cell.show(go, data)
mData = data
uiobjs.LabelStatus.text = mData.READFLAG == DBMessage.ReadFlag.unread and "未读" or "已读"
SetActive(uiobjs.SpriteReddot.gameObject, mData.READFLAG == DBMessage.ReadFlag.unread)
uiobjs.LabelTitle.text = mData.TITLE
local time = mData.CREATETIME
uiobjs.LabelTitle.text = mData.TITLE or mData.title
local time = mData.CREATETIME or mData.createTime
if time then
uiobjs.LabelTime.text = DateEx.formatByMs(time * 1000)
if(type(time) == "string") then
uiobjs.LabelTime.text = time
else
uiobjs.LabelTime.text = DateEx.formatByMs(time * 1000)
end
else
uiobjs.LabelTime.text = ""
end
uiobjs.LabelContent.text = mData.CONTENT
uiobjs.LabelContent.text = mData.CONTENT or mData.content
end
-- 取得数据

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

@@ -54,7 +54,7 @@ function CLLPStart.setLuasAtBegainning()
ReporterMessageReceiver.self.gameObject:SetActive(true)
end
else
NetProto.isDebug = false
NetProto.isDebug = false or CLCfgBase.self.isEditMode
if ReporterMessageReceiver.self and ReporterMessageReceiver.self.gameObject then
ReporterMessageReceiver.self.gameObject:SetActive(false)
end

3
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPMsg.lua
View File

@@ -10,7 +10,8 @@ local isShowdDragFrefresh = false
local dragVal = Vector3.zero
local objs = {}
local defaulList = {
{icon = "news_news_1", bgColor = 0xfff1c40f, type = DBMessage.MsgType.Sys, name = "公告"}
{icon = "news_news_1", bgColor = 0xfff1c40f, type = DBMessage.MsgType.Sys, name = "公告"},
{icon = "news_news_1", bgColor = 0xff2990dc, type = DBMessage.MsgType.Timeout, name = "到期提醒"}
-- {icon="news_news_2", bgColor=0xff2990dc,type=DBMessage.MsgType.SysNotice, name="系统消息"},
-- {icon="news_news_3", bgColor=0xff1abc9c,type=DBMessage.MsgType.Task, name="待办任务"},
}

1
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPConnect.lua
View File

@@ -85,6 +85,7 @@ function TRPConnect.getDataFromServer()
5
)
NetProto.send.announcement_query()
NetProto.send.wforder_expiry_reminder()
NetProto.send.booking_query()
NetProto.send.replenish_query()
NetProto.send.load_wfTicket_Settings()

64
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPEditPrice.lua
View File

@@ -10,9 +10,16 @@ function TRPEditPrice:init(csObj)
TRPEditPrice.super.init(self, csObj)
self:setEventDelegate()
---@type UITable
uiobjs.Table = getCC(self.csSelf.transform, "Table", "UITable")
---@type CLUIFormRoot
uiobjs.formRoot = self.csSelf:GetComponent("CLUIFormRoot")
uiobjs.formRoot = uiobjs.Table.gameObject:GetComponent("CLUIFormRoot")
---@type CLUIElement
uiobjs.InputNum = getCC(uiobjs.formRoot.transform, "InputNum", "CLUIElement")
---@type CLUIElement
uiobjs.InputStartTime = getCC(uiobjs.formRoot.transform, "InputStartTime", "CLUIElement")
---@type CLUIElement
uiobjs.InputEndTime = getCC(uiobjs.formRoot.transform, "InputEndTime", "CLUIElement")
end
-- 设置数据
@@ -25,6 +32,47 @@ end
-- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh
function TRPEditPrice:show()
uiobjs.formRoot:setValue(self.mdata)
-- 产品属性:1-服务类产品，0/null为实物类产品
if (not isNilOrEmpty(self.mdata.productAttribute)) and tonumber(self.mdata.productAttribute) == 1 then
SetActive(uiobjs.InputStartTime.gameObject, true)
SetActive(uiobjs.InputEndTime.gameObject, true)
uiobjs.InputStartTime.value = self.mdata.validStartTime or DateEx.format(DateEx.fmt_yyyy_MM_dd)
self:calculateEndDate(uiobjs.InputStartTime.value)
else
SetActive(uiobjs.InputStartTime.gameObject, false)
SetActive(uiobjs.InputEndTime.gameObject, false)
end
uiobjs.Table:Reposition()
end
function TRPEditPrice:calculateEndDate(startDate)
if not uiobjs.InputEndTime.gameObject.activeInHierarchy then
return
end
local begain = DateTime.Now
if not isNilOrEmpty(startDate) then
local days = strSplit(startDate, "-")
begain = DateTime(tonumber(days[1]), tonumber(days[2]), tonumber(days[3]))
end
local enddate
local num = tonumber(uiobjs.InputNum.value) or 1
--服务产品消耗时间类型，默认：NULL；0：按日，1：按月，2：按季度，3：按年
if not isNilOrEmpty(self.mdata.productComsuingType) then
local productComsuingType = tonumber(self.mdata.productComsuingType)
if productComsuingType == 0 then
enddate = begain:AddDays(num)
elseif productComsuingType == 1 then
enddate = begain:AddMonths(num)
elseif productComsuingType == 2 then
enddate = begain:AddMonths(num * 3)
elseif productComsuingType == 3 then
enddate = begain:AddYears(num)
else
return ""
end
uiobjs.InputEndTime.value = enddate:ToString(DateEx.fmt_yyyy_MM_dd)
end
return ""
end
-- 刷新
@@ -57,7 +105,19 @@ function TRPEditPrice:setEventDelegate()
MyUtl.toastW("数量不能低于1")
return
end
if (not isNilOrEmpty(self.mdata.productAttribute)) and tonumber(self.mdata.productAttribute) == 1 then
if isNilOrEmpty(uiobjs.InputStartTime.value) then
MyUtl.toastW("请设置开始日期")
return
end
end
Utl.doCallback(callback, self.mdata)
end,
InputNum = function()
self:calculateEndDate(uiobjs.InputStartTime.value)
end,
InputStartTime = function()
self:calculateEndDate(uiobjs.InputStartTime.value)
end
}
end

28
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSelectProduct.lua
View File

@@ -90,6 +90,10 @@ function TRPSelectProduct:getSelected()
if d.isSelected then
d.data.productNum = d.data.productNum or 1
d.data.productPrice = d.data.price
if (not isNilOrEmpty(d.data.productAttribute)) and tonumber(d.data.productAttribute) == 1 then
d.data.validStartTime = DateEx.format(DateEx.fmt_yyyy_MM_dd)
d.data.validEndTime = self:calculateEndDate(d.data)
end
table.insert(list, d.data)
end
end
@@ -97,6 +101,30 @@ function TRPSelectProduct:getSelected()
return list
end
function TRPSelectProduct:calculateEndDate(data)
local days = strSplit(data.validStartTime, "-")
local begain = DateTime(tonumber(days[1]), tonumber(days[2]), tonumber(days[3]))
local enddate
local num = data.productNum or 1
--服务产品消耗时间类型，默认：NULL；0：按日，1：按月，2：按季度，3：按年
if not isNilOrEmpty(data.productComsuingType) then
local productComsuingType = tonumber(data.productComsuingType)
if productComsuingType == 0 then
enddate = begain:AddDays(num)
elseif productComsuingType == 1 then
enddate = begain:AddMonths(num)
elseif productComsuingType == 2 then
enddate = begain:AddMonths(num * 3)
elseif productComsuingType == 3 then
enddate = begain:AddYears(num)
else
return ""
end
return enddate:ToString(DateEx.fmt_yyyy_MM_dd)
end
return ""
end
-- 刷新
function TRPSelectProduct:refresh()
end

16
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSysMsgDetail.lua
View File

@@ -40,9 +40,19 @@ function TRPSysMsgDetail:onShowFrame(cs)
end
-- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh
function TRPSysMsgDetail:show()
self.uiobjs.LabelContent.text = joinStr("　", self.mdata.CONTENT)
self.uiobjs.LabelTime.text = self.mdata.CREATETIME and DateEx.formatByMs(tonumber(self.mdata.CREATETIME) * 1000) or ""
self.uiobjs.LabelTitle.text = self.mdata.TITLE
self.uiobjs.LabelContent.text = joinStr("　", self.mdata.CONTENT or self.mdata.content)
local time = self.mdata.CREATETIME or self.mdata.createTime
if time then
if(type(time) == "string") then
self.uiobjs.LabelTime.text = time
else
self.uiobjs.LabelTime.text = DateEx.formatByMs(time * 1000)
end
else
self.uiobjs.LabelTime.text = ""
end
self.uiobjs.LabelTitle.text = self.mdata.TITLE or self.mdata.title
self.uiobjs.scrollView:ResetPosition()
end

5
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSysMsgList.lua
View File

@@ -35,6 +35,8 @@ function TRPSysMsgList:onShowFrame(cs)
d.title = "公告"
elseif self.mdata.type == DBMessage.MsgType.Task then
d.title = "代办任务"
elseif self.mdata.type == DBMessage.MsgType.Timeout then
d.title = "到期提醒"
end
d.panel = cs
@@ -106,7 +108,10 @@ function TRPSysMsgList:onClickCell(cell, data)
getPanelAsy("PanelSysMsgDetail", onLoadedPanelTT, data)
elseif data.NOTICETYPE == DBMessage.MsgType.Task4Cust then
getPanelAsy("PanelCustListProc", onLoadedPanelTT, data)
elseif data.NOTICETYPE == DBMessage.MsgType.Timeout then
getPanelAsy("PanelSysMsgDetail", onLoadedPanelTT, data)
else
printw("没有处理该消息类型", data.NOTICETYPE)
end
end

906
Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelEditPrice.prefab
View File

File diff suppressed because it is too large Load Diff

333
Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewOrder.prefab
View File

@@ -280,7 +280,7 @@ MonoBehaviour:
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 0.04347826
aspectRatio: 4
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 0}
mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -626,6 +626,132 @@ MonoBehaviour:
m_EditorClassIdentifier:
scrollView: {fileID: 0}
draggablePanel: {fileID: 0}
--- !u!1 &788433213007036848
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4537950500870522849}
- component: {fileID: 9141256182201856122}
- component: {fileID: 6496410008280496209}
m_Layer: 5
m_Name: LabelEndDate
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4537950500870522849
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 788433213007036848}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 104, y: -89, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 487038160484443481}
m_Father: {fileID: 1249610349479200778}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &9141256182201856122
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 788433213007036848}
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: 169
rightAnchor:
target: {fileID: 0}
relative: 1
absolute: 253
bottomAnchor:
target: {fileID: 0}
relative: 0
absolute: 0
topAnchor:
target: {fileID: 0}
relative: 1
absolute: 0
updateAnchors: 0
mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1}
mPivot: 4
mWidth: 236
mHeight: 40
mDepth: 7
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 59
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 0}
mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
mText: 2020-12-12
mFontSize: 40
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: 3
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!114 &6496410008280496209
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 788433213007036848}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3}
m_Name:
m_EditorClassIdentifier:
jsonKey: validEndTime
formatValue:
labeName: {fileID: 0}
defaultName:
canNull: 0
checkIDCard: 0
minLen: 0
maxLen: 0
spriteBg: {fileID: 0}
valueIsNumber: 0
isPhoneNum: 0
inValidColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
--- !u!1 &934217476452900769
GameObject:
m_ObjectHideFlags: 0
@@ -650,12 +776,12 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 934217476452900769}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -301, y: 0, z: 0}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0, y: 89, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1249610349479200778}
m_RootOrder: 4
m_Father: {fileID: 2058935815621498124}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1162926142170418264
MonoBehaviour:
@@ -670,12 +796,12 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
leftAnchor:
target: {fileID: 9060292173203855846}
target: {fileID: 0}
relative: 0
absolute: 169
rightAnchor:
target: {fileID: 9060292173203855846}
relative: 0
target: {fileID: 0}
relative: 1
absolute: 253
bottomAnchor:
target: {fileID: 0}
@@ -750,12 +876,12 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1246448268994330712}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 355, y: 0, z: 0}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 89, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1249610349479200778}
m_RootOrder: 5
m_Father: {fileID: 1930179077374056429}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &2404477135426433860
MonoBehaviour:
@@ -894,7 +1020,7 @@ MonoBehaviour:
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 0.04347826
aspectRatio: 4
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 0}
mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -1068,12 +1194,12 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1745755567360417693}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: 0, y: 15, z: 0}
m_LocalScale: {x: 0.7, y: 0.7, z: 1}
m_Children:
- {fileID: 5633492893922182200}
m_Father: {fileID: 1249610349479200778}
m_RootOrder: 9
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1747138548909843324
GameObject:
@@ -1386,11 +1512,12 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1756049166721528722}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -89, z: 0}
m_LocalPosition: {x: -191, y: -89, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Children:
- {fileID: 5445764659556725222}
m_Father: {fileID: 1249610349479200778}
m_RootOrder: 6
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &5731697688251608301
MonoBehaviour:
@@ -1405,13 +1532,13 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
leftAnchor:
target: {fileID: 0}
target: {fileID: 9060292173203855846}
relative: 0
absolute: 0
absolute: 221
rightAnchor:
target: {fileID: 0}
relative: 1
absolute: 0
target: {fileID: 9060292173203855846}
relative: 0
absolute: 421
bottomAnchor:
target: {fileID: 0}
relative: 0
@@ -1895,12 +2022,12 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2312657503403256251}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -5, y: 89, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1249610349479200778}
m_RootOrder: 3
m_Father: {fileID: 1502935258626211947}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &4509601295992522724
MonoBehaviour:
@@ -1915,13 +2042,13 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
leftAnchor:
target: {fileID: 0}
target: {fileID: 9060292173203855846}
relative: 0
absolute: 0
absolute: 253
rightAnchor:
target: {fileID: 0}
relative: 1
absolute: 0
target: {fileID: 9060292173203855846}
relative: 0
absolute: 379
bottomAnchor:
target: {fileID: 0}
relative: 0
@@ -2007,13 +2134,11 @@ Transform:
- {fileID: 9060292173203855846}
- {fileID: 6550131546567880329}
- {fileID: 741768755136082855}
- {fileID: 5445764659556725222}
- {fileID: 5691811272550430638}
- {fileID: 5492273475069516787}
- {fileID: 1502935258626211947}
- {fileID: 2058935815621498124}
- {fileID: 1930179077374056429}
- {fileID: 6638322929124924262}
- {fileID: 4537950500870522849}
m_Father: {fileID: 6735670843721406284}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -2389,7 +2514,7 @@ MonoBehaviour:
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 250
aspectRatio: 512.5
mType: 1
mFillDirection: 4
mFillAmount: 1
@@ -2671,7 +2796,7 @@ MonoBehaviour:
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 0.04347826
aspectRatio: 2
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 0}
mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -3113,11 +3238,12 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3693886865786244243}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -301, y: -89, z: 0}
m_LocalPosition: {x: -406, y: -89, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Children:
- {fileID: 5691811272550430638}
m_Father: {fileID: 1249610349479200778}
m_RootOrder: 7
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1732784937487359550
MonoBehaviour:
@@ -3132,12 +3258,12 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
leftAnchor:
target: {fileID: 9060292173203855846}
target: {fileID: 0}
relative: 0
absolute: 169
rightAnchor:
target: {fileID: 9060292173203855846}
relative: 0
target: {fileID: 0}
relative: 1
absolute: 253
bottomAnchor:
target: {fileID: 0}
@@ -3156,7 +3282,7 @@ MonoBehaviour:
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 2
aspectRatio: 0.61904764
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 0}
mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -3386,6 +3512,106 @@ MonoBehaviour:
widget: {fileID: 3244412214061244712}
offset: 0
sizeAdjust: 1
--- !u!1 &3907389304989768835
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 487038160484443481}
- component: {fileID: 1969088802880039800}
m_Layer: 5
m_Name: Label
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &487038160484443481
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3907389304989768835}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 89, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4537950500870522849}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1969088802880039800
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3907389304989768835}
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: 169
rightAnchor:
target: {fileID: 0}
relative: 1
absolute: 253
bottomAnchor:
target: {fileID: 0}
relative: 0
absolute: 0
topAnchor:
target: {fileID: 0}
relative: 1
absolute: 0
updateAnchors: 0
mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
mPivot: 4
mWidth: 168
mHeight: 42
mDepth: 7
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 4
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 0}
mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
mText: "\u5230\u671F\u65E5\u671F"
mFontSize: 42
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: 2
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 &4147774519001480678
GameObject:
m_ObjectHideFlags: 0
@@ -3538,7 +3764,7 @@ MonoBehaviour:
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 0.04347826
aspectRatio: 2
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 0}
mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -3780,7 +4006,7 @@ MonoBehaviour:
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 0.04347826
aspectRatio: 0.47826087
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 0}
mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -3857,8 +4083,9 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1070758113057642923}
- {fileID: 5492273475069516787}
m_Father: {fileID: 1249610349479200778}
m_RootOrder: 8
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &2054639386129895517
BoxCollider:
@@ -4175,7 +4402,7 @@ MonoBehaviour:
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 250
aspectRatio: 512.5
mType: 1
mFillDirection: 4
mFillAmount: 1
@@ -4259,7 +4486,7 @@ MonoBehaviour:
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 0.04347826
aspectRatio: 4
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 0}
mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -4707,7 +4934,7 @@ MonoBehaviour:
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 0.04347826
aspectRatio: 0.47826087
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 0}
mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -4920,7 +5147,7 @@ MonoBehaviour:
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 0.04347826
aspectRatio: 2
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 0}
mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -5020,7 +5247,7 @@ MonoBehaviour:
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 250
aspectRatio: 512.5
mType: 1
mFillDirection: 4
mFillAmount: 1
@@ -5627,7 +5854,7 @@ MonoBehaviour:
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 0.3043478
aspectRatio: 6
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 0}
mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}