Merge branches 'china/dev' and 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
ZhangBiao 2021-03-19 14:37:22 +08:00
commit fb7ef778b1
15 changed files with 140 additions and 322 deletions

View File

@ -197,6 +197,7 @@ public class App : UnitySingleton<App>
public void Initialize()
{
ConfigMgr.Init();
SLanguageMoreLanguageMgr.Instance.InitData();
VersionMgr.Initialize();
}

View File

@ -1117,11 +1117,12 @@ namespace GameLogic
string spriteStr = spriteName;
if (subStr == "_zh")
{
if (PlayerPrefs.GetInt("language") == 1)
int lt = SLanguageMoreLanguageMgr.Instance.GetLanguageType();
if (lt == 1)
{
spriteStr = spriteName.Remove(spriteName.Length - 2) + "en";
}
else if (PlayerPrefs.GetInt("language") == 2)
else if (lt == 2)
{
spriteStr = spriteName.Remove(spriteName.Length - 2) + "vi";
}

View File

@ -173,7 +173,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &1492499629588067375
RectTransform:
m_ObjectHideFlags: 0
@ -1684,6 +1684,7 @@ GameObject:
m_Component:
- component: {fileID: 7598740983930717330}
- component: {fileID: 4153919401695343612}
- component: {fileID: 2321711066255673890}
m_Layer: 0
m_Name: box
m_TagString: Untagged
@ -1705,10 +1706,10 @@ RectTransform:
m_Father: {fileID: 426311262980600154}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 0, y: 50}
m_SizeDelta: {x: 119.2, y: 100}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 100}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &4153919401695343612
MonoBehaviour:
@ -1723,16 +1724,30 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 150
m_Right: 0
m_Left: 216
m_Right: 80
m_Top: 0
m_Bottom: 80
m_ChildAlignment: 3
m_Spacing: 30
m_Spacing: 185
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
m_ChildControlWidth: 1
m_ChildControlHeight: 0
--- !u!114 &2321711066255673890
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6024333862272756716}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 0
--- !u!1 &6097502257844573580
GameObject:
m_ObjectHideFlags: 0

View File

@ -1027,7 +1027,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: -121.5, y: -55.099945}
m_AnchoredPosition: {x: -123, y: -55.099945}
m_SizeDelta: {x: 274.27, y: 51.700012}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7719948459821737218
@ -1065,7 +1065,7 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 4
m_MaxSize: 40
m_Alignment: 5
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0

View File

@ -552,7 +552,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: 34.5, y: 0.6}
m_AnchoredPosition: {x: -38.64995, y: 0.6}
m_SizeDelta: {x: 195.7, y: 49.9}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7443940717002067312
@ -590,7 +590,7 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 10
m_MaxSize: 44
m_Alignment: 4
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
@ -1031,7 +1031,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: 38.149975, y: 0.6}
m_AnchoredPosition: {x: -35, y: 0.6}
m_SizeDelta: {x: 195.7, y: 49.9}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5865507525732205369
@ -1069,7 +1069,7 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 10
m_MaxSize: 44
m_Alignment: 4
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
@ -2582,7 +2582,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &5920877375940425070
RectTransform:
m_ObjectHideFlags: 0
@ -2753,7 +2753,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: 38.150005, y: 0.6}
m_AnchoredPosition: {x: -34.999943, y: 0.6}
m_SizeDelta: {x: 195.7, y: 49.9}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5527442532519764282
@ -2791,7 +2791,7 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 10
m_MaxSize: 44
m_Alignment: 4
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
@ -2996,7 +2996,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &8894568249531473385
RectTransform:
m_ObjectHideFlags: 0
@ -3421,7 +3421,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &7050190722572663993
RectTransform:
m_ObjectHideFlags: 0

View File

