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

dev_chengFeng
ZhangBiao 2021-04-12 19:29:14 +08:00
commit bcfb68a40a
3 changed files with 7 additions and 7 deletions

View File

@ -7626,7 +7626,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3679961288471251120} m_GameObject: {fileID: 3679961288471251120}
m_Enabled: 0 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name: m_Name:
@ -8052,7 +8052,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 0 m_IsActive: 1
--- !u!224 &9207170478563030241 --- !u!224 &9207170478563030241
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -470,9 +470,9 @@ function this.ExecuteLoading()
-- 新的引导 -- 新的引导
-- StoryManager.EventTrigger(300001) -- StoryManager.EventTrigger(300001)
--创号阶段先进入剧情对话,进入假战斗,然后对话起名,最后进入主界面 --创号阶段先进入剧情对话,进入假战斗,然后对话起名,最后进入主界面
StoryManager.EventTrigger(300001) -- StoryManager.EventTrigger(300001)
-- 新的引导 -- 新的引导
-- StoryManager.EventTrigger(100001) StoryManager.EventTrigger(100001)
else else
PatFaceManager.isLogin = true PatFaceManager.isLogin = true
UIManager.OpenPanel(UIName.FightPointPassMainPanel) UIManager.OpenPanel(UIName.FightPointPassMainPanel)
@ -556,7 +556,7 @@ function this.RequestHttpLogin()
local url = "" local url = ""
if IsSDKLogin then if IsSDKLogin then
url = LoginRoot_Url url = LoginRoot_Url
.. "jl_loginserver/getHwUserInfo?openId=" .. AppConst.OpenId .. "jl_loginserver/getUserInfo?openId=" .. AppConst.OpenId
.. "&serverId=" .. LoginManager.ServerId .. "&serverId=" .. LoginManager.ServerId
.. "&token=" .. AppConst.TokenStr .. "&token=" .. AppConst.TokenStr
.. "&platform=" .. 1 .. "&platform=" .. 1

View File

@ -8,7 +8,7 @@ local _TabData={
[1] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = Language[12266] , rpType = RedPointType.Setting_Head}, [1] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = Language[12266] , rpType = RedPointType.Setting_Head},
-- [2] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "称号" }, -- [2] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "称号" },
[2] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = Language[12267] , rpType = RedPointType.Setting_Ride}, [2] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = Language[12267] , rpType = RedPointType.Setting_Ride},
[3] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "称号",rpType = RedPointType.Setting_Title }, -- [3] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "称号",rpType = RedPointType.Setting_Title },
} }
local _TabFontColor = { default = Color.New(130 / 255, 128 / 255, 120 / 255, 1), local _TabFontColor = { default = Color.New(130 / 255, 128 / 255, 120 / 255, 1),
select = Color.New(243 / 255, 235 / 255, 202 / 255, 1)} select = Color.New(243 / 255, 235 / 255, 202 / 255, 1)}
@ -22,7 +22,7 @@ this.contents = {
[2] = {view = require("Modules/Setting/SettingPlayerRide"), panelName = "settingPlayerRide"}, [2] = {view = require("Modules/Setting/SettingPlayerRide"), panelName = "settingPlayerRide"},
--坐骑 --坐骑
-- [4] = {view = require("Modules/Setting/SettingPlayerSkin"), panelName = "settingPlayerSkin"}, -- [4] = {view = require("Modules/Setting/SettingPlayerSkin"), panelName = "settingPlayerSkin"},
[3] = {view = require("Modules/Setting/SettingPlayerTitle"), panelName = "settingPlayerTitle"}, -- [3] = {view = require("Modules/Setting/SettingPlayerTitle"), panelName = "settingPlayerTitle"},
} }
--子模块预设 --子模块预设
this.prefabs={} this.prefabs={}