root
/
miduo_client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

【ID1007750】【优化】青龙秘宝优化 

(cherry picked from commit fdcf53d59dbce0d6c7045dbdc81200a3335ccee9)
dev_chengFeng
ZhangBiao 2021-01-05 15:24:16 +08:00
parent 8d5d222639
commit 8cdbef0e70
3 changed files with 245 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

258
Assets/ManagedResources/Prefabs/UI/Mission/MissionDailyPanel.prefab
View File

@ -3358,7 +3358,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 179.35, y: 4.4}
m_AnchoredPosition: {x: 179.35, y: 45}
m_SizeDelta: {x: 459.73, y: 37.1}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1585392737490570275
@ -3990,6 +3990,7 @@ RectTransform:
- {fileID: 468007378357944310}
- {fileID: 3161722440037881863}
- {fileID: 1918779213491360749}
- {fileID: 6308792196721832769}
m_Father: {fileID: 1918779212796953291}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -4391,7 +4392,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 5.800003, y: 33.2}
m_AnchoredPosition: {x: 100, y: 30}
m_SizeDelta: {x: 135, y: 39.2}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &1918779212887373872
@ -4428,7 +4429,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.9921569, g: 0.95294124, b: 0.8588236, a: 1}
m_Color: {r: 0.3018868, g: 0.3018868, b: 0.3018868, a: 1}
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
@ -6669,6 +6670,80 @@ MonoBehaviour:
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: (7/7)
--- !u!1 &4404288836369700278
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5181635691542227884}
- component: {fileID: 8749812954885671800}
- component: {fileID: 2488837312827883247}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5181635691542227884
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4404288836369700278}
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: 6308792196721832769}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 90, y: 80}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8749812954885671800
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4404288836369700278}
m_CullTransparentMesh: 0
--- !u!114 &2488837312827883247
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4404288836369700278}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 84b137e960461f44082b1491d6ce5b7b, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &4461303524097314494
GameObject:
m_ObjectHideFlags: 0
@ -9698,7 +9773,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 28.300049, y: 41.399933}
m_AnchoredPosition: {x: 10, y: 41.399933}
m_SizeDelta: {x: 135, y: 100}
m_Pivot: {x: 0, y: 1}
--- !u!114 &327137578093138444
@ -10213,6 +10288,81 @@ RectTransform:
m_AnchoredPosition: {x: -6.7749977, y: 139}
m_SizeDelta: {x: 829.55, y: 224}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &7939776817122709162
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6308792196721832769}
- component: {fileID: 5180284198849497344}
- component: {fileID: 7991263298304875335}
m_Layer: 5
m_Name: mask
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &6308792196721832769
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7939776817122709162}
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:
- {fileID: 5181635691542227884}
m_Father: {fileID: 1918779212295282661}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 125, y: 125}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5180284198849497344
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7939776817122709162}
m_CullTransparentMesh: 0
--- !u!114 &7991263298304875335
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7939776817122709162}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 0.50980395}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &8000028089806339627
GameObject:
m_ObjectHideFlags: 0
@ -11966,16 +12116,6 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 224561372281646096}
m_Modifications:
- target: {fileID: 3774195657356619162, guid: 5daa3a0ddb216d14093aa7cd11574675,
type: 3}
propertyPath: m_Name
value: UI_Effect_BaoXiang_KeKaiQi
objectReference: {fileID: 0}
- target: {fileID: 3774195657356619162, guid: 5daa3a0ddb216d14093aa7cd11574675,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6473444402870397754, guid: 5daa3a0ddb216d14093aa7cd11574675,
type: 3}
propertyPath: m_LocalPosition.x
@ -12081,6 +12221,16 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 3774195657356619162, guid: 5daa3a0ddb216d14093aa7cd11574675,
type: 3}
propertyPath: m_Name
value: UI_Effect_BaoXiang_KeKaiQi
objectReference: {fileID: 0}
- target: {fileID: 3774195657356619162, guid: 5daa3a0ddb216d14093aa7cd11574675,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 5daa3a0ddb216d14093aa7cd11574675, type: 3}
--- !u!224 &4872209854286583787 stripped
@ -12371,16 +12521,6 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 224289953797446988}
m_Modifications:
- target: {fileID: 3774195657356619162, guid: 5daa3a0ddb216d14093aa7cd11574675,
type: 3}
propertyPath: m_Name
value: UI_Effect_BaoXiang_KeKaiQi
objectReference: {fileID: 0}
- target: {fileID: 3774195657356619162, guid: 5daa3a0ddb216d14093aa7cd11574675,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6473444402870397754, guid: 5daa3a0ddb216d14093aa7cd11574675,
type: 3}
propertyPath: m_LocalPosition.x
@ -12486,6 +12626,16 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 3774195657356619162, guid: 5daa3a0ddb216d14093aa7cd11574675,
type: 3}
propertyPath: m_Name
value: UI_Effect_BaoXiang_KeKaiQi
objectReference: {fileID: 0}
- target: {fileID: 3774195657356619162, guid: 5daa3a0ddb216d14093aa7cd11574675,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 5daa3a0ddb216d14093aa7cd11574675, type: 3}
--- !u!224 &2163867337063453488 stripped
@ -12631,16 +12781,6 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 224623299494557198}
m_Modifications:
- target: {fileID: 3774195657356619162, guid: 5daa3a0ddb216d14093aa7cd11574675,
type: 3}
propertyPath: m_Name
value: UI_Effect_BaoXiang_KeKaiQi
objectReference: {fileID: 0}
- target: {fileID: 3774195657356619162, guid: 5daa3a0ddb216d14093aa7cd11574675,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6473444402870397754, guid: 5daa3a0ddb216d14093aa7cd11574675,
type: 3}
propertyPath: m_LocalPosition.x
@ -12746,6 +12886,16 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 3774195657356619162, guid: 5daa3a0ddb216d14093aa7cd11574675,
type: 3}
propertyPath: m_Name
value: UI_Effect_BaoXiang_KeKaiQi
objectReference: {fileID: 0}
- target: {fileID: 3774195657356619162, guid: 5daa3a0ddb216d14093aa7cd11574675,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 5daa3a0ddb216d14093aa7cd11574675, type: 3}
--- !u!224 &1726775213066898649 stripped
@ -12906,16 +13056,6 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 1918779212270220639}
m_Modifications:
- target: {fileID: 3774195657356619162, guid: 5daa3a0ddb216d14093aa7cd11574675,
type: 3}
propertyPath: m_Name
value: UI_Effect_BaoXiang_KeKaiQi
objectReference: {fileID: 0}
- target: {fileID: 3774195657356619162, guid: 5daa3a0ddb216d14093aa7cd11574675,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6473444402870397754, guid: 5daa3a0ddb216d14093aa7cd11574675,
type: 3}
propertyPath: m_LocalPosition.x
@ -13036,6 +13176,16 @@ PrefabInstance:
propertyPath: m_LocalScale.z
value: 1.3
objectReference: {fileID: 0}
- target: {fileID: 3774195657356619162, guid: 5daa3a0ddb216d14093aa7cd11574675,
type: 3}
propertyPath: m_Name
value: UI_Effect_BaoXiang_KeKaiQi
objectReference: {fileID: 0}
- target: {fileID: 3774195657356619162, guid: 5daa3a0ddb216d14093aa7cd11574675,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 5daa3a0ddb216d14093aa7cd11574675, type: 3}
--- !u!224 &1005885811528912547 stripped
@ -13051,16 +13201,6 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 3893804749911227612}
m_Modifications:
- target: {fileID: 3774195657356619162, guid: 5daa3a0ddb216d14093aa7cd11574675,
type: 3}
propertyPath: m_Name
value: UI_Effect_BaoXiang_KeKaiQi
objectReference: {fileID: 0}
- target: {fileID: 3774195657356619162, guid: 5daa3a0ddb216d14093aa7cd11574675,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6473444402870397754, guid: 5daa3a0ddb216d14093aa7cd11574675,
type: 3}
propertyPath: m_LocalPosition.x
@ -13181,6 +13321,16 @@ PrefabInstance:
propertyPath: m_LocalScale.z
value: 1.3
objectReference: {fileID: 0}
- target: {fileID: 3774195657356619162, guid: 5daa3a0ddb216d14093aa7cd11574675,
type: 3}
propertyPath: m_Name
value: UI_Effect_BaoXiang_KeKaiQi
objectReference: {fileID: 0}
- target: {fileID: 3774195657356619162, guid: 5daa3a0ddb216d14093aa7cd11574675,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 5daa3a0ddb216d14093aa7cd11574675, type: 3}
--- !u!224 &1097062216341710278 stripped