@ -106,6 +106,7 @@ RectTransform:
- {fileID: 6323907669162332623}
- {fileID: 1042795630689291113}
- {fileID: 7403415200051497663}
- {fileID: 655889813004748635}
m_Father: {fileID: 8996595556620474117}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -510,7 +511,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 655889813004748635}
m_RootOrder: 0
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@ -1586,7 +1587,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 655889813004748635}
m_RootOrder: 1
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
@ -1710,81 +1711,6 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "\u653B\u51FB\uFF1A"
LanguageIndex: 0
--- !u!1 &564430352927793580
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8164539038628194150}
- component: {fileID: 3266766804967399390}
- component: {fileID: 6734096809880213633}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8164539038628194150
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 564430352927793580}
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: 8900518197752391045}
m_Father: {fileID: 3316413344436090805}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -1146}
m_SizeDelta: {x: 0, y: 75}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3266766804967399390
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 564430352927793580}
m_CullTransparentMesh: 0
--- !u!114 &6734096809880213633
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 564430352927793580}
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: b44f71f84aa20084a9ed3a8ef44c483c, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &594498497032094176
GameObject:
m_ObjectHideFlags: 0
@ -1893,7 +1819,6 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 861513193}
- {fileID: 4074313861348738548}
m_Father: {fileID: 7423535894473370959}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -5763,7 +5688,6 @@ RectTransform:
- {fileID: 649693974224445334}
- {fileID: 5075207361885460552}
- {fileID: 5075207361646036926}
- {fileID: 8164539038628194150}
m_Father: {fileID: 7423535894473370959}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -6425,67 +6349,6 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &2974198067001771857
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4074313861348738548}
- component: {fileID: 511661598688498961}
m_Layer: 5
m_Name: box1
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4074313861348738548
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2974198067001771857}
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: 655889813004748635}
- {fileID: 1077111544204339403}
m_Father: {fileID: 8996595556620474117}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -1185}
m_SizeDelta: {x: 1080, y: 90}
m_Pivot: {x: 0.5, y: 1}
--- !u!114 &511661598688498961
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2974198067001771857}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 100
m_Right: 0
m_Top: 45
m_Bottom: 0
m_ChildAlignment: 0
m_Spacing: 0
m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 1
m_ChildControlWidth: 0
m_ChildControlHeight: 0
--- !u!1 &3052749163510075554
GameObject:
m_ObjectHideFlags: 0
@ -6917,20 +6780,21 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3224954024497360144}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
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: 1077111544204339403}
- {fileID: 3312353661996661353}
- {fileID: 3859439430310529040}
- {fileID: 7964369023937820060}
m_Father: {fileID: 4074313861348738548}
m_RootOrder: 0
m_Father: {fileID: 861513193}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 420, y: 90}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8440280213579013307
CanvasRenderer:
@ -7287,86 +7151,6 @@ MonoBehaviour:
isPlayAudio: 1
isHaveCloseBtn: 0
isPlayOnOpen: 1
--- !u!1 &3372962144034595163
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8900518197752391045}
- component: {fileID: 157444261171248351}
- component: {fileID: 8584004119700968296}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8900518197752391045
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3372962144034595163}
m_LocalRotation: {x: -0, y: -0, z: 0.004054589, w: -0.99999183}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8164539038628194150}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 149.5, y: -1.6}
m_SizeDelta: {x: 241.1, y: 62.3}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &157444261171248351
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3372962144034595163}
m_CullTransparentMesh: 0
--- !u!114 &8584004119700968296
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3372962144034595163}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, 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_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 40
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 4
m_MaxSize: 48
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u8BED\u8A00"
LanguageIndex: 0
--- !u!1 &3573780367671578872
GameObject:
m_ObjectHideFlags: 0
@ -9521,7 +9305,7 @@ RectTransform:
m_Children:
- {fileID: 2044536394749562946}
m_Father: {fileID: 655889813004748635}
m_RootOrder: 2
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
@ -16642,12 +16426,12 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4074313861348738548}
m_RootOrder: 1
m_Father: {fileID: 655889813004748635}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -85}
m_SizeDelta: {x: 420, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5298306214829582365

View File

@ -232,7 +232,10 @@ function this:OnOpen(_fightData, _fightType, _endFunc)
BattleView:SetNameStr(nil)
this.DefResult:SetActive(false)
this.AtkResult:SetActive(false)
local lvOpenTimeScaleConFig = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.PrivilegeTypeConfig,"PrivilegeType",PRIVILEGE_TYPE.DoubleTimesFight,"UnlockType",1)
if lvOpenTimeScaleConFig and PlayerManager.level == lvOpenTimeScaleConFig.Condition[1][1] and BattleManager.GetTimeScale() == BATTLE_TIME_SCALE_ONE then
BattleManager.SetTimeScale(BATTLE_TIME_SCALE_TWO)
end
-- 开始战斗
BattleView:StartBattle()

