diff --git a/lua/app/config/avatar.lua b/lua/app/config/avatar.lua new file mode 100644 index 00000000..bcd711b1 --- /dev/null +++ b/lua/app/config/avatar.lua @@ -0,0 +1,21 @@ +local avatar = { + [1001]={ + ["hero"]=12001 + }, + [2001]={ + ["hero"]=22001, + ["unlock"]=1 + }, + [3001]={ + ["hero"]=32001, + ["unlock"]=1 + }, + [4001]={ + ["hero"]=42001, + ["unlock"]=1 + } +} +local config = { +data=avatar,count=4 +} +return config \ No newline at end of file diff --git a/lua/app/config/avatar.lua.meta b/lua/app/config/avatar.lua.meta new file mode 100644 index 00000000..f92e8cec --- /dev/null +++ b/lua/app/config/avatar.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 8d3c3e28eaf46a94287e7509be47d216 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/avatar_frame.lua b/lua/app/config/avatar_frame.lua new file mode 100644 index 00000000..584db941 --- /dev/null +++ b/lua/app/config/avatar_frame.lua @@ -0,0 +1,9 @@ +local avatar_frame = { + [1000]={ + ["unlock"]=1 + } +} +local config = { +data=avatar_frame,count=1 +} +return config \ No newline at end of file diff --git a/lua/app/config/avatar_frame.lua.meta b/lua/app/config/avatar_frame.lua.meta new file mode 100644 index 00000000..82b8808b --- /dev/null +++ b/lua/app/config/avatar_frame.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 0bf07daf8913b274e9d0b0b3a5fad0d1 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/chapter.lua b/lua/app/config/chapter.lua index 782bd03e..fb2ededa 100644 --- a/lua/app/config/chapter.lua +++ b/lua/app/config/chapter.lua @@ -6070,7 +6070,7 @@ local chapter = { }, [30]={ ["before_chapter"]=29, - ["next_chapter"]=29, + ["next_chapter"]=31, ["icon"]="chapter_25", ["scene"]="bg_25", ["block_icon"]="battle_hinder_25", @@ -6289,7 +6289,7 @@ local chapter = { }, [31]={ ["before_chapter"]=30, - ["next_chapter"]=30, + ["next_chapter"]=32, ["icon"]="chapter_25", ["scene"]="bg_25", ["block_icon"]="battle_hinder_25", @@ -6508,7 +6508,7 @@ local chapter = { }, [32]={ ["before_chapter"]=31, - ["next_chapter"]=31, + ["next_chapter"]=33, ["icon"]="chapter_25", ["scene"]="bg_25", ["block_icon"]="battle_hinder_25", @@ -6727,7 +6727,7 @@ local chapter = { }, [33]={ ["before_chapter"]=32, - ["next_chapter"]=32, + ["next_chapter"]=34, ["icon"]="chapter_25", ["scene"]="bg_25", ["block_icon"]="battle_hinder_25", @@ -6946,7 +6946,7 @@ local chapter = { }, [34]={ ["before_chapter"]=33, - ["next_chapter"]=33, + ["next_chapter"]=35, ["icon"]="chapter_25", ["scene"]="bg_25", ["block_icon"]="battle_hinder_25", diff --git a/lua/app/config/const.lua b/lua/app/config/const.lua index 2929248d..efc50829 100644 --- a/lua/app/config/const.lua +++ b/lua/app/config/const.lua @@ -223,9 +223,19 @@ local const = { }, ["dungeon_shards_limit"]={ ["value"]=2 + }, + ["change_name_cost"]={ + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } } } local config = { -data=const,count=47 +data=const,count=48 } return config \ No newline at end of file diff --git a/lua/app/config/localization/localization_global_const.lua b/lua/app/config/localization/localization_global_const.lua index 2388e36d..0f288b1f 100644 --- a/lua/app/config/localization/localization_global_const.lua +++ b/lua/app/config/localization/localization_global_const.lua @@ -229,6 +229,7 @@ local LocalizationGlobalConst = DUNGEON_SHARDS_OPEN = "DUNGEON_SHARDS_OPEN", MAIN_CHAPTER = "MAIN_CHAPTER", SMASH = "SMASH", + DUNGEON_DESC = "DUNGEON_DESC", } return LocalizationGlobalConst \ No newline at end of file diff --git a/lua/app/config/strings/cn/avatar.lua b/lua/app/config/strings/cn/avatar.lua new file mode 100644 index 00000000..a287f2de --- /dev/null +++ b/lua/app/config/strings/cn/avatar.lua @@ -0,0 +1,18 @@ +local avatar = { + [1001]={ + ["desc"]="解锁舞女后获得。" + }, + [2001]={ + ["desc"]="刀妹的头像。" + }, + [3001]={ + ["desc"]="洋葱头的头像。" + }, + [4001]={ + ["desc"]="冰心的头像。" + } +} +local config = { +data=avatar,count=4 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/cn/avatar.lua.meta b/lua/app/config/strings/cn/avatar.lua.meta new file mode 100644 index 00000000..ad39e62f --- /dev/null +++ b/lua/app/config/strings/cn/avatar.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 7ab9ad8c53741f74db70394c459f5ddc +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/cn/avatar_frame.lua b/lua/app/config/strings/cn/avatar_frame.lua new file mode 100644 index 00000000..d951a5a2 --- /dev/null +++ b/lua/app/config/strings/cn/avatar_frame.lua @@ -0,0 +1,9 @@ +local avatar_frame = { + [1000]={ + ["desc"]="初始头像框" + } +} +local config = { +data=avatar_frame,count=1 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/cn/avatar_frame.lua.meta b/lua/app/config/strings/cn/avatar_frame.lua.meta new file mode 100644 index 00000000..070fca6f --- /dev/null +++ b/lua/app/config/strings/cn/avatar_frame.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 854572b70505d6f49b8709e3414a100f +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/cn/global.lua b/lua/app/config/strings/cn/global.lua index b188bea5..91445e2b 100644 --- a/lua/app/config/strings/cn/global.lua +++ b/lua/app/config/strings/cn/global.lua @@ -12,7 +12,7 @@ local localization_global = ["BTN_TEXT_OK"] = "确定", ["BATTLE_DESC_1"] = "是否退出战斗", ["ITEM_NOT_ENOUGH"] = "{0}不足", - ["START_DESC"] = "开始", + ["START_DESC"] = "SUI", ["ELEMENT_NAME_1"] = "红色元素", ["ELEMENT_NAME_2"] = "金色元素", ["ELEMENT_NAME_3"] = "绿色元素", @@ -229,6 +229,7 @@ local localization_global = ["DUNGEON_SHARDS_OPEN"] = "开启时间：周一、周三、周五、周日", ["MAIN_CHAPTER"] = "主线章节", ["SMASH"] = "扫荡", + ["DUNGEON_DESC"] = "BOSS抗性：", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/de/avatar.lua b/lua/app/config/strings/de/avatar.lua new file mode 100644 index 00000000..5cfc5f31 --- /dev/null +++ b/lua/app/config/strings/de/avatar.lua @@ -0,0 +1,18 @@ +local avatar = { + [1001]={ + + }, + [2001]={ + + }, + [3001]={ + + }, + [4001]={ + + } +} +local config = { +data=avatar,count=4 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/de/avatar.lua.meta b/lua/app/config/strings/de/avatar.lua.meta new file mode 100644 index 00000000..fbcdff37 --- /dev/null +++ b/lua/app/config/strings/de/avatar.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: b80d583de1bab0249b1c2ea7e2b39f19 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/de/avatar_frame.lua b/lua/app/config/strings/de/avatar_frame.lua new file mode 100644 index 00000000..ef3a097e --- /dev/null +++ b/lua/app/config/strings/de/avatar_frame.lua @@ -0,0 +1,9 @@ +local avatar_frame = { + [1000]={ + ["desc"]="Rundes Avatar, automatisch verfügbar." + } +} +local config = { +data=avatar_frame,count=1 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/de/avatar_frame.lua.meta b/lua/app/config/strings/de/avatar_frame.lua.meta new file mode 100644 index 00000000..ac50ab36 --- /dev/null +++ b/lua/app/config/strings/de/avatar_frame.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 6646cef1053957f498996449942e317b +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/en/avatar.lua b/lua/app/config/strings/en/avatar.lua new file mode 100644 index 00000000..5cfc5f31 --- /dev/null +++ b/lua/app/config/strings/en/avatar.lua @@ -0,0 +1,18 @@ +local avatar = { + [1001]={ + + }, + [2001]={ + + }, + [3001]={ + + }, + [4001]={ + + } +} +local config = { +data=avatar,count=4 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/en/avatar.lua.meta b/lua/app/config/strings/en/avatar.lua.meta new file mode 100644 index 00000000..a9aa2d90 --- /dev/null +++ b/lua/app/config/strings/en/avatar.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 9569dbcc21310dd4892f99b934dacdf1 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/en/avatar_frame.lua b/lua/app/config/strings/en/avatar_frame.lua new file mode 100644 index 00000000..34811851 --- /dev/null +++ b/lua/app/config/strings/en/avatar_frame.lua @@ -0,0 +1,9 @@ +local avatar_frame = { + [1000]={ + ["desc"]="The default avatar frame." + } +} +local config = { +data=avatar_frame,count=1 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/en/avatar_frame.lua.meta b/lua/app/config/strings/en/avatar_frame.lua.meta new file mode 100644 index 00000000..85703584 --- /dev/null +++ b/lua/app/config/strings/en/avatar_frame.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: c4d871056db7f784c8c8346a2a757b6a +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/fr/avatar.lua b/lua/app/config/strings/fr/avatar.lua new file mode 100644 index 00000000..5cfc5f31 --- /dev/null +++ b/lua/app/config/strings/fr/avatar.lua @@ -0,0 +1,18 @@ +local avatar = { + [1001]={ + + }, + [2001]={ + + }, + [3001]={ + + }, + [4001]={ + + } +} +local config = { +data=avatar,count=4 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/fr/avatar.lua.meta b/lua/app/config/strings/fr/avatar.lua.meta new file mode 100644 index 00000000..56ef60b5 --- /dev/null +++ b/lua/app/config/strings/fr/avatar.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 9e880ced67030724b8e10531e93925aa +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/fr/avatar_frame.lua b/lua/app/config/strings/fr/avatar_frame.lua new file mode 100644 index 00000000..bcfbcb72 --- /dev/null +++ b/lua/app/config/strings/fr/avatar_frame.lua @@ -0,0 +1,9 @@ +local avatar_frame = { + [1000]={ + ["desc"]="Cadre de tête arrondie, disponible au tout début." + } +} +local config = { +data=avatar_frame,count=1 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/fr/avatar_frame.lua.meta b/lua/app/config/strings/fr/avatar_frame.lua.meta new file mode 100644 index 00000000..827c15c0 --- /dev/null +++ b/lua/app/config/strings/fr/avatar_frame.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: c17fae36e98d089418b7172a74c0f72b +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/id/avatar.lua b/lua/app/config/strings/id/avatar.lua new file mode 100644 index 00000000..5cfc5f31 --- /dev/null +++ b/lua/app/config/strings/id/avatar.lua @@ -0,0 +1,18 @@ +local avatar = { + [1001]={ + + }, + [2001]={ + + }, + [3001]={ + + }, + [4001]={ + + } +} +local config = { +data=avatar,count=4 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/id/avatar.lua.meta b/lua/app/config/strings/id/avatar.lua.meta new file mode 100644 index 00000000..e1310f32 --- /dev/null +++ b/lua/app/config/strings/id/avatar.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 3ebd55d0b39273a489c43c02889dcabd +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/id/avatar_frame.lua b/lua/app/config/strings/id/avatar_frame.lua new file mode 100644 index 00000000..859f1807 --- /dev/null +++ b/lua/app/config/strings/id/avatar_frame.lua @@ -0,0 +1,9 @@ +local avatar_frame = { + [1000]={ + ["desc"]="Bingkai Avatar bulat, dimiliki dari awal." + } +} +local config = { +data=avatar_frame,count=1 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/id/avatar_frame.lua.meta b/lua/app/config/strings/id/avatar_frame.lua.meta new file mode 100644 index 00000000..12ad405e --- /dev/null +++ b/lua/app/config/strings/id/avatar_frame.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: d0df14a4c7def2b4dba7e30aa219d179 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/ja/avatar.lua b/lua/app/config/strings/ja/avatar.lua new file mode 100644 index 00000000..5cfc5f31 --- /dev/null +++ b/lua/app/config/strings/ja/avatar.lua @@ -0,0 +1,18 @@ +local avatar = { + [1001]={ + + }, + [2001]={ + + }, + [3001]={ + + }, + [4001]={ + + } +} +local config = { +data=avatar,count=4 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/avatar.lua.meta b/lua/app/config/strings/ja/avatar.lua.meta new file mode 100644 index 00000000..7465c67b --- /dev/null +++ b/lua/app/config/strings/ja/avatar.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 56e74edf74e085649a1d58b52050bf83 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/ja/avatar_frame.lua b/lua/app/config/strings/ja/avatar_frame.lua new file mode 100644 index 00000000..f7ef47d4 --- /dev/null +++ b/lua/app/config/strings/ja/avatar_frame.lua @@ -0,0 +1,9 @@ +local avatar_frame = { + [1000]={ + ["desc"]="丸いフレーム、デフォルト獲得可能。" + } +} +local config = { +data=avatar_frame,count=1 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/avatar_frame.lua.meta b/lua/app/config/strings/ja/avatar_frame.lua.meta new file mode 100644 index 00000000..48ddcb38 --- /dev/null +++ b/lua/app/config/strings/ja/avatar_frame.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 713a1bacc42589f49a5309bc4a7f064a +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/ko/avatar.lua b/lua/app/config/strings/ko/avatar.lua new file mode 100644 index 00000000..5cfc5f31 --- /dev/null +++ b/lua/app/config/strings/ko/avatar.lua @@ -0,0 +1,18 @@ +local avatar = { + [1001]={ + + }, + [2001]={ + + }, + [3001]={ + + }, + [4001]={ + + } +} +local config = { +data=avatar,count=4 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/avatar.lua.meta b/lua/app/config/strings/ko/avatar.lua.meta new file mode 100644 index 00000000..e22d6f8b --- /dev/null +++ b/lua/app/config/strings/ko/avatar.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: b4194298591232d469bee8927cca98ee +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/ko/avatar_frame.lua b/lua/app/config/strings/ko/avatar_frame.lua new file mode 100644 index 00000000..3de6c655 --- /dev/null +++ b/lua/app/config/strings/ko/avatar_frame.lua @@ -0,0 +1,9 @@ +local avatar_frame = { + [1000]={ + ["desc"]="둥글고 윤택한 아이콘 프레임이며 기본으로 제공됩니다." + } +} +local config = { +data=avatar_frame,count=1 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/avatar_frame.lua.meta b/lua/app/config/strings/ko/avatar_frame.lua.meta new file mode 100644 index 00000000..139a1b7e --- /dev/null +++ b/lua/app/config/strings/ko/avatar_frame.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 81ee6a8c01c550649bd38da09fcb4c99 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/pt/avatar.lua b/lua/app/config/strings/pt/avatar.lua new file mode 100644 index 00000000..5cfc5f31 --- /dev/null +++ b/lua/app/config/strings/pt/avatar.lua @@ -0,0 +1,18 @@ +local avatar = { + [1001]={ + + }, + [2001]={ + + }, + [3001]={ + + }, + [4001]={ + + } +} +local config = { +data=avatar,count=4 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/pt/avatar.lua.meta b/lua/app/config/strings/pt/avatar.lua.meta new file mode 100644 index 00000000..6d2aa709 --- /dev/null +++ b/lua/app/config/strings/pt/avatar.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: a3046085d8ac78c4ea564cd0cae61a52 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/pt/avatar_frame.lua b/lua/app/config/strings/pt/avatar_frame.lua new file mode 100644 index 00000000..d08a5a21 --- /dev/null +++ b/lua/app/config/strings/pt/avatar_frame.lua @@ -0,0 +1,9 @@ +local avatar_frame = { + [1000]={ + ["desc"]="Uma moldura do avatar redonda e lisa. Está em sua posse por padrão." + } +} +local config = { +data=avatar_frame,count=1 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/pt/avatar_frame.lua.meta b/lua/app/config/strings/pt/avatar_frame.lua.meta new file mode 100644 index 00000000..1dfd1bcb --- /dev/null +++ b/lua/app/config/strings/pt/avatar_frame.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: c09ce43658ef5e74a80b3dfa22e1f1b5 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/ru/avatar.lua b/lua/app/config/strings/ru/avatar.lua new file mode 100644 index 00000000..5cfc5f31 --- /dev/null +++ b/lua/app/config/strings/ru/avatar.lua @@ -0,0 +1,18 @@ +local avatar = { + [1001]={ + + }, + [2001]={ + + }, + [3001]={ + + }, + [4001]={ + + } +} +local config = { +data=avatar,count=4 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/ru/avatar.lua.meta b/lua/app/config/strings/ru/avatar.lua.meta new file mode 100644 index 00000000..455f93e4 --- /dev/null +++ b/lua/app/config/strings/ru/avatar.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: b15dbe64e966569489a7836e7aff9685 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/ru/avatar_frame.lua b/lua/app/config/strings/ru/avatar_frame.lua new file mode 100644 index 00000000..bc6ad48a --- /dev/null +++ b/lua/app/config/strings/ru/avatar_frame.lua @@ -0,0 +1,9 @@ +local avatar_frame = { + [1000]={ + ["desc"]="Закругленная рамка аватара принадлежит по умолчанию." + } +} +local config = { +data=avatar_frame,count=1 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/ru/avatar_frame.lua.meta b/lua/app/config/strings/ru/avatar_frame.lua.meta new file mode 100644 index 00000000..6f6b940a --- /dev/null +++ b/lua/app/config/strings/ru/avatar_frame.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 50113a7df3a762746877843f9da2b217 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/th/avatar.lua b/lua/app/config/strings/th/avatar.lua new file mode 100644 index 00000000..5cfc5f31 --- /dev/null +++ b/lua/app/config/strings/th/avatar.lua @@ -0,0 +1,18 @@ +local avatar = { + [1001]={ + + }, + [2001]={ + + }, + [3001]={ + + }, + [4001]={ + + } +} +local config = { +data=avatar,count=4 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/th/avatar.lua.meta b/lua/app/config/strings/th/avatar.lua.meta new file mode 100644 index 00000000..14584350 --- /dev/null +++ b/lua/app/config/strings/th/avatar.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: bdd97d866a3ead549bf1326f93ec6162 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/th/avatar_frame.lua b/lua/app/config/strings/th/avatar_frame.lua new file mode 100644 index 00000000..6a7a405c --- /dev/null +++ b/lua/app/config/strings/th/avatar_frame.lua @@ -0,0 +1,9 @@ +local avatar_frame = { + [1000]={ + ["desc"]="เฟรมอวาตาร์ที่โค้งมนสามารถใช้ได้ตามค่าเริ่มต้น" + } +} +local config = { +data=avatar_frame,count=1 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/th/avatar_frame.lua.meta b/lua/app/config/strings/th/avatar_frame.lua.meta new file mode 100644 index 00000000..d03fe09e --- /dev/null +++ b/lua/app/config/strings/th/avatar_frame.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 95494c882fd4db940b204e0f41b55b35 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/vi/avatar.lua b/lua/app/config/strings/vi/avatar.lua new file mode 100644 index 00000000..5cfc5f31 --- /dev/null +++ b/lua/app/config/strings/vi/avatar.lua @@ -0,0 +1,18 @@ +local avatar = { + [1001]={ + + }, + [2001]={ + + }, + [3001]={ + + }, + [4001]={ + + } +} +local config = { +data=avatar,count=4 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/avatar.lua.meta b/lua/app/config/strings/vi/avatar.lua.meta new file mode 100644 index 00000000..adfa778b --- /dev/null +++ b/lua/app/config/strings/vi/avatar.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: ab538b46345987a4aa0c2294067ba315 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/vi/avatar_frame.lua b/lua/app/config/strings/vi/avatar_frame.lua new file mode 100644 index 00000000..08e5fab4 --- /dev/null +++ b/lua/app/config/strings/vi/avatar_frame.lua @@ -0,0 +1,9 @@ +local avatar_frame = { + [1000]={ + ["desc"]="Khung Avatar tròn trĩnh, mặc định có." + } +} +local config = { +data=avatar_frame,count=1 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/avatar_frame.lua.meta b/lua/app/config/strings/vi/avatar_frame.lua.meta new file mode 100644 index 00000000..4352c589 --- /dev/null +++ b/lua/app/config/strings/vi/avatar_frame.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 96311fba66b34c94dbbf1927048d18b9 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/zh/avatar.lua b/lua/app/config/strings/zh/avatar.lua new file mode 100644 index 00000000..5cfc5f31 --- /dev/null +++ b/lua/app/config/strings/zh/avatar.lua @@ -0,0 +1,18 @@ +local avatar = { + [1001]={ + + }, + [2001]={ + + }, + [3001]={ + + }, + [4001]={ + + } +} +local config = { +data=avatar,count=4 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/avatar.lua.meta b/lua/app/config/strings/zh/avatar.lua.meta new file mode 100644 index 00000000..03085442 --- /dev/null +++ b/lua/app/config/strings/zh/avatar.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 1c2c4275bc1a0294aa37b9908a8fdb4d +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/zh/avatar_frame.lua b/lua/app/config/strings/zh/avatar_frame.lua new file mode 100644 index 00000000..c11d1a53 --- /dev/null +++ b/lua/app/config/strings/zh/avatar_frame.lua @@ -0,0 +1,9 @@ +local avatar_frame = { + [1000]={ + ["desc"]="圓潤的頭像框，默認擁有。" + } +} +local config = { +data=avatar_frame,count=1 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/avatar_frame.lua.meta b/lua/app/config/strings/zh/avatar_frame.lua.meta new file mode 100644 index 00000000..d39eb464 --- /dev/null +++ b/lua/app/config/strings/zh/avatar_frame.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 427153d80763da246af5dbfd6a7efa96 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/activity/gold_pig/gold_pig_ui.lua b/lua/app/ui/activity/gold_pig/gold_pig_ui.lua index 1beda6db..c2b5221a 100644 --- a/lua/app/ui/activity/gold_pig/gold_pig_ui.lua +++ b/lua/app/ui/activity/gold_pig/gold_pig_ui.lua @@ -55,24 +55,19 @@ function GoldPigUI:onLoadRootComplete() end end) - self:bind(DataManager.GoldPigData, "dirty", function() - if not DataManager.GoldPigData:getIsOpen() then - --如果是到时间关闭的则弹出提示 - local id = DataManager.GoldPigData:getId() - if self.goldPigId > id then -- 降级说明是时间到了关闭的 - local params = { - content = I18N:getGlobalText(I18N.GlobalConst.GOLD_PIG_CLOSE_DESC), - boxType = GConst.MESSAGE_BOX_TYPE.MB_OK, - okFunc = function() - self:closeUI() - end - } - GFunc.showMessageBox(params) - end - end - end) - BIReport:postPayUIShow(BIReport.GIFT_TYPE.GOLD_PIG) + + self.timeTx = uiMap["gold_pig_ui.bg.time_bg.time_tx"] + local isFull = DataManager.GoldPigData:getIsFull() + if isFull then + uiMap["gold_pig_ui.bg.time_bg"]:setVisible(true) + self.cdSid = self:scheduleGlobal(function() + self:updateTime() + end, 1) + self:updateTime() + else + uiMap["gold_pig_ui.bg.time_bg"]:setVisible(false) + end end function GoldPigUI:initSpine() @@ -84,4 +79,26 @@ function GoldPigUI:initSpine() end, time) end +function GoldPigUI:updateTime() + local endTime = DataManager.GoldPigData:getEndTime() + local remainTime = endTime - Time:getServerTime() + if remainTime > 0 then + self.timeTx:setText(GFunc.getTimeStrWithHMS(remainTime)) + else + self.timeTx:setText("00:00:00") + if self.cdSid then + self:unscheduleGlobal(self.cdSid) + self.cdSid = nil + end + local params = { + content = I18N:getGlobalText(I18N.GlobalConst.GOLD_PIG_CLOSE_DESC), + boxType = GConst.MESSAGE_BOX_TYPE.MB_OK, + okFunc = function() + self:closeUI() + end + } + GFunc.showMessageBox(params) + end +end + return GoldPigUI \ No newline at end of file diff --git a/lua/app/userdata/activity/gold_pig/gold_pig_data.lua b/lua/app/userdata/activity/gold_pig/gold_pig_data.lua index f937cd14..b5a0fc70 100644 --- a/lua/app/userdata/activity/gold_pig/gold_pig_data.lua +++ b/lua/app/userdata/activity/gold_pig/gold_pig_data.lua @@ -86,6 +86,9 @@ function GoldPigData:getId() end function GoldPigData:getIsOpen() + if GFunc.isShenhe() then + return false + end return self.data.isOpen end