Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b

dev_chengFeng
gaoxin 2021-04-09 17:38:24 +08:00
commit 26fda17758
7 changed files with 23 additions and 21 deletions

View File

@ -4187,7 +4187,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: 0.00007259109, y: -73.150055}
m_AnchoredPosition: {x: 0.000061035156, y: -73.150055}
m_SizeDelta: {x: 0, y: 151}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &5729675956691850897
@ -8875,8 +8875,8 @@ 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: 4.899994, y: -341.1}
m_SizeDelta: {x: 600, y: 160.7}
m_AnchoredPosition: {x: 4.899994, y: -338}
m_SizeDelta: {x: 600, y: 115.1}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8029727511439798878
CanvasRenderer:
@ -8910,7 +8910,7 @@ MonoBehaviour:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 35
m_FontStyle: 0
m_BestFit: 0
m_BestFit: 1
m_MinSize: 3
m_MaxSize: 35
m_Alignment: 4
@ -8919,7 +8919,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "<color=#60A22C>\u89E3\u9501\u9AD8\u9636\u6218\u4EE4\uFF0C\u6FC0\u6D3B\u8FDB\u9636</color><color=#95523B>\u4E13\u5C5E\u5956\u52B1+\u76F4\u534715\u7EA7</color><color=#60A22C>\u89E3\u9501\u7ACB\u83B7\u9650\u5B9A\u79F0\u53F7+\u9650\u5B9A\u6C14\u6CE1</color>"
m_Text: "<color=#95523B>\u89E3\u9501\u79D8\u5B9D\uFF0C\u53EF\u4EE5\u9886\u53D6\u989D\u5916\u4E13\u5C5E\u5956\u52B1\uFF0C\u5E76\u76F4\u63A5\u83B7\u5F97200\u79EF\u5206\uFF0C<color=#CC4325>\u53EF\u83B7\u53D61980\u5996\u6676\uFF0C\u90AE\u4EF6\u9886\u53D6</color></color>"
LanguageIndex: 0
--- !u!1 &2062629867242066860
GameObject:
@ -20283,7 +20283,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: -5.1, y: -170}
m_AnchoredPosition: {x: -5.100006, y: -170}
m_SizeDelta: {x: 607.8, y: 146.3}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &6010787729466236896
@ -28465,7 +28465,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: -5.1, y: -556}
m_AnchoredPosition: {x: -5.100006, y: -556}
m_SizeDelta: {x: 607.8, y: 146.3}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &890920174592704499

View File

@ -67,7 +67,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 2e205a1ead0df1548ae437c4e0279d9f, type: 3}
m_Sprite: {fileID: 21300000, guid: 27f79fccc22198a439e7371a9cc2d41a, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -1551,11 +1551,6 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 8025763709527437539}
m_Modifications:
- target: {fileID: 8949720746529033214, guid: db727bed1bc26784b8deed5f24c8cf79,
type: 3}
propertyPath: m_Name
value: UI_Effect_TeHuiShenZhuang
objectReference: {fileID: 0}
- target: {fileID: 1838372303905070877, guid: db727bed1bc26784b8deed5f24c8cf79,
type: 3}
propertyPath: m_LocalPosition.x
@ -1661,6 +1656,11 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8949720746529033214, guid: db727bed1bc26784b8deed5f24c8cf79,
type: 3}
propertyPath: m_Name
value: UI_Effect_TeHuiShenZhuang
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: db727bed1bc26784b8deed5f24c8cf79, type: 3}
--- !u!224 &4221653497422039268 stripped

View File

@ -2283,8 +2283,7 @@
[12282] = GetLanguageStrById("\n\n\n\n\n\n6\n"),
[12283] = GetLanguageStrById("\n\n\n\n\n\n$0.99"),
[12284] = GetLanguageStrById("%m月%d日%H时"),
[12285] = GetLanguageStrById("暂无可领取的奖励~"),
[12286] = GetLanguageStrById("次日0点重置"),
[12287] = GetLanguageStrById("请在以下道具中选择一种"),
[12288] = GetLanguageStrById("以下道具中可选择一种"),
[12285] = GetLanguageStrById("红点Debug"),
[12286] = GetLanguageStrById("<color=#95523B>解锁秘宝,可以领取额外专属奖励, 并直接获得200积分<color=#CC4325>可获取1980妖晶邮件领取</color></color>"),
[12287] = GetLanguageStrById("<color=#60A22C>解锁秘宝,激活进阶</color><color=#95523B>专属奖励+ 直升15级<color=#CC4325>可获取1980妖晶邮件领取</color></color>"),
}

View File

@ -91,7 +91,7 @@ function GMPanel:InitComponent()
{type = GMType.Function, subType = GMSubType.Server, inputNum = 1, args = "23#0#%s", btnTip = Language[11176], inputTip = {Language[11196]}, callBack = nil},
{type = GMType.Function, subType = GMSubType.Server, inputNum = 1, args = "24#%s", btnTip = Language[11197], inputTip = {Language[11198]}, callBack = nil},
{type = GMType.Function, subType = GMSubType.Func, inputNum = 1, args = "", btnTip = Language[12175], inputTip = {Language[12176]}, callBack = this.TestFuncGuide},
{type = GMType.Function, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = "红点Debug", inputTip = {""}, callBack = this.OpenRedDebug},
{type = GMType.Function, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = Language[12285], inputTip = {""}, callBack = this.OpenRedDebug},
{type = GMType.Battle, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = Language[11199], inputTip = {""}, callBack = this.GoTestBattle},

View File

@ -1,4 +1,4 @@
require("Base/BasePanel")
require("Base/BasePanel")
local RedpotDebugPanel = Inherit(BasePanel)
local RPData = require("Modules/Player/RedPointData")

View File

@ -59,11 +59,11 @@ function this:OnShow(_parent,...)
rewardStateData = TreasureOfHeavenManger.rewardStateData
rewardData = TreasureOfHeavenManger.GetAllRewardData()
this:showRewardTianGong()
this.tip.text = Language[11562]
this.tip.text = Language[12286]
elseif curType == 2 then
rewardData = QinglongSerectTreasureManager.GetAllRewardData()
this:showRewardQinglong()
this.tip.text = Language[11563]
this.tip.text = Language[12287]
end
end

View File

@ -2282,3 +2282,6 @@
12282,每\n日\n仅\n需\n充\n值\n6\n元
12283,每\n日\n仅\n需\n充\n值\n$0.99
12284,%m月%d日%H时
12285,红点Debug
12286,<color=#95523B>解锁秘宝,可以领取额外专属奖励, 并直接获得200积分<color=#CC4325>可获取1980妖晶邮件领取</color></color>
12287,<color=#60A22C>解锁秘宝,激活进阶</color><color=#95523B>专属奖励+ 直升15级<color=#CC4325>可获取1980妖晶邮件领取</color></color>

1 10001
2282 12282 每\n日\n仅\n需\n充\n值\n6\n元
2283 12283 每\n日\n仅\n需\n充\n值\n$0.99
2284 12284 %m月%d日%H时
2285 12285 红点Debug
2286 12286 <color=#95523B>解锁秘宝,可以领取额外专属奖励, 并直接获得200积分,<color=#CC4325>可获取1980妖晶,邮件领取</color></color>
2287 12287 <color=#60A22C>解锁秘宝,激活进阶</color><color=#95523B>专属奖励+ 直升15级,<color=#CC4325>可获取1980妖晶,邮件领取</color></color>