Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
commit
cdd2ec63f6
|
@ -56224,7 +56224,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &8457073949085946844
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -59202,7 +59202,7 @@ MonoBehaviour:
|
|||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u6218\u6597\u7F16\u961F"
|
||||
m_Text: "\u6218\u6597\n\u7F16\u961F"
|
||||
LanguageIndex: 0
|
||||
--- !u!1 &1454945566057167340
|
||||
GameObject:
|
||||
|
@ -62742,8 +62742,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -5, y: 5}
|
||||
m_SizeDelta: {x: -10, y: -10}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1868826035819298185
|
||||
CanvasRenderer:
|
||||
|
@ -62786,7 +62786,7 @@ MonoBehaviour:
|
|||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u6218\u6597\u7F16\u961F"
|
||||
m_Text: "\u6218\u6597\n\u7F16\u961F"
|
||||
LanguageIndex: 0
|
||||
--- !u!1 &1868826035908790155
|
||||
GameObject:
|
||||
|
@ -64430,7 +64430,7 @@ MonoBehaviour:
|
|||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
|
||||
m_FontSize: 56
|
||||
m_FontSize: 40
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 0
|
||||
|
@ -112417,7 +112417,7 @@ MonoBehaviour:
|
|||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u9632\u5B88\u7F16\u961F"
|
||||
m_Text: "\u9632\u5B88\n\u7F16\u961F"
|
||||
LanguageIndex: 0
|
||||
--- !u!1 &6544485251768734281
|
||||
GameObject:
|
||||
|
@ -123852,8 +123852,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: 11.000999, y: 5.6}
|
||||
m_SizeDelta: {x: 588.6, y: 179}
|
||||
m_AnchoredPosition: {x: 11.000999, y: 25}
|
||||
m_SizeDelta: {x: 588.6, y: 168.65}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4360278067208935621
|
||||
CanvasRenderer:
|
||||
|
@ -123885,7 +123885,7 @@ MonoBehaviour:
|
|||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_FontSize: 58
|
||||
m_FontSize: 48
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 0
|
||||
|
@ -130333,7 +130333,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &512517131692229868
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -128428,7 +128428,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &4335078813055046957
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -270522,7 +270522,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.9803922, g: 0.9568628, b: 0.79215693, a: 1}
|
||||
m_Color: {r: 0.9803922, g: 0.8470589, b: 0.5411765, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
|
|
|
@ -2176,7 +2176,7 @@ MonoBehaviour:
|
|||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
|
||||
m_FontSize: 36
|
||||
m_FontSize: 34
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 3
|
||||
|
@ -2740,7 +2740,7 @@ MonoBehaviour:
|
|||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
|
||||
m_FontSize: 36
|
||||
m_FontSize: 34
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 3
|
||||
|
@ -3116,7 +3116,7 @@ MonoBehaviour:
|
|||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
|
||||
m_FontSize: 36
|
||||
m_FontSize: 34
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 3
|
||||
|
@ -4244,7 +4244,7 @@ MonoBehaviour:
|
|||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
|
||||
m_FontSize: 36
|
||||
m_FontSize: 34
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 3
|
||||
|
@ -5187,7 +5187,7 @@ MonoBehaviour:
|
|||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
|
||||
m_FontSize: 36
|
||||
m_FontSize: 34
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 3
|
||||
|
@ -5627,7 +5627,7 @@ MonoBehaviour:
|
|||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
|
||||
m_FontSize: 36
|
||||
m_FontSize: 34
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 3
|
||||
|
|
|
@ -7201,8 +7201,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: -122, y: 0.59999466}
|
||||
m_SizeDelta: {x: 242.11, y: 39.5}
|
||||
m_AnchoredPosition: {x: 137.3, y: 0.59999466}
|
||||
m_SizeDelta: {x: 760.8, y: 45}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5766556493812645330
|
||||
CanvasRenderer:
|
||||
|
@ -7236,14 +7236,14 @@ MonoBehaviour:
|
|||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_FontSize: 36
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 0
|
||||
m_MaxSize: 40
|
||||
m_BestFit: 1
|
||||
m_MinSize: 20
|
||||
m_MaxSize: 36
|
||||
m_Alignment: 3
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u901A\u5173\u7B80\u5355\u7CBE\u82F1\u526F\u672C\u53E4\u5BFA\u7591\u4E91"
|
||||
LanguageIndex: 10001
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -2230,4 +2230,5 @@
|
|||
[12229] = GetLanguageStrById("装备个数"),
|
||||
[12230] = GetLanguageStrById("竞技守卫"),
|
||||
[12231] = GetLanguageStrById("$99.99抢购"),
|
||||
[12232] = GetLanguageStrById("每周限购 %s 个"),
|
||||
}
|
||||
|
|
|
@ -297,7 +297,7 @@ function this.GetSpecialText(key, value)
|
|||
if type == BuffName.Shield then
|
||||
color = UIColorStr.GREEN
|
||||
end
|
||||
s = s .. string.format(Language[12158], config.Describe, color, v)
|
||||
s = s .. string.format(Language[12158], GetLanguageStrById(config.Describe), color, v)
|
||||
end
|
||||
end
|
||||
return s
|
||||
|
|
|
@ -112,7 +112,7 @@ function this.SingleItemDataShow(_go,curBagSoulPrintData)
|
|||
Util.GetGameObject(_go.transform,"circleFrameBg"):GetComponent("Image").sprite=Util.LoadSprite(SoulPrintSpriteByQuantity[itemConfig[curequipSign.Id].Quantity].circleBg2)
|
||||
Util.GetGameObject(_go.transform,"circleFrameBg/Icon"):GetComponent("Image").sprite=Util.LoadSprite(GetResourcePath(itemConfig[curBagSoulPrintData.id].ResourceID))
|
||||
Util.GetGameObject(_go.transform,"circleFrameBg/circleFrame"):GetComponent("Image").sprite=Util.LoadSprite(SoulPrintSpriteByQuantity[itemConfig[curequipSign.Id].Quantity].circle)
|
||||
Util.GetGameObject(_go.transform,"name"):GetComponent("Text").tex = string.gsub(GetLanguageStrById(curequipSign.Name),Language[11520],"",1)
|
||||
Util.GetGameObject(_go.transform,"name"):GetComponent("Text").text = SubString2(string.gsub(GetLanguageStrById(curequipSign.Name),Language[11520],"",1), 10)
|
||||
Util.GetGameObject(_go.transform, "Hero"):SetActive(curBagSoulPrintData.upHero ~= "")
|
||||
local curheroData = {}
|
||||
if curBagSoulPrintData.upHero ~= "" then
|
||||
|
|
|
@ -75,19 +75,19 @@ function this.SingleDataShow(go, data)
|
|||
local btnBuy = Util.GetGameObject(go, "btnBuy")
|
||||
local grid = Util.GetGameObject(go, "scrollView/grid")
|
||||
local shadow = Util.GetGameObject(go, "shadow")
|
||||
local LimitText=Util.GetGameObject(go,"tip/tip1/Image/text"):GetComponent("Text")
|
||||
local LimitText=Util.GetGameObject(go,"tip/tip1/text1"):GetComponent("Text")
|
||||
|
||||
local goodData = OperatingManager.GetGiftGoodsInfo(GoodsTypeDef.DirectPurchaseGift, data.Id)
|
||||
local boughtNum = OperatingManager.GetGoodsBuyTime(GoodsTypeDef.DirectPurchaseGift, data.Id) or 0
|
||||
local shows = shopItemData.RewardShow
|
||||
name.text = GetLanguageStrById(shopItemData.Name)
|
||||
|
||||
LimitText.text = shopItemData.Limit
|
||||
if GetCurLanguage() == 2 then
|
||||
LimitText.gameObject.transform.localPosition = Vector3.New(4.7,-5,0)
|
||||
else
|
||||
LimitText.gameObject.transform.localPosition = Vector3.New(-147,-5,0)
|
||||
end
|
||||
LimitText.text = string.format(Language[12232], "<color=#FAD88AFF>"..shopItemData.Limit.."</color>")
|
||||
-- if GetCurLanguage() == 2 then
|
||||
-- LimitText.gameObject.transform.localPosition = Vector3.New(4.7,-5,0)
|
||||
-- else
|
||||
-- LimitText.gameObject.transform.localPosition = Vector3.New(-147,-5,0)
|
||||
-- end
|
||||
buyInfo:SetActive( shopItemData.IsDiscount ~= 0 )
|
||||
if shopItemData.IsDiscount and shopItemData.IsDiscount > 0 then
|
||||
buyInfo:GetComponent("Text").text = Language[10582]..string.format(MoneyUtil.GetMoneyUnitName(), MoneyUtil.GetMoney(shopItemData.Price) / (shopItemData.IsDiscount/10))--shopItemData.Price / (shopItemData.IsDiscount/10)..MoneyUtil.GetMoneyUnitName()
|
||||
|
|
|
@ -53,7 +53,7 @@ function HarmonyPanel:BindEvent()
|
|||
end)
|
||||
Util.AddClick(self.helpBtn,function()
|
||||
|
||||
UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.HongMengZhen,self.helpPosition.x,self.helpPosition.y+500)
|
||||
UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.HongMengZhen,self.helpPosition.x,self.helpPosition.y+900)
|
||||
end)
|
||||
|
||||
|
||||
|
|
|
@ -363,6 +363,7 @@ function this.SetInfoShow(go,data,rankType,Value0)
|
|||
if Value0 then
|
||||
Value0:GetComponent("Text").text = "<size=40%>"..data.userName.."</size>"
|
||||
end
|
||||
Util.GetGameObject(go,"trial/Text"):SetActive(false)
|
||||
Util.GetGameObject(go,"trial/tip"):GetComponent("Text").text = Language[11689].. data.rankInfo.param1
|
||||
end
|
||||
elseif rankType == RANK_TYPE.GOLD_EXPER then
|
||||
|
|
|
@ -2229,3 +2229,4 @@
|
|||
12229,装备个数
|
||||
12230,竞技守卫
|
||||
12231,$99.99抢购
|
||||
12232,每周限购 %s 个
|
||||
|
|
|
|
@ -1371,7 +1371,7 @@
|
|||
11371,购买次数
|
||||
11372,是否消耗 100000000
|
||||
11373,\, 购买100次挑战次数?
|
||||
11374,\"每天每天每天每天每天每天”
|
||||
11374,"\""每天每天每天每天每天每天”"
|
||||
11375,击败13只皮皮虾
|
||||
11376,寻找深渊之井\,获得泉水
|
||||
11377,打败嗷嗷大魔王
|
||||
|
@ -1557,7 +1557,7 @@
|
|||
11557,清山影
|
||||
11558,核心特性
|
||||
11559,<color=#D48A07>升级</color>吧啦吧啦吧啦吧吧啦吧啦吧啦吧<color=red>吧啦吧啦吧啦吧吧啦吧啦吧啦吧</color>啦啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧
|
||||
11560, 攻击
|
||||
11560," 攻击"
|
||||
11561,法宝天赋
|
||||
11562,<color=#D89623>升级</color>吧啦吧啦吧啦吧吧啦吧啦吧啦吧<color=red>吧啦吧啦吧啦吧吧啦吧啦吧啦吧</color>啦啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧
|
||||
11563,击败5名敌人(0/5)
|
||||
|
@ -1961,3 +1961,5 @@
|
|||
11961,疾行水路
|
||||
11962,解锁\n
|
||||
11963,检测更新游戏资源...
|
||||
11964,战斗\n编队
|
||||
11965,防守\n编队
|
||||
|
|
Can't render this file because it contains an unexpected character in line 1374 and column 8.
|
Loading…
Reference in New Issue