View File

@ -110,8 +110,8 @@ function this:BindEvent()
LoginManager.SocketPort = list.port
LoginManager.ServerId = list.server_id
LoginManager.state = list.state
local severArea = tonumber(string.sub(list.server_id, 0, -5))
this.serverMes.text = PlayerManager.serverInfo.name .. "\t<color=#56F384FF>" .. severArea .. "</color>" .. Language[11138]
--local severArea = tonumber(string.sub(list.server_id, 0, -5))
this.serverMes.text = PlayerManager.serverInfo.name-- .. "\t<color=#56F384FF>" .. severArea .. "</color>" .. Language[11138]
end
})
end)
@ -390,8 +390,8 @@ function this.SetServerList(data)
LoginManager.ServerId = this.serverList[lastIndex].server_id
LoginManager.state = this.serverList[lastIndex].state
local severArea = tonumber(string.sub(this.serverList[lastIndex].server_id, 0, -5))
this.serverMes.text = PlayerManager.serverInfo.name .. "\t<color=#56F384FF>" .. severArea .. "</color>" .. Language[11138]
--local severArea = tonumber(string.sub(this.serverList[lastIndex].server_id, 0, -5))
this.serverMes.text = PlayerManager.serverInfo.name-- .. "\t<color=#56F384FF>" .. severArea .. "</color>" .. Language[11138]
RequestPanel.Hide()
@ -490,14 +490,10 @@ function this.ExecuteLoading()
NetManager.LoginConfimRequest()
if AppConst.isGuide then
if GuideManager.GetCurId(GuideType.Force) == 1 and PlayerManager.nickName == tostring(PlayerManager.uid) and PlayerManager.level == 1 then
-- 新的引导
StoryManager.EventTrigger(300001)
--创号阶段先进入剧情对话,进入假战斗,然后对话起名,最后进入主界面
-- StoryManager.EventTrigger(100001, function()
-- PatFaceManager.isLogin = true
-- UIManager.OpenPanel(UIName.FightPointPassMainPanel)
-- LoadingPanel.End()
-- end)
-- StoryManager.EventTrigger(300001)
-- 新的引导
StoryManager.EventTrigger(100001)
else
PatFaceManager.isLogin = true
UIManager.OpenPanel(UIName.FightPointPassMainPanel)

View File

@ -1030,6 +1030,8 @@ function this.TimeFormat()
activityTabs[k].go.gameObject:SetActive(false)
supremHadSet = true
end
elseif v.FunType and v.FunType == 41 then
activityTabs[k].go.gameObject:SetActive(DailyRechargeManager.GetDailyRechargeExist())
else
local info = ActivityGiftManager.GetActivityTypeInfo(v.ActiveType)
local extraTime = 0

View File