56
Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua
View File

@ -8,6 +8,7 @@ local sortingOrder=0
local curScore = 0--当前分数
local treasureState = 0
local itemsList={}
local maskList={}
function this:InitComponent(gameObject)
--topBar/btnBack
this.gameObject = gameObject
@ -20,9 +21,9 @@ function this:InitComponent(gameObject)
this.buyBtnText = Util.GetGameObject(this.buyBtn, "Text"):GetComponent("Text")
this.jiesuoBtn = Util.GetGameObject(this.gameObject, "bg/topBar/button/jiesuoBtn")
this.jiesuoBtnText = Util.GetGameObject(this.jiesuoBtn, "Text"):GetComponent("Text")
this.lv = Util.GetGameObject(this.gameObject, "bg/topBar/Image/lv"):GetComponent("Text")
--Content
this.progress = Util.GetGameObject(this.gameObject, "bg/topBar/progress/Image"):GetComponent("Image")
this.scoreText = Util.GetGameObject(this.gameObject, "bg/topBar/progress/Text"):GetComponent("Text")
@ -38,7 +39,7 @@ function this:InitComponent(gameObject)
this.treasureList = Util.GetGameObject(this.gameObject, "bg/pageContent/treasureList")
local v2 = this.treasureList:GetComponent("RectTransform").sizeDelta
this.itemPre = Util.GetGameObject(this.treasureList, "itemPro")
--设置滚动条
this.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView,this.treasureList.transform,
this.itemPre,nil,Vector2.New(v2.x, v2.y),1,1,Vector2.New(100,3.5))
@ -72,7 +73,6 @@ end
this.Closefunction = function()
Timer.New(function()
if not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.TreasureOfSomeBody) then
LogBlue("1111111")
PopupTipPanel.ShowTip(Language[12320])
if parent then
parent:ClosePanel()
@ -111,6 +111,7 @@ function this:OnClose()
end
function this:OnDestroy()
itemsList={}
maskList={}
if self.timer then
self.timer :Stop()
self.timer = nil
@ -234,30 +235,51 @@ function this:SingleTask(rewardItem, rewardSingleData)
local scoreLevel = Util.GetGameObject(rewardItem, "scoreLevel"):GetComponent("Text")
local box1 = Util.GetGameObject(rewardItem, "box1")
local box2 = Util.GetGameObject(rewardItem, "box2")
local mask = Util.GetGameObject(rewardItem, "mask")
if not itemsList[rewardItem] then
itemsList[rewardItem] = {}
maskList[rewardItem] = {}
end
for i = 1, #itemsList[rewardItem] do
itemsList[rewardItem][i].gameObject:SetActive(false)
maskList[rewardItem][i].gameObject:SetActive(false)
end
scoreLevel.text = rewardSingleData.level
local SetMask = function (item,i,type)
maskList[rewardItem][i].gameObject:SetActive(false)
if type == 1 then
if rewardSingleData.state == 1 or rewardSingleData.state == -1 then
maskList[rewardItem][i].gameObject:SetActive(true)
end
else
if rewardSingleData.state == -1 then
maskList[rewardItem][i].gameObject:SetActive(true)
end
end
end
for i = 1, #rewardSingleData.Reward do
if not itemsList[rewardItem][i] then
itemsList[rewardItem][i] = SubUIManager.Open(SubUIConfig.ItemView,box1.transform)
itemsList[rewardItem][i].gameObject:SetActive(false)
maskList[rewardItem][i] = newObjToParent(mask, itemsList[rewardItem][i])
maskList[rewardItem][i].transform:DOAnchorPos(Vector3(0.7,-3,0),0)
end
if rewardSingleData.Reward[i] then
if rewardSingleData.Reward[i].type == 1 then
itemsList[rewardItem][i].gameObject.transform:SetParent(box1.transform)
if rewardSingleData.Reward[i] then
if rewardSingleData.Reward[i].type == 1 then
itemsList[rewardItem][i].gameObject.transform:SetParent(box1.transform)
else
itemsList[rewardItem][i].gameObject.transform:SetParent(box2.transform)
itemsList[rewardItem][i].gameObject.transform:SetParent(box2.transform)
end
itemsList[rewardItem][i].gameObject:GetComponent("RectTransform").localPosition = Vector3.zero
itemsList[rewardItem][i].gameObject:GetComponent("RectTransform").localPosition = Vector3.zero
itemsList[rewardItem][i].gameObject:SetActive(true)
itemsList[rewardItem][i]:OnOpen(false, rewardSingleData.Reward[i].item, 0.8, false)
SetMask(rewardItem,i,rewardSingleData.Reward[i].type)
else
itemsList[rewardItem][i].gameObject:SetActive(false)
end
@ -268,7 +290,7 @@ function this:SingleTask(rewardItem, rewardSingleData)
end
local type={
[-2]={sprite = "s_slbz_1anniuhuise",text = Language[10348]},
[-1]={sprite = "t_tequan_yidacheng",text = ""},
[-1]={sprite = "s_slbz_1anniuhuise",text = "已领取"},
[0]={sprite = "s_slbz_1anniuongse",text = Language[10022]},
[1]={sprite = "s_slbz_1anniuhuangse",text = Language[12356]}
}
@ -282,20 +304,20 @@ function this:InitButtonState(rewardItem, rewardSingleData)
local redPoint = Util.GetGameObject(rewardItem, "btnDeal/redPoint")
--当前任务领取情况
local state = rewardSingleData.state
Util.GetGameObject(get.gameObject, "Image"):SetActive(state == -1)
Util.GetGameObject(get.gameObject, "Image"):SetActive(false)--state == -1)
redPoint:SetActive(state == 0 or (state == 1 and treasureState))
get.sprite = Util.LoadSprite(type[state].sprite)
get.enabled = true
text.text = type[state].text
if state == -1 then
btnDeal:GetComponent("Button").enabled = false
get.enabled = false
else
btnDeal:GetComponent("Button").enabled = true
-- if state == -1 then
-- btnDeal:GetComponent("Button").enabled = false
-- get.enabled = false
-- else
-- btnDeal:GetComponent("Button").enabled = true
Util.AddOnceClick(btnDeal,function()
this:OnBtnDealClicked(rewardItem,rewardSingleData)
end)
end
-- end
end
--按钮事件

4
Assets/ManagedResources/~Lua/Modules/Mission/QinglongSerectTreasureManager.lua
View File

@ -115,7 +115,7 @@ end
function this.GetTimeStartToEnd()
local info= ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.TreasureOfSomeBody)
if info then
LogGreen("info.startTime:"..info.startTime.." info.endTime:"..info.endTime)
-- LogGreen("info.startTime:"..info.startTime.." info.endTime:"..info.endTime)
local startTime= this.GetTimeShow(info.startTime)
local endtime= this.GetTimeShow(info.endTime)
return startTime,endtime,info.endTime
@ -127,7 +127,7 @@ function this.GetTimeShow(data)
local year = math.floor(os.date("%Y", data))
local month = math.floor(os.date("%m", data))
local day = math.floor(os.date("%d", data))
local time = year .. Language[12359] .. month .. Language[12360] .. day .. Language[12303]
local time = month .. Language[12360] .. day .. Language[12303]
return time
end