Merge branch 'tcx_xiyou_yueNan' of http://192.168.1.21:3000/root/miduo_client into tcx_xiyou_yueNan

PC-202302260912\Administrator 2024-11-22 15:07:48 +08:00
commit 4c12388265
18 changed files with 4045 additions and 9187 deletions

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 34517f415b76f6f478fc5def1ed13feb
guid: 46cda12a6c4d12645a434080a60018df
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
@ -80,24 +80,13 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: c8baaf72a5ce0a54082dc9d3b26a8b58
spriteID: f491edf814695c049a68ebb991c0f6dc
vertices: []
indices:
edges: []

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: c8b7c3937a9163748a57d131b2d79f14
guid: ef81c9b1283f5d34e8a6261e89ff3460
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
@ -80,24 +80,13 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 38febd694e2226447a5ffe77f5390543
spriteID: 0ceda06a659839c41b7b3bb795473400
vertices: []
indices:
edges: []

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: d77498533c482b246a0246ac66311a95
guid: a705fc96c04b9f647af66af56e802cbb
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
@ -80,24 +80,13 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 6ef1a39c0bfb6bf47a1fe0664e77aedc
spriteID: d6a68c87e24f04448b2f708a364a4c8d
vertices: []
indices:
edges: []

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 134c1a1bc7a3d9e4ab392ca1c8878687
guid: d43bfbe4e6f9d8741ae6259308ccd9be
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
@ -80,24 +80,13 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 3f687fc48357a6a4685ab6a265f9c855
spriteID: fa2d62675ec832b40a639e7ad895db59
vertices: []
indices:
edges: []

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 1d37991f6bc62754dab24f51d6d5a7e9
guid: a54e6b742ff478d4d86574be423532eb
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
@ -80,24 +80,13 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 9dfd3c22eea5e0e4f99bb9a897bc5172
spriteID: 53e606c4ccc985d4b9e20cde070112e3
vertices: []
indices:
edges: []

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 527a5fdbc0932e2408822464c4cf45b4
guid: 76bca984e2f2d7f43952c1a9af0d3461
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
@ -80,24 +80,13 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: d43d32a718014bd4388f66e55ff22863
spriteID: 0be0efe7aa11bd3418efd045e7968693
vertices: []
indices:
edges: []

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 7ef3cf590dce82f4fb8b21919529c226
guid: fc63357d7a025d0448af265d91be7da3
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
@ -80,24 +80,13 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: d0fb469a8de2fd241a6fb5595c117909
spriteID: 18f3d73c31d110a4ba9696e077d88afe
vertices: []
indices:
edges: []

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 19563dd84c9b41747a153a5723d89816
guid: 471e6d9994c03684b86b0509ac3e6d5a
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
@ -80,24 +80,13 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 2ba96b7d774726d4b9a70613a672c901
spriteID: 9a306def6186ca6459fcf06f4e61573b
vertices: []
indices:
edges: []

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: cae782e0a65c7b344b6f733fd7def3fb
guid: 714e89565631c1d428f897a103b1094a
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
@ -80,24 +80,13 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 2233b81b94ce2874b836f9c017ac153b
spriteID: 802cfe7f1d0a30d4ca8bd32b2f4308b4
vertices: []
indices:
edges: []

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 62003825801b44a4eacf2ddc294e75cb
guid: 621e4d012024da648b5524f11f102add
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
@ -80,24 +80,13 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 96589aa5ed056024cb9e205a4ba5b024
spriteID: 65ec55efc5e74f047af6846943db95a4
vertices: []
indices:
edges: []

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 6690821bb958cd743b513dfb6bb9ba64
guid: 3d1487f69da0e1b4eb5d78947671c4be
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
@ -80,24 +80,13 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 4b7d15300dbbcb94c9feaed56535b2df
spriteID: d9b4a3f7ff4886540963e7ab5fc559ad
vertices: []
indices:
edges: []

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 34d56e8a9f9b10045a467440e6b641a4
guid: 665aabf4b1d964a4289e69ad1b13e0c2
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
@ -80,24 +80,13 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 2461c41cf3a782f4ca983cf719b5cf9e
spriteID: db2e2a3b9d9acfe468498022ed7d3754
vertices: []
indices:
edges: []

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 464c1ec69c0daa24aa36069229fbb5d2
guid: fda6b56bad4f63842aed0d142228800f
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
@ -80,24 +80,13 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: a87ed6c0d73d95e49ad696933b15e546
spriteID: c4f9bdfd9f51fe04f990519e9e2deb2d
vertices: []
indices:
edges: []