@ -135,7 +135,7 @@ function this.PlayerInfoRequest(func)
vip_level = msg.player.vipLevel,
-- test_date = math.floor(msg.player.serverTime) .. "#3", -- 日期
})
TapDBManager.SetUser(PlayerManager.uid)
TapDBManager.SetUser(AppConst.OpenId)
TapDBManager.SetLevel(PlayerManager.level)
TapDBManager.SetServer(LoginManager.ServerId)

View File

@ -241,23 +241,25 @@ function PrivilegeManager.GetPrivilegeOpenTip(privilegeType)
end
--当存在多解锁类型时
if #privilegeList>1 then
local infoList={}
-- if #privilegeList>1 then
-- local infoList={}
--解锁2倍速的处理
for i,v in ipairs(privilegeList) do
if (v.UnlockType==2 or v.UnlockType==3) and privilegeType==PRIVILEGE_TYPE.DoubleTimesFight then
for _, con in ipairs(v.Condition) do
if con[2] > 0 then
table.insert(infoList, con[1])
end
end
end
end
-- for i,v in ipairs(privilegeList) do
-- if (v.UnlockType==1) and privilegeType==PRIVILEGE_TYPE.DoubleTimesFight then
-- for _, con in ipairs(v.Condition) do
-- if con[2] > 0 then
-- table.insert(infoList, con[1])
-- end
-- end
-- end
-- end
if privilegeType==PRIVILEGE_TYPE.DoubleTimesFight then
local fightConfig = ConfigManager.GetConfigData(ConfigName.MainLevelConfig, infoList[1])
return string.format(Language[11402],GetLanguageStrById(fightConfig.Name),infoList[2])
local lvOpenTimeScaleConFig = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.PrivilegeTypeConfig,"PrivilegeType",PRIVILEGE_TYPE.DoubleTimesFight,"UnlockType",1)
-- local fightConfig = ConfigManager.GetConfigData(ConfigName.MainLevelConfig, infoList[1])
-- return string.format(Language[11402],GetLanguageStrById(fightConfig.Name),infoList[2])
return string.format("玩家等级达到 %s 级解锁",lvOpenTimeScaleConFig.Condition[1][1])
end
end
-- end
local privilegeData = privilegeList[1]
-- 没有条件直接返回0

View File

@ -42,11 +42,11 @@ function SettingInfo:InitComponent(gameObject, rootPanel)
-- this.languageText.text=GetCurLanguage()==0 and "中文" or "英文"
if IsLanguagePack then
this.dropDown = Util.GetGameObject(gameObject,"other/box1/Dropdown"):GetComponent("Dropdown")
this.dropDownText = Util.GetGameObject(gameObject,"other/box1/Dropdown/Label"):GetComponent("Text")
this.dropDownTip = Util.GetGameObject(gameObject,"other/box1/tip")
this.dropDown = Util.GetGameObject(gameObject,"other/box/Dropdown"):GetComponent("Dropdown")
this.dropDownText = Util.GetGameObject(gameObject,"other/box/Dropdown/Label"):GetComponent("Text")
this.dropDownTip = Util.GetGameObject(gameObject,"other/box/Dropdown/tip")
else
this.dropDown = Util.GetGameObject(gameObject,"other/box1/Dropdown")
this.dropDown = Util.GetGameObject(gameObject,"other/box/Dropdown")
this.dropDown.transform.parent.gameObject:SetActive(false)
end

View File

@ -330,6 +330,8 @@ namespace ResUpdate
{
Debug.Log("www.text.config:" + request0.downloadHandler.text);
ConfigManager.Instance.SetNetInfo(request0.downloadHandler.text);
// 初始化语言
SLanguageMoreLanguageMgr.Instance.InitData();
}
// 获取version

View File

