diff --git a/lua/app/common/event_manager.lua b/lua/app/common/event_manager.lua
index 72b52f12..f06ada03 100644
--- a/lua/app/common/event_manager.lua
+++ b/lua/app/common/event_manager.lua
@@ -34,6 +34,7 @@ EventManager.CUSTOM_EVENT = {
CLOSE_BOX_OPEN_UI = "CLOSE_BOX_OPEN_UI",
BIND_ACCOUNT_SUCCESS = "BIND_ACCOUNT_SUCCESS",
CDKEY_FINISH = "CDKEY_FINISH", -- CDKEY
+ DUNGEON_DAY_CHANGE = "DUNGEON_DAY_CHANGE",-- 副本跨天更新
DUNGEON_CHALLENGE = "DUNGEON_CHALLENGE",-- 副本开始挑战
DUNGEON_SWEEP = "DUNGEON_SWEEP",-- 副本开始扫荡
PLAYER_INFO_CLICK_AVATAR = "PLAYER_INFO_CLICK_AVATAR",-- 个人信息选择头像
diff --git a/lua/app/config/localization/localization_global_const.lua b/lua/app/config/localization/localization_global_const.lua
index 2f2f4a67..72321066 100644
--- a/lua/app/config/localization/localization_global_const.lua
+++ b/lua/app/config/localization/localization_global_const.lua
@@ -257,6 +257,7 @@ local LocalizationGlobalConst =
NEW_PLAYER = "NEW_PLAYER",
NOTICE_TITLE = "NOTICE_TITLE",
MAINTENANCE_NOTICE_DEFAULT = "MAINTENANCE_NOTICE_DEFAULT",
+ CANNOT_RENAME_DESC_5 = "CANNOT_RENAME_DESC_5",
}
return LocalizationGlobalConst
\ No newline at end of file
diff --git a/lua/app/config/strings/cn/global.lua b/lua/app/config/strings/cn/global.lua
index cc29e71d..a592ca08 100644
--- a/lua/app/config/strings/cn/global.lua
+++ b/lua/app/config/strings/cn/global.lua
@@ -257,6 +257,7 @@ local localization_global =
["NEW_PLAYER"] = "新玩家",
["NOTICE_TITLE"] = "公告",
["MAINTENANCE_NOTICE_DEFAULT"] = "服务器正在加紧链接中,目前元素较多,请稍后重试进入。",
+ ["CANNOT_RENAME_DESC_5"] = "与当前昵称一致,无需更改",
}
return localization_global
\ No newline at end of file
diff --git a/lua/app/config/strings/es/skill.lua b/lua/app/config/strings/es/skill.lua
new file mode 100644
index 00000000..d1686679
--- /dev/null
+++ b/lua/app/config/strings/es/skill.lua
@@ -0,0 +1,81 @@
+local skill = {
+ [1200120]={
+ ["desc"]="Danza de Disipación: elimina 5 bloques horizontalmente, y causa un daño de habilidad."
+ },
+ [1300120]={
+ ["desc"]="Torbellino de Espada: causa varios daños de habilidad extras."
+ },
+ [1300220]={
+ ["desc"]="Puño Ardoroso: elimina 5 bloques verticalmente, y causa un daño de habilidad, con 50% de chance de agregar efecto de quemadura durante 2< /color> rondas."
+ },
+ [1400120]={
+ ["desc"]="Golpe de Acero: cambia el color de 4 elementos circundantes y causa varios daños de habilidad masivo."
+ },
+ [1400220]={
+
+ },
+ [2200120]={
+ ["desc"]="Corte Veloz: causa un daño de habilidad adicional."
+ },
+ [2300120]={
+ ["desc"]="Torbellino de Huesos: causa varios daños de habilidad adicionales."
+ },
+ [2300220]={
+ ["desc"]="Espada de Fantasía: aumenta el daño de habilidad y causa masivos daños de habilidad adicionales."
+ },
+ [2400120]={
+ ["desc"]="Espada Colosal: causa un golpe adicional de enorme daño de habilidad."
+ },
+ [2400220]={
+
+ },
+ [3200120]={
+ ["desc"]="Punzada de Lanza: causa un daño de habilidad adicional."
+ },
+ [3300120]={
+ ["desc"]="Cura Rápida: recupera la vida en esta ronda."
+ },
+ [3300220]={
+
+ },
+ [3400120]={
+ ["desc"]="Danza de Meteoro: aumenta el daño y causa un golpe adicional de enorme daño de habilidad."
+ },
+ [3400220]={
+
+ },
+ [4200120]={
+ ["desc"]="Enlace de Elementos: elimina 3 elementos aleatorios y causa un daño de habilidad."
+ },
+ [4300120]={
+
+ },
+ [4300220]={
+
+ },
+ [4400120]={
+ ["desc"]="Espada de Escarcha: elimina 3 elementos aleatorios, y causa un daño de habilidad con efecto de Escarcha durante 1 ronda."
+ },
+ [4400220]={
+
+ },
+ [5200120]={
+ ["desc"]="Hechizo Escudo: agrega un escudo al equipo durante 1 ronda."
+ },
+ [5300120]={
+
+ },
+ [5300220]={
+
+ },
+ [5400120]={
+
+ },
+ [5400220]={
+
+ }
+}
+local config = {
+data=skill,count=25
+}
+return config
\ No newline at end of file
diff --git a/lua/app/config/strings/es/skill.lua.meta b/lua/app/config/strings/es/skill.lua.meta
new file mode 100644
index 00000000..18d92f93
--- /dev/null
+++ b/lua/app/config/strings/es/skill.lua.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: b5c08463d66c3984887ea3e01ae53803
+ScriptedImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 2
+ userData:
+ assetBundleName:
+ assetBundleVariant:
+ script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}
diff --git a/lua/app/config/strings/id/skill.lua b/lua/app/config/strings/id/skill.lua
index 0f224d08..153d4aba 100644
--- a/lua/app/config/strings/id/skill.lua
+++ b/lua/app/config/strings/id/skill.lua
@@ -1,51 +1,51 @@
local skill = {
[1200120]={
-
+ ["desc"]="Tarian Dispersi: Menghapus 5 grid secara horizontal dan memberikan DMG skill sekali."
},
[1300120]={
-
+ ["desc"]="Topan Claymore: Memberikan DMG skill beberapa kali."
},
[1300220]={
-
+ ["desc"]="Pukulan Api: Menghapus 5 grid secara vertikal, memberikan DMG skill sekali, dan 50% peluang memberikan Scorch selama 2 giliran."
},
[1400120]={
-
+ ["desc"]="Strike Baja: Ubah warna 4 elemen yang berdekatan dan berikan DMG skill yang besar beberapa kali."
},
[1400220]={
},
[2200120]={
-
+ ["desc"]="Cabut Pedang: Memberikan satu DMG skill tambahan."
},
[2300120]={
-
+ ["desc"]="Topan Bone: Memberikan beberapa DMG skill tambahan."
},
[2300220]={
-
+ ["desc"]="Pedang Phantom: Meningkatkan DMG skill dan memberikan DMG skill beberapa kali."
},
[2400120]={
-
+ ["desc"]="Ledakan Claymore: Memberikan DMG skill tambahan yang sangat besar."
},
[2400220]={
},
[3200120]={
-
+ ["desc"]="Lance Burst: Memberikan satu DMG skill tambahan."
},
[3300120]={
-
+ ["desc"]="Pemulihan Cepat: Memulihkan HP pada giliran ini."
},
[3300220]={
},
[3400120]={
-
+ ["desc"]="Pemburu Bulan: Meningkatkan DMG dan memberikan DMG skill yang besar sekali."
},
[3400220]={
},
[4200120]={
-
+ ["desc"]="Link Elemen: Menghilangkan 3 elemen secara acak dan memberikan DMG skill."
},
[4300120]={
@@ -54,13 +54,13 @@ local skill = {
},
[4400120]={
-
+ ["desc"]="Tarian Pedang Frost: Menghapus 3 elemen acak dan memberikan damage skill sekali. Menimbulkan Freeze selama 1 giliran."
},
[4400220]={
},
[5200120]={
-
+ ["desc"]="Seni Perisai: Terapkan perisai ke tim untuk 1 giliran."
},
[5300120]={
diff --git a/lua/app/config/strings/ja/skill.lua b/lua/app/config/strings/ja/skill.lua
index 0f224d08..2b0f6c27 100644
--- a/lua/app/config/strings/ja/skill.lua
+++ b/lua/app/config/strings/ja/skill.lua
@@ -1,51 +1,51 @@
local skill = {
[1200120]={
-
+ ["desc"]="消滅の舞:横に5マスを消し、スキルを1回発動する。"
},
[1300120]={
-
+ ["desc"]="旋風切:追加でスキルを複数回発動する。"
},
[1300220]={
-
+ ["desc"]="ファイアパンチ:縦に5を消し、スキルを1回発動する。50%の確率で敵に2ターン⽕傷効果を付与する。"
},
[1400120]={
-
+ ["desc"]="ヘヴィーヒット:縦横4マスの元素を変え、大ダメージを与えるスキルを複数回発動する。"
},
[1400220]={
},
[2200120]={
-
+ ["desc"]="居合斬:追加でスキルを1回発動する。"
},
[2300120]={
-
+ ["desc"]="骨旋風:追加でスキルを複数回発動する。"
},
[2300220]={
-
+ ["desc"]="ファントムストライク:発動するとダメージが増加し、追加で大ダメージを与えるスキルを複数回発動する。"
},
[2400120]={
-
+ ["desc"]="大剣インパクト:追加で特⼤ダメージを与えるスキルを1回発動する。"
},
[2400220]={
},
[3200120]={
-
+ ["desc"]="ランススラスト:追加でスキルを1回発動する。"
},
[3300120]={
-
+ ["desc"]="急速回復:使用後HPを回復する。"
},
[3300220]={
},
[3400120]={
-
+ ["desc"]="ムーンチェイサー:発動するとダメージが増加し、特⼤ダメージを与えるスキルを1回発動する。"
},
[3400220]={
},
[4200120]={
-
+ ["desc"]="元素連接:ランダムで3つの元素を消し、スキルを1回発動する。"
},
[4300120]={
@@ -54,13 +54,13 @@ local skill = {
},
[4400120]={
-
+ ["desc"]="フロストソードダンス:ランダムで3つの元素を消し、1ターンフロスト効果付きのスキルを1回発動する。"
},
[4400220]={
},
[5200120]={
-
+ ["desc"]="シールド術:味方全員に1ターンシールドを付与する。"
},
[5300120]={
diff --git a/lua/app/config/strings/ko/skill.lua b/lua/app/config/strings/ko/skill.lua
index 0f224d08..4084915f 100644
--- a/lua/app/config/strings/ko/skill.lua
+++ b/lua/app/config/strings/ko/skill.lua
@@ -1,51 +1,51 @@
local skill = {
[1200120]={
-
+ ["desc"]="무희의 춤: 가로 방향으로 5개의 그리드를 소멸하고 스킬 피해를 한 번 입힙니다."
},
[1300120]={
-
+ ["desc"]="클레이모어 회오리바람: 여러 번의 스킬 피해를 추가로 입힙니다."
},
[1300220]={
-
+ ["desc"]="블레이징 펀치: 세로 방향으로 5개의 그리드를 소멸하고 스킬 피해를 한 번 입힙니다. 50% 확률로 2턴 동안 버닝 효과를 추가합니다."
},
[1400120]={
-
+ ["desc"]="강철 스트라이크: 주위4개 원소의 색상을 변경하며 큰 피해를 여러 차례 입힙니다."
},
[1400220]={
},
[2200120]={
-
+ ["desc"]="진검 베기: 추가로 스킬 피해를 한 번 입힙니다."
},
[2300120]={
-
+ ["desc"]="뼈의 회오리바람: 추가로 스킬 피해를 여러 차례 입힙니다."
},
[2300220]={
-
+ ["desc"]="팬텀 소드: 사용 후, 이번 스킬의 대미지가 상승하며 추가로 스킬 피해를 여러 차례 입힙니다."
},
[2400120]={
-
+ ["desc"]="클레이모어 폭격: 추가로 엄청난 양의 스킬 피해를 한 번 입힙니다."
},
[2400220]={
},
[3200120]={
-
+ ["desc"]="장창 돌격: 추가로 스킬 피해를 한 번 입힙니다."
},
[3300120]={
-
+ ["desc"]="신속한 치유: 사용 후, 이번 턴에 HP를 회복합니다."
},
[3300220]={
},
[3400120]={
-
+ ["desc"]="유성과 달의 숨바꼭질: 사용 후, 이번 공격 대미지가 상승하며 엄청난 양의 스킬 피해를 한 번 입힙니다."
},
[3400220]={
},
[4200120]={
-
+ ["desc"]="원소 연결: 무작위로 3개의 원소를 소멸하고 스킬 피해를 한 번 입힙니다."
},
[4300120]={
@@ -54,13 +54,13 @@ local skill = {
},
[4400120]={
-
+ ["desc"]="눈과 서리의 검무: 무작위로 3개의 원소를 소멸하고 한 번의 스킬 피해를 입히는 동시에 1턴 동안 얼어붙음 효과를 부여합니다."
},
[4400220]={
},
[5200120]={
-
+ ["desc"]="보호막 기술: 팀에게 1턴 동안 보호막을 추가합니다."
},
[5300120]={
diff --git a/lua/app/config/strings/pt/skill.lua b/lua/app/config/strings/pt/skill.lua
index 0f224d08..0b929076 100644
--- a/lua/app/config/strings/pt/skill.lua
+++ b/lua/app/config/strings/pt/skill.lua
@@ -1,51 +1,51 @@
local skill = {
[1200120]={
-
+ ["desc"]="Dança Dissipadora: elimina 5 blocos horizontalmente e causa um dano de habilidade."
},
[1300120]={
-
+ ["desc"]="Turbilhão de Espadão: causa vários golpes adicionais de dano de habilidade."
},
[1300220]={
-
+ ["desc"]="Punho Flamejante: elimina 5 blocos verticalmente e causa um dano de habilidade, com 50% de chance de acionar Conflagração por 2 turnos."
},
[1400120]={
-
+ ["desc"]="Golpe Metálico: muda a cor dos 4 elementos ao redor e causa vários golpes de dano de habilidade massivo."
},
[1400220]={
},
[2200120]={
-
+ ["desc"]="Corte Veloz: causa mais um golpe de dano de habilidade."
},
[2300120]={
-
+ ["desc"]="Redemoinho de Ossos: causa vários golpes adicionais de dano de habilidade."
},
[2300220]={
-
+ ["desc"]="Golpe da Espada Ilusória: aumenta o dano de habilidade no turno atual e causa mais golpes de dano de habilidade massivo."
},
[2400120]={
-
+ ["desc"]="Colisão Colossal: causa um golpe de enorme dano de habilidade."
},
[2400220]={
},
[3200120]={
-
+ ["desc"]="Perfuração de Lança: causa mais um golpe de dano de habilidade."
},
[3300120]={
-
+ ["desc"]="Cura Rápida: recupera a vida no turno atual."
},
[3300220]={
},
[3400120]={
-
+ ["desc"]="Disparada do Meteoro: aumenta o dano causado no turno atual e causa um golpe de enorme dano de habilidade."
},
[3400220]={
},
[4200120]={
-
+ ["desc"]="Elo Elemental: elimina 3 elementos aleatórios e causa um golpe de dano de habilidade."
},
[4300120]={
@@ -54,13 +54,13 @@ local skill = {
},
[4400120]={
-
+ ["desc"]="Esgrima Enregelante: elimina 3 elementos aleatórios e causa um golpe de dano de habilidade, acionando Gelidez por 1 turno."
},
[4400220]={
},
[5200120]={
-
+ ["desc"]="Feitiço de Amparo: adiciona um escudo à equipe por 1 turno."
},
[5300120]={
diff --git a/lua/app/config/strings/th/skill.lua b/lua/app/config/strings/th/skill.lua
index 0f224d08..1510de2b 100644
--- a/lua/app/config/strings/th/skill.lua
+++ b/lua/app/config/strings/th/skill.lua
@@ -1,51 +1,51 @@
local skill = {
[1200120]={
-
+ ["desc"]="ท่าเต้นกระจาย: กำจัด5ช่องตามแนวนอน และสร้างดาเมจสกิล 1 ครั้ง"
},
[1300120]={
-
+ ["desc"]="ลมกรดดาบ: สร้างดาเมจสกิลเพิ่มเติมหลายครั้ง"
},
[1300220]={
-
+ ["desc"]="หมัดเพลิง: กำจัด 5ช่องตามแนวตั้ง และสร้างดาเมจสกิล 1 ครั้ง มีโอกาส50%เพิ่มเอฟเฟกต์การเผาไหม้ 2 รอบ"
},
[1400120]={
-
+ ["desc"]="เหล็กตีหนัก: เปลี่ยนสีของธาตุ4อันที่อยู่รอบ ๆ และสร้างดาเมจสกิลมหาศาลหลายครั้ง"
},
[1400220]={
},
[2200120]={
-
+ ["desc"]="จั่วดาบเพื่อสับ: สร้างคดาเมจสกิลเพิ่มเติม 1 ครั้ง"
},
[2300120]={
-
+ ["desc"]="ลมกรดกระดูก: สร้างดาเมจสกิลเพิ่มเติมหลายครั้ง"
},
[2300220]={
-
+ ["desc"]="ดาบมายาบุก: ดาเมจสกิลครั้งนี้จะเพิ่มขึ้นหลังจากการใช้ และสร้างดาเมจสกิลมหาศาลเพิ่มเติมหลายครั้ง"
},
[2400120]={
-
+ ["desc"]="ดาบยักษ์โจมตี: สร้างดาเมจสกิลมหาศาลเพิ่มเติม 1 ครั้ง"
},
[2400220]={
},
[3200120]={
-
+ ["desc"]="หอกยาวแทง: สร้างคดาเมจสกิลเพิ่มเติม 1 ครั้ง"
},
[3300120]={
-
+ ["desc"]="รักษาด่วน: ฟื้นฟู HP ในครั้งนี้หลังจากการใช้"
},
[3300220]={
},
[3400120]={
-
+ ["desc"]="ดาวตกไล่ดวงจันทร์: ดาเมจครั้งนี้จะเพิ่มขึ้นหลังจากการใช้ และสร้างดาเมจสกิลมหาศาล 1 ครั้ง"
},
[3400220]={
},
[4200120]={
-
+ ["desc"]="การเชื่อมโยงธาตุ: สุ่มกำจัดธาตุ3อัน และสร้างดาเมจสกิล 1 ครั้ง"
},
[4300120]={
@@ -54,13 +54,13 @@ local skill = {
},
[4400120]={
-
+ ["desc"]="ระบำดาบฟรอสต์: สุ่มกำจัดธาตุ3อัน และสร้างดาเมจสกิล 1 ครั้ง เพิ่มเอฟเฟกต์ฟรอสต์ 1รอบ"
},
[4400220]={
},
[5200120]={
-
+ ["desc"]="มนต์โล่: เพิ่มโล่ 1 อันให้ทีม 1รอบ"
},
[5300120]={
diff --git a/lua/app/config/strings/vi/skill.lua b/lua/app/config/strings/vi/skill.lua
index 0f224d08..fc6487eb 100644
--- a/lua/app/config/strings/vi/skill.lua
+++ b/lua/app/config/strings/vi/skill.lua
@@ -1,51 +1,51 @@
local skill = {
[1200120]={
-
+ ["desc"]="Bước Nhảy Xua Tan: Xua tan 5 ô theo hàng ngang, gây 1 lần sát thương kỹ năng."
},
[1300120]={
-
+ ["desc"]="Lốc Xoáy Cự Kiếm: Gây thêm nhiều lần sát thương kỹ năng."
},
[1300220]={
-
+ ["desc"]="Viêm Quyền: Xua tan 5 ô theo hàng dọc, và gây 1 lần sát thương kỹ năng, có 50% kèm Thiêu Đốt, 2 hiệp."
},
[1400120]={
-
+ ["desc"]="Trọng Kích Sắt Thép: 4 Nguyên Tố xung quanh đổi màu, gây nhiều lần sát thương kỹ năng."
},
[1400220]={
},
[2200120]={
-
+ ["desc"]="Đao Trảm: Gây thêm 1 lần sát thương kỹ năng."
},
[2300120]={
-
+ ["desc"]="Lốc Xoáy Xương: Gây thêm nhiều lần sát thương kỹ năng"
},
[2300220]={
-
+ ["desc"]="Ảo Ảnh Kiếm Kích: Dùng xong tăng sát thương kỹ năng lần này, gây thêm nhiều lần sát thương kỹ năng."
},
[2400120]={
-
+ ["desc"]="Cự Kiếm Oanh Kích: Gây thêm 1 lần sát thương kỹ năng cực lớn."
},
[2400220]={
},
[3200120]={
-
+ ["desc"]="Trường Thương Đột Kích: Gây thêm 1 lần sát thương kỹ năng."
},
[3300120]={
-
+ ["desc"]="Trị Liệu Cấp Tốc: Dùng xong lần này hồi phục HP."
},
[3300220]={
},
[3400120]={
-
+ ["desc"]="Sao Băng Siêu Tốc: Dùng xong tăng sát thương lần này, 1 lần sát thương kỹ năng cực lớn."
},
[3400220]={
},
[4200120]={
-
+ ["desc"]="Liên Kết Nguyên Tố: Ngẫu nhiên xua tan 3 Nguyên Tố, gây 1 lần sát thương kỹ năng."
},
[4300120]={
@@ -54,13 +54,13 @@ local skill = {
},
[4400120]={
-
+ ["desc"]="Băng Sương Kiếm Vũ: Ngẫu nhiên xua tan 3 Nguyên Tố, gây 1 lần sát thương kỹ năng, kèm Băng Sương, 1 hiệp."
},
[4400220]={
},
[5200120]={
-
+ ["desc"]="Thuật Khiên: Giúp đồng đội nhận 1 Khiên, 1 hiệp."
},
[5300120]={
diff --git a/lua/app/config/strings/zh/skill.lua b/lua/app/config/strings/zh/skill.lua
index c41ae376..f2676d57 100644
--- a/lua/app/config/strings/zh/skill.lua
+++ b/lua/app/config/strings/zh/skill.lua
@@ -21,7 +21,7 @@ local skill = {
["desc"]="骨旋風:額外造成數次技能傷害。"
},
[2300220]={
- ["desc"]="幻影劍襲:使用後本次傷害提高,並額外造成數次大量技能傷害。"
+ ["desc"]="幻影劍襲:使用後本次技能傷害提高,並額外造成數次大量技能傷害。"
},
[2400120]={
["desc"]="巨劍轟擊:額外造成一次巨大技能傷害。"
diff --git a/lua/app/ui/dungeon/dungeon_difficulty_ui.lua b/lua/app/ui/dungeon/dungeon_difficulty_ui.lua
index 4a9d900c..b6eac838 100644
--- a/lua/app/ui/dungeon/dungeon_difficulty_ui.lua
+++ b/lua/app/ui/dungeon/dungeon_difficulty_ui.lua
@@ -107,6 +107,9 @@ function DungeonDifficultyUI:onLoadRootComplete()
self:refreshDifficulty()
end)
+ self:addEventListener(EventManager.CUSTOM_EVENT.DUNGEON_DAY_CHANGE, function()
+ self:closeUI()
+ end)
self:addEventListener(EventManager.CUSTOM_EVENT.DUNGEON_CHALLENGE, function()
self:closeUI()
end)
diff --git a/lua/app/ui/player_info/player_info_ui.lua b/lua/app/ui/player_info/player_info_ui.lua
index 5f1d93d0..1622d6d8 100644
--- a/lua/app/ui/player_info/player_info_ui.lua
+++ b/lua/app/ui/player_info/player_info_ui.lua
@@ -84,6 +84,7 @@ function PlayerInfoUI:onLoadRootComplete()
self.selectAvatarId = id
self.scrollRectCompAvatar:updateAllCell()
self:refreshDesc()
+ self:refreshAvatarAndFrame()
end)
self:addEventListener(EventManager.CUSTOM_EVENT.PLAYER_INFO_CLICK_FRAME, function(id)
if self.selectFrameId == id then
@@ -95,6 +96,7 @@ function PlayerInfoUI:onLoadRootComplete()
self.selectFrameId = id
self.scrollRectCompFrame:updateAllCell()
self:refreshDesc()
+ self:refreshAvatarAndFrame()
end)
self:bind(DataManager.PlayerData, "dirty", function()
self:onRefresh()
@@ -103,16 +105,9 @@ end
function PlayerInfoUI:onRefresh()
self:refreshScrollrect()
+ self:refreshAvatarAndFrame()
self.txTitle:setText(I18N:getGlobalText(I18N.GlobalConst.PLAYER_INFO))
- local avatarName = DataManager.PlayerData:getAvatarIconId(DataManager.PlayerData:getUsingAvatarId())
- if avatarName then
- self.imgAvatar:setSprite(GConst.ATLAS_PATH.ICON_HERO, avatarName)
- end
- local frameName = DataManager.PlayerData:getFrameIconId(DataManager.PlayerData:getUsingFrameId())
- if frameName then
- self.imgFrame:setSprite(GConst.ATLAS_PATH.ICON_AVATAR, frameName)
- end
local lv = DataManager.PlayerData:getLv()
local exp = DataManager.PlayerData:getExpPercent()
self.txLevel:setText(GConst.INT_TO_STRING[lv] or tostring(lv))
@@ -200,6 +195,18 @@ function PlayerInfoUI:showFrame()
self:refreshDesc()
end
+-- 刷新头像和头像框
+function PlayerInfoUI:refreshAvatarAndFrame()
+ local avatarName = DataManager.PlayerData:getAvatarIconId(self.selectAvatarId)
+ if avatarName then
+ self.imgAvatar:setSprite(GConst.ATLAS_PATH.ICON_HERO, avatarName)
+ end
+ local frameName = DataManager.PlayerData:getFrameIconId(self.selectFrameId)
+ if frameName then
+ self.imgFrame:setSprite(GConst.ATLAS_PATH.ICON_AVATAR, frameName)
+ end
+end
+
-- 刷新描述
function PlayerInfoUI:refreshDesc()
if self.curTag == TAG.AVATAR then
diff --git a/lua/app/ui/player_info/rename_ui.lua b/lua/app/ui/player_info/rename_ui.lua
index 73eb76bd..d2b29c76 100644
--- a/lua/app/ui/player_info/rename_ui.lua
+++ b/lua/app/ui/player_info/rename_ui.lua
@@ -34,6 +34,23 @@ function RenameUI:onLoadRootComplete()
self.closeBtn = self.uiMap["rename_ui.bg.close_btn"]
self.inputField = self.input:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_TMP_INPUT_FIELD)
+ self.btnOk:addClickListener(function ()
+ if self.constId ~= nil and self.constNum ~= nil and not GFunc.checkCost(self.constId, self.constNum, true) then
+ return
+ end
+ self:onRename()
+ end)
+ self.closeBtn:addClickListener(function ()
+ UIManager:showUI("app/ui/player_info/player_info_ui")
+ self:closeUI()
+ end)
+ self:addEventListener(EventManager.CUSTOM_EVENT.RENAME_SUCCESS, function()
+ UIManager:showUI("app/ui/player_info/player_info_ui")
+ self:closeUI()
+ end)
+end
+
+function RenameUI:onRefresh()
self.inputField.text = ""
self.txTitle:setText(I18N:getGlobalText(I18N.GlobalConst.RENAME_DESC))
self.txDesc:setText(I18N:getGlobalText(I18N.GlobalConst.ENTER_NAME_DESC))
@@ -67,24 +84,6 @@ function RenameUI:onLoadRootComplete()
end
GFunc.centerImgAndTx(self.iconCost, self.txConst)
end
-
- self.btnOk:addClickListener(function ()
- if self.constId ~= nil and self.constNum ~= nil and not GFunc.checkCost(self.constId, self.constNum, true) then
- return
- end
- self:onRename()
- end)
- self.closeBtn:addClickListener(function ()
- UIManager:showUI("app/ui/player_info/player_info_ui")
- self:closeUI()
- end)
- self:addEventListener(EventManager.CUSTOM_EVENT.RENAME_SUCCESS, function()
- UIManager:showUI("app/ui/player_info/player_info_ui")
- self:closeUI()
- end)
-end
-
-function RenameUI:onRefresh()
end
function RenameUI:onRename()
@@ -102,6 +101,10 @@ function RenameUI:onRename()
GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.CANNOT_RENAME_DESC_3))
return
end
+ if input == DataManager.PlayerData:getNickname() then
+ GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.CANNOT_RENAME_DESC_5))
+ return
+ end
ModuleManager.PlayerManager:reqChangeNickname(input)
end
diff --git a/lua/app/userdata/dungeon/dungeon_data.lua b/lua/app/userdata/dungeon/dungeon_data.lua
index 88959aac..eb74d808 100644
--- a/lua/app/userdata/dungeon/dungeon_data.lua
+++ b/lua/app/userdata/dungeon/dungeon_data.lua
@@ -73,6 +73,7 @@ function DungeonData:onDayChange()
self:initDungeonGold(self.data.gold)
self:initDungeonShards(self.data.shards)
+ EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.DUNGEON_DAY_CHANGE)
end
-- 客户端处理副本次数+1的情况
diff --git a/lua/app/userdata/player/player_data.lua b/lua/app/userdata/player/player_data.lua
index f5278af0..1f83ae68 100644
--- a/lua/app/userdata/player/player_data.lua
+++ b/lua/app/userdata/player/player_data.lua
@@ -238,6 +238,7 @@ end
-- 设置玩家昵称
function PlayerData:setNickname(name)
self.data.playInfo.nickName = name
+ self.data.playInfo.nameChanged = true
self:markDirty()
end
@@ -261,7 +262,6 @@ end
-- 设置玩家使用的头像
function PlayerData:setAvatarUsing(id)
self.data.playInfo.usingAvatarId = id
- self.data.playInfo.nameChanged = true
self:markDirty()
end