View File

@ -200,12 +200,13 @@ function CreateNamePopup:BindEvent()
-- 随机名称
Util.AddClick(this.btnRandName, function()
--local index = math.ceil(math.random(1, 6))
LogError("ttttttttttttttt")
NameManager.GetRandomNameData()
end)
Util.AddClick(this.btnRandNameNew, function()
LogError("cccccccccccccccc")
NameManager.GetRandomNameData()
end)

View File

@ -4,11 +4,11 @@ local this = {
roleSex = ROLE_SEX.BOY
}
local function readonly(t,k,v)
local function readonly(t, k, v)
Log(string.format("field \"%s\" is read-only", tostring(k)))
end
local function indexer(t,k)
local function indexer(t, k)
if not this[k] then
Log(string.format("field \"%s\" not found", tostring(k)))
end
@ -17,12 +17,14 @@ end
function this.Initialize()
end
function this.LateUpdate()
end
function this.SetRoleName(name)
this.roleName = name
end
function this.SetRoleSex(sex)
local str = sex == ROLE_SEX.BOY and Language[12147] or Language[12148]
Log(str)
@ -32,7 +34,13 @@ end
function this.GetLocalRandomName()
local random1 = math.random(1, RandomName.__count)
local random2 = math.random(1, RandomName.__count)
return GetLanguageStrById(RandomName[random1].Sur_name) .. GetLanguageStrById(RandomName[random2].Name)
if GetCurLanguage() == 1 then
return GetLanguageStrById(RandomName[random2].Name)
elseif GetCurLanguage() == 2 then
return GetLanguageStrById(RandomName[random2].Name)
else
return RandomName[random1].Sur_name .. RandomName[random2].Name
end
end
--得到任意名字数据
@ -42,15 +50,24 @@ function this.GetRandomNameData()
preName = GetLanguageStrById(preName)
postName = GetLanguageStrById(postName)
if GetCurLanguage() == 1 then
randomName = postName .. preName
randomName = string.gsub(postName, " ", "")
elseif GetCurLanguage() == 2 then
randomName = string.gsub(postName, " ", "") -- 使用单独名字去掉中间空格
randomName = string.gsub(postName, " ", "") -- 使用单独名字去掉中间空格
else
randomName = preName .. postName
end
Game.GlobalEvent:DispatchEvent(GameEvent.Player.OnNameChange, randomName)
else
if randomName ~= "" then
preName = GetLanguageStrById(preName)
postName = GetLanguageStrById(postName)
if GetCurLanguage() == 1 then
randomName = string.gsub(postName, " ", "")
elseif GetCurLanguage() == 2 then
randomName = string.gsub(postName, " ", "") -- 使用单独名字去掉中间空格
else
randomName = preName .. postName
end
Game.GlobalEvent:DispatchEvent(GameEvent.Player.OnNameChange, randomName)
end
end
@ -64,16 +81,17 @@ function this.CheckStringRight(str)
end
return true
end
--更改玩家姓名
function this.ChangeUserName(type, name, teamPosId, sex, callBack)
if not this.CheckStringRight(name) then
PopupTipPanel.ShowTip(Language[11340])
return
return
end
NetManager.ChangeUserNameRequest(type, name, teamPosId, sex, function()
-- 保存一下老名字,用于上报事件
local oldName = this.roleName
--
--
this.roleSex = sex
this.roleName = name
PlayerManager.nickName = name
@ -98,4 +116,4 @@ end
NameManager = {}
setmetatable(NameManager, { __index = indexer, __newindex = readonly })
return NameManager
return NameManager

File diff suppressed because it is too large Load Diff