@ -14,44 +14,6 @@ public class GameStart : MonoBehaviour
private AssetBundle bundle;
void Start()
{
//PlayerPrefs.DeleteKey("language");
if (!PlayerPrefs.HasKey("language"))
{
if (Application.systemLanguage == SystemLanguage.Chinese || Application.systemLanguage == SystemLanguage.ChineseSimplified || Application.systemLanguage == SystemLanguage.ChineseTraditional)
{
PlayerPrefs.SetInt("language", 0);
}
else if (Application.systemLanguage == SystemLanguage.Vietnamese)
{
PlayerPrefs.SetInt("language", 2);
}
else
{
PlayerPrefs.SetInt("language", 1);
}
}
else if(PlayerPrefs.HasKey("language_flag")&& PlayerPrefs.GetInt("language")!= PlayerPrefs.GetInt("language_flag"))
{
PlayerPrefs.SetInt("language", PlayerPrefs.GetInt("language_flag"));
}
if (!PlayerPrefs.HasKey("language_flag"))
{
PlayerPrefs.SetInt("language_flag", PlayerPrefs.GetInt("language"));
}
string languageStr = "";
if (PlayerPrefs.GetInt("language") == 0)
{
languageStr = "中文";
}
else if (PlayerPrefs.GetInt("language") == 1)
{
languageStr = "英文";
}
else
{
languageStr = "越南语";
}
Debug.Log("当前语言是:" + languageStr);
if (Application.isEditor && AppConst.bundleMode && AppConst.isUpdate)
{
if (!System.IO.Directory.Exists(Util.AppContentPath()))

View File

@ -115,6 +115,7 @@ namespace GameLogic
public void InitData()
{
//languagedictionary = new Dictionary<more_language, languageStruct>();
InitLanguageConfig();
InitLanguagedictionary();
//this.languagedictionary.Add(more_language.CANEL, new languageStruct() { english = EnglishLanguage.CANEL, chinese = ChineseLanguage.CANEL });
//this.languagedictionary.Add(more_language.CONFIRM, new languageStruct() { english = EnglishLanguage.CONFIRM, chinese = ChineseLanguage.CONFIRM });
@ -145,6 +146,55 @@ namespace GameLogic
data = JsonMapper.ToObject<Hashtable>(strjson);
}
public int GetLanguageType()
{
return PlayerPrefs.GetInt("language", 0);
}
public void InitLanguageConfig()
{
if (ConfigManager.Instance.GetConfigInfo("Setting.LanguagePackager.isActive") == "1")
{
if (!PlayerPrefs.HasKey("language"))
{
if (Application.systemLanguage == SystemLanguage.Chinese || Application.systemLanguage == SystemLanguage.ChineseSimplified || Application.systemLanguage == SystemLanguage.ChineseTraditional)
{
PlayerPrefs.SetInt("language", 0);
}
else if (Application.systemLanguage == SystemLanguage.Vietnamese)
{
PlayerPrefs.SetInt("language", 2);
}
else
{
PlayerPrefs.SetInt("language", 1);
}
}
else if (PlayerPrefs.HasKey("language_flag") && PlayerPrefs.GetInt("language") != PlayerPrefs.GetInt("language_flag"))
{
PlayerPrefs.SetInt("language", PlayerPrefs.GetInt("language_flag"));
}
if (!PlayerPrefs.HasKey("language_flag"))
{
PlayerPrefs.SetInt("language_flag", PlayerPrefs.GetInt("language"));
}
}
else
{
PlayerPrefs.SetInt("language", 0);
}
string languageStr = "";
switch (GetLanguageType())
{
case 0: languageStr = "中文";break;
case 1: languageStr = "英文"; break;
case 2: languageStr = "越南语"; break;
}
Debug.Log("当前语言是:" + languageStr);
}
/// <summary>
/// 初始化
/// </summary>
@ -197,7 +247,7 @@ namespace GameLogic
string index1 = ((int)language).ToString();
var data2 = JsonMapper.ToJson(data[index1]);
var data1 = JsonMapper.ToObject<languageStruct>(data2);
switch (PlayerPrefs.GetInt("language"))
switch (GetLanguageType())
{
case 0:
languageThrans = data1.chinese;