设置

lua/app/config/act_gift.lua

@@ -0,0 +1,20 @@
+local act_gift = {
+	[10002]={
+		["type"]=1,
+		["recharge_id"]=11,
+		["time_type"]=3,
+		["limit"]=1,
+		["value"]=3000
+	},
+	[10102]={
+		["type"]=1,
+		["recharge_id"]=12,
+		["time_type"]=3,
+		["limit"]=1,
+		["value"]=25
+	}
+}
+local config = {
+data=act_gift,count=2
+}
+return config

lua/app/config/act_gift.lua.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 9037b2202013c9046ac4eedf305785f4
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

lua/app/config/bounty_level.lua.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 199d01ef77e81dc44abed0f43f5216b4
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

lua/app/config/bounty_time.lua

@@ -0,0 +1,16 @@
+local bounty_time = {
+	[1]={
+		["season"]=1,
+		["start_time"]="2023-5-1 00:00:00",
+		["end_time"]="2022-6-1 00:00:00"
+	},
+	[2]={
+		["season"]=2,
+		["start_time"]="2023-6-1 00:00:00",
+		["end_time"]="2022-7-1 00:00:00"
+	}
+}
+local config = {
+data=bounty_time,count=2
+}
+return config

lua/app/config/bounty_time.lua.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 2decbbf35f1a242498a1f08a5b279630
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

lua/app/config/buff.lua

@@ -37,139 +37,165 @@ local buff = {
 	[7]={
 		["name"]="dec_dmg_red_add",
 		["buff_type"]=1,
+		["stack"]=2,
 		["position"]=1,
 		["icon"]="dec_dmg_red_add"
 	},
 	[8]={
 		["name"]="dec_dmg_yellow_add",
 		["buff_type"]=1,
+		["stack"]=2,
 		["position"]=2,
 		["icon"]="dec_dmg_yellow_add"
 	},
 	[9]={
 		["name"]="dec_dmg_green_add",
 		["buff_type"]=1,
+		["stack"]=2,
 		["position"]=3,
 		["icon"]="dec_dmg_green_add"
 	},
 	[10]={
 		["name"]="dec_dmg_blue_add",
 		["buff_type"]=1,
+		["stack"]=2,
 		["position"]=4,
 		["icon"]="dec_dmg_blue_add"
 	},
 	[11]={
 		["name"]="dec_dmg_purple_add",
 		["buff_type"]=1,
+		["stack"]=2,
 		["position"]=5,
 		["icon"]="dec_dmg_purple_add"
 	},
 	[12]={
 		["name"]="dec_dmg_all_add",
 		["buff_type"]=1,
+		["stack"]=2,
 		["icon"]="dec_dmg_all_add"
 	},
 	[13]={
 		["name"]="weakness_red_add",
 		["buff_type"]=1,
+		["stack"]=2,
 		["position"]=1,
 		["icon"]="weakness_red_add"
 	},
 	[14]={
 		["name"]="weakness_yellow_add",
 		["buff_type"]=1,
+		["stack"]=2,
 		["position"]=2,
 		["icon"]="weakness_yellow_add"
 	},
 	[15]={
 		["name"]="weakness_green_add",
 		["buff_type"]=1,
+		["stack"]=2,
 		["position"]=3,
 		["icon"]="weakness_green_add"
 	},
 	[16]={
 		["name"]="weakness_blue_add",
 		["buff_type"]=1,
+		["stack"]=2,
 		["position"]=4,
 		["icon"]="weakness_blue_add"
 	},
 	[17]={
 		["name"]="weakness_purple_add",
 		["buff_type"]=1,
+		["stack"]=2,
 		["position"]=5,
 		["icon"]="weakness_purple_add"
 	},
 	[18]={
 		["name"]="weakness_all_add",
 		["buff_type"]=1,
+		["stack"]=2,
 		["icon"]="weakness_all_add"
 	},
 	[19]={
 		["name"]="dmg_addition_red_add",
 		["buff_type"]=1,
+		["stack"]=2,
 		["position"]=1
 	},
 	[20]={
 		["name"]="dmg_addition_yellow_add",
 		["buff_type"]=1,
+		["stack"]=2,
 		["position"]=2
 	},
 	[21]={
 		["name"]="dmg_addition_green_add",
 		["buff_type"]=1,
+		["stack"]=2,
 		["position"]=3
 	},
 	[22]={
 		["name"]="dmg_addition_blue_add",
 		["buff_type"]=1,
+		["stack"]=2,
 		["position"]=4
 	},
 	[23]={
 		["name"]="dmg_addition_purple_add",
 		["buff_type"]=1,
+		["stack"]=2,
 		["position"]=5
 	},
 	[24]={
 		["name"]="dmg_addition_all_add",
-		["buff_type"]=1
+		["buff_type"]=1,
+		["stack"]=2
 	},
 	[25]={
 		["name"]="atkp_color_add",
-		["buff_type"]=1
+		["buff_type"]=1,
+		["stack"]=2
 	},
 	[26]={
 		["name"]="atkp_red_add",
 		["buff_type"]=1,
+		["stack"]=2,
 		["position"]=1
 	},
 	[27]={
 		["name"]="atkp_yellow_add",
 		["buff_type"]=1,
+		["stack"]=2,
 		["position"]=2
 	},
 	[28]={
 		["name"]="atkp_green_add",
 		["buff_type"]=1,
+		["stack"]=2,
 		["position"]=3
 	},
 	[29]={
 		["name"]="atkp_blue_add",
 		["buff_type"]=1,
+		["stack"]=2,
 		["position"]=4
 	},
 	[30]={
 		["name"]="atkp_purple_add",
 		["buff_type"]=1,
+		["stack"]=2,
 		["position"]=5
 	},
 	[31]={
 		["name"]="wavehealp",
 		["buff_type"]=5,
+		["stack"]=2,
 		["formula"]=2
 	},
 	[32]={
 		["name"]="heal",
 		["buff_type"]=5,
+		["stack"]=2,
 		["formula"]=3,
 		["fx_get"]={
 			300025
@@ -178,6 +204,7 @@ local buff = {
 	[33]={
 		["name"]="stun",
 		["buff_type"]=8,
+		["stack"]=2,
 		["icon"]="stun",
 		["fx_continued"]={
 			13
@@ -196,11 +223,13 @@ local buff = {
 	},
 	[35]={
 		["name"]="atkp_add",
-		["buff_type"]=1
+		["buff_type"]=1,
+		["stack"]=2
 	},
 	[36]={
 		["name"]="normal_attack_dec",
 		["buff_type"]=1,
+		["stack"]=2,
 		["icon"]="normal_attack_dec",
 		["fx_continued"]={
 			12
@@ -208,39 +237,48 @@ local buff = {
 	},
 	[37]={
 		["name"]="normal_attack_add",
-		["buff_type"]=1
+		["buff_type"]=1,
+		["stack"]=2
 	},
 	[38]={
 		["name"]="block",
-		["buff_type"]=1
+		["buff_type"]=1,
+		["stack"]=2
 	},
 	[39]={
 		["name"]="hpp_add",
-		["buff_type"]=1
+		["buff_type"]=1,
+		["stack"]=2
 	},
 	[40]={
 		["name"]="crit_add",
-		["buff_type"]=1
+		["buff_type"]=1,
+		["stack"]=2
 	},
 	[41]={
 		["name"]="crit_time_add",
-		["buff_type"]=1
+		["buff_type"]=1,
+		["stack"]=2
 	},
 	[42]={
 		["name"]="exp_time_add",
-		["buff_type"]=7
+		["buff_type"]=7,
+		["stack"]=2
 	},
 	[43]={
 		["name"]="cured_add",
-		["buff_type"]=1
+		["buff_type"]=1,
+		["stack"]=2
 	},
 	[44]={
 		["name"]="add_skill",
-		["buff_type"]=7
+		["buff_type"]=7,
+		["stack"]=2
 	},
 	[45]={
 		["name"]="skill_fire_times",
-		["buff_type"]=7
+		["buff_type"]=7,
+		["stack"]=2
 	},
 	[46]={
 		["name"]="shield_rebound_200",
@@ -252,6 +290,75 @@ local buff = {
 		["fx_disappear"]={
 			14
 		}
+	},
+	[47]={
+		["name"]="burn",
+		["buff_type"]=4,
+		["stack"]=1,
+		["formula"]=4
+	},
+	[48]={
+		["name"]="vulnerable",
+		["buff_type"]=1
+	},
+	[49]={
+		["name"]="frozen",
+		["buff_type"]=8
+	},
+	[50]={
+		["name"]="poison",
+		["buff_type"]=4,
+		["stack"]=2
+	},
+	[51]={
+		["name"]="Imprison",
+		["buff_type"]=7
+	},
+	[52]={
+		["name"]="corrupt",
+		["buff_type"]=1
+	},
+	[53]={
+		["name"]="bleed",
+		["buff_type"]=7
+	},
+	[54]={
+		["name"]="weaken",
+		["buff_type"]=1
+	},
+	[55]={
+		["name"]="lethargy",
+		["buff_type"]=8,
+		["stack"]=1
+	},
+	[56]={
+		["name"]="curse",
+		["buff_type"]=7
+	},
+	[57]={
+		["name"]="lock",
+		["buff_type"]=7
+	},
+	[58]={
+		["name"]="first_hand",
+		["buff_type"]=7
+	},
+	[59]={
+		["name"]="skill_hurt_add",
+		["buff_type"]=1
+	},
+	[60]={
+		["name"]="undead",
+		["buff_type"]=7
+	},
+	[61]={
+		["name"]="counterattack",
+		["buff_type"]=7,
+		["stack"]=1
+	},
+	[62]={
+		["name"]="thorns",
+		["buff_type"]=7
 	}
 }
 local keys = {
@@ -301,12 +408,28 @@ local keys = {
 		["cured_add"]=buff[43],
 		["add_skill"]=buff[44],
 		["skill_fire_times"]=buff[45],
-		["shield_rebound_200"]=buff[46]
+		["shield_rebound_200"]=buff[46],
+		["burn"]=buff[47],
+		["vulnerable"]=buff[48],
+		["frozen"]=buff[49],
+		["poison"]=buff[50],
+		["Imprison"]=buff[51],
+		["corrupt"]=buff[52],
+		["bleed"]=buff[53],
+		["weaken"]=buff[54],
+		["lethargy"]=buff[55],
+		["curse"]=buff[56],
+		["lock"]=buff[57],
+		["first_hand"]=buff[58],
+		["skill_hurt_add"]=buff[59],
+		["undead"]=buff[60],
+		["counterattack"]=buff[61],
+		["thorns"]=buff[62]
 	}
 }
 local config = {
 data=buff,
 keys=keys,
-count=46
+count=62
 }
 return config

lua/app/config/const.lua

@@ -41,9 +41,45 @@ local const = {
 	},
 	["act_gold_pig_full_cd"]={
 		["value"]=12
+	},
+	["stamina_diamond_buy"]={
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=3,
+ 			["id_for_nothing"]="VQ==",
+			["num"]=30,
+ 			["num_for_nothing"]="VQg="
+		}
+	},
+	["stamina_diamond_cost"]={
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=2,
+ 			["id_for_nothing"]="VA==",
+			["num"]=30,
+ 			["num_for_nothing"]="VQg="
+		}
+	},
+	["stamina_diamond_times"]={
+		["value"]=3
+	},
+	["stamina_ad_buy"]={
+		["reward"]={
+			["type"]=1,
+ 			["type_for_nothing"]="Vw==",
+			["id"]=3,
+ 			["id_for_nothing"]="VQ==",
+			["num"]=20,
+ 			["num_for_nothing"]="VAg="
+		}
+	},
+	["stamina_ad_times"]={
+		["value"]=5
 	}
 }
 local config = {
-data=const,count=12
+data=const,count=17
 }
 return config

lua/app/config/func_open.lua

@@ -2,9 +2,12 @@ local func_open = {
 	["act_gold_pig"]={
 		["stage"]=3,
 		["pop_ups"]=1
+	},
+	["task"]={
+		["stage"]=2
 	}
 }
 local config = {
-data=func_open,count=1
+data=func_open,count=2
 }
 return config

lua/app/config/item.lua

@@ -101,6 +101,23 @@ local item = {
 			}
 		}
 	},
+	[7]={
+		["type"]=1,
+		["qlt"]=5,
+		["icon"]="7"
+	},
+	[8]={
+		["type"]=4
+	},
+	[9]={
+		["type"]=4
+	},
+	[10]={
+		["type"]=4
+	},
+	[11]={
+		["type"]=4
+	},
 	[12001]={
 		["type"]=5,
 		["parameter"]=12001,
@@ -151,6 +168,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=14
+data=item,count=19
 }
 return config

lua/app/config/localization/localization_global_const.lua

@@ -56,6 +56,19 @@ local LocalizationGlobalConst =
 	CLICK_COPY_ACOUNT_DESC = "CLICK_COPY_ACOUNT_DESC",
 	APP = "APP",
 	CHAPTER_DESC_1 = "CHAPTER_DESC_1",
+	SETTING_DESC = "SETTING_DESC",
+	SETTING_DESC_MUSIC = "SETTING_DESC_MUSIC",
+	SETTING_DESC_VOICE = "SETTING_DESC_VOICE",
+	SETTING_DESC_LANGUAGE = "SETTING_DESC_LANGUAGE",
+	SERVICE_DESC = "SERVICE_DESC",
+	PRIVACY_DESC = "PRIVACY_DESC",
+	CLIENT_VERSION = "CLIENT_VERSION",
+	BIND_ACCOUNT_DESC = "BIND_ACCOUNT_DESC",
+	CHANGE_ACCOUNT_DESC = "CHANGE_ACCOUNT_DESC",
+	DELETE_ACCOUNT_DESC = "DELETE_ACCOUNT_DESC",
+	SETTING_DESC_1 = "SETTING_DESC_1",
+	ACCOUNT_ALREADY_BINDED_DESC = "ACCOUNT_ALREADY_BINDED_DESC",
+	LANGUAGE_DESC = "LANGUAGE_DESC",
 }
 
 return LocalizationGlobalConst

lua/app/config/player_initial.lua

@@ -1,15 +1,5 @@
 local player_initial = {
 	[1]={
-		["reward"]={
-			["type"]=1,
- 			["type_for_nothing"]="Vw==",
-			["id"]=3,
- 			["id_for_nothing"]="VQ==",
-			["num"]=60,
- 			["num_for_nothing"]="UAg="
-		}
-	},
-	[2]={
 		["reward"]={
 			["type"]=2,
  			["type_for_nothing"]="VA==",
@@ -19,7 +9,7 @@ local player_initial = {
  			["num_for_nothing"]="Vw=="
 		}
 	},
-	[3]={
+	[2]={
 		["reward"]={
 			["type"]=2,
  			["type_for_nothing"]="VA==",
@@ -29,7 +19,7 @@ local player_initial = {
  			["num_for_nothing"]="Vw=="
 		}
 	},
-	[4]={
+	[3]={
 		["reward"]={
 			["type"]=2,
  			["type_for_nothing"]="VA==",
@@ -41,6 +31,6 @@ local player_initial = {
 	}
 }
 local config = {
-data=player_initial,count=4
+data=player_initial,count=3
 }
 return config

lua/app/config/recharge.lua

@@ -76,10 +76,18 @@ local recharge = {
 		["price"]=9.99,
 		["price_cn"]=68,
 		["same_price"]=10,
-		["price_str"]="$9.99",
+		["price_str"]="9.99",
 		["score"]=10
 	},
 	[11]={
+		["payId"]="com.idle.ko.io.11.99dollar",
+		["price"]=11.99,
+		["price_cn"]=78,
+		["same_price"]=12,
+		["price_str"]="11.99",
+		["score"]=12
+	},
+	[12]={
 		["payId"]="com.idle.ko.io.14.99dollar",
 		["price"]=14.99,
 		["price_cn"]=98,
@@ -87,7 +95,7 @@ local recharge = {
 		["price_str"]="$14.99",
 		["score"]=15
 	},
-	[12]={
+	[13]={
 		["payId"]="com.idle.ko.io.19.99dollar",
 		["price"]=19.99,
 		["price_cn"]=128,
@@ -95,7 +103,7 @@ local recharge = {
 		["price_str"]="$19.99",
 		["score"]=20
 	},
-	[13]={
+	[14]={
 		["payId"]="com.idle.ko.io.24.99dollar",
 		["price"]=24.99,
 		["price_cn"]=168,
@@ -103,7 +111,7 @@ local recharge = {
 		["price_str"]="$24.99",
 		["score"]=25
 	},
-	[14]={
+	[15]={
 		["payId"]="com.idle.ko.io.29.99dollar",
 		["price"]=29.99,
 		["price_cn"]=198,
@@ -111,7 +119,7 @@ local recharge = {
 		["price_str"]="$29.99",
 		["score"]=30
 	},
-	[15]={
+	[16]={
 		["payId"]="com.idle.ko.io.49.99dollar",
 		["price"]=49.99,
 		["price_cn"]=328,
@@ -119,7 +127,7 @@ local recharge = {
 		["price_str"]="$49.99",
 		["score"]=50
 	},
-	[16]={
+	[17]={
 		["payId"]="com.idle.ko.io.69.99dollar",
 		["price"]=69.99,
 		["price_cn"]=448,
@@ -127,7 +135,7 @@ local recharge = {
 		["price_str"]="$69.99",
 		["score"]=70
 	},
-	[17]={
+	[18]={
 		["payId"]="com.idle.ko.io.99.99dollar",
 		["price"]=99.99,
 		["price_cn"]=648,
@@ -137,6 +145,6 @@ local recharge = {
 	}
 }
 local config = {
-data=recharge,count=17
+data=recharge,count=18
 }
 return config

lua/app/config/strings/cn/global.lua

@@ -56,6 +56,19 @@ local localization_global =
     ["CLICK_COPY_ACOUNT_DESC"] = "点击复制用户ID",
     ["APP"] = "版本号：",
     ["CHAPTER_DESC_1"] = "最高纪录：{0}",
+    ["SETTING_DESC"] = "设置",
+    ["SETTING_DESC_MUSIC"] = "音乐",
+    ["SETTING_DESC_VOICE"] = "音效",
+    ["SETTING_DESC_LANGUAGE"] = "语言",
+    ["SERVICE_DESC"] = "使用条款",
+    ["PRIVACY_DESC"] = "隐私政策",
+    ["CLIENT_VERSION"] = "当前版本:{0}",
+    ["BIND_ACCOUNT_DESC"] = "绑定账号",
+    ["CHANGE_ACCOUNT_DESC"] = "切换账号",
+    ["DELETE_ACCOUNT_DESC"] = "删除账号",
+    ["SETTING_DESC_1"] = "ID:{0}",
+    ["ACCOUNT_ALREADY_BINDED_DESC"] = "已绑定",
+    ["LANGUAGE_DESC"] = "语言",
 }
 
 return localization_global

lua/app/config/strings/cn/item.lua

@@ -23,6 +23,10 @@ local item = {
 		["name"]="史诗英雄",
 		["desc"]="可以获得史诗英雄。"
 	},
+	[7]={
+		["name"]="通行证积分",
+		["desc"]="累计积分可提升通行证等级。"
+	},
 	[12001]={
 		["name"]="洛克西英雄碎片",
 		["desc"]="洛克西英雄碎片,凑齐可解锁或升级。"
@@ -57,6 +61,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=14
+data=item,count=15
 }
 return config

lua/app/config/strings/de/item.lua

@@ -19,6 +19,9 @@ local item = {
 	},
 	[6]={
 
+	},
+	[7]={
+
 	},
 	[12001]={
 
@@ -46,6 +49,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=14
+data=item,count=15
 }
 return config

lua/app/config/strings/en/item.lua

@@ -22,6 +22,9 @@ local item = {
 	[6]={
 		["name"]="Epic Hero",
 		["desc"]="Allows you to get an epic hero"
+	},
+	[7]={
+
 	},
 	[12001]={
 		["name"]="Roxy Shard",
@@ -57,6 +60,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=14
+data=item,count=15
 }
 return config

lua/app/config/strings/fr/item.lua

@@ -19,6 +19,9 @@ local item = {
 	},
 	[6]={
 
+	},
+	[7]={
+
 	},
 	[12001]={
 
@@ -46,6 +49,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=14
+data=item,count=15
 }
 return config

lua/app/config/strings/id/item.lua

@@ -19,6 +19,9 @@ local item = {
 	},
 	[6]={
 
+	},
+	[7]={
+
 	},
 	[12001]={
 
@@ -46,6 +49,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=14
+data=item,count=15
 }
 return config

lua/app/config/strings/ja/item.lua

@@ -19,6 +19,9 @@ local item = {
 	},
 	[6]={
 
+	},
+	[7]={
+
 	},
 	[12001]={
 
@@ -46,6 +49,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=14
+data=item,count=15
 }
 return config

lua/app/config/strings/ko/item.lua

@@ -19,6 +19,9 @@ local item = {
 	},
 	[6]={
 
+	},
+	[7]={
+
 	},
 	[12001]={
 
@@ -46,6 +49,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=14
+data=item,count=15
 }
 return config

lua/app/config/strings/pt/item.lua

@@ -18,6 +18,9 @@ local item = {
 	},
 	[6]={
 
+	},
+	[7]={
+
 	},
 	[12001]={
 
@@ -45,6 +48,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=14
+data=item,count=15
 }
 return config

lua/app/config/strings/ru/item.lua

@@ -16,6 +16,9 @@ local item = {
 	},
 	[6]={
 
+	},
+	[7]={
+
 	},
 	[12001]={
 
@@ -43,6 +46,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=14
+data=item,count=15
 }
 return config

lua/app/config/strings/th/item.lua

@@ -16,6 +16,9 @@ local item = {
 	},
 	[6]={
 
+	},
+	[7]={
+
 	},
 	[12001]={
 
@@ -43,6 +46,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=14
+data=item,count=15
 }
 return config

lua/app/config/strings/vi/item.lua

@@ -19,6 +19,9 @@ local item = {
 	},
 	[6]={
 
+	},
+	[7]={
+
 	},
 	[12001]={
 
@@ -46,6 +49,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=14
+data=item,count=15
 }
 return config

lua/app/config/strings/zh/item.lua

@@ -22,6 +22,9 @@ local item = {
 	[6]={
 		["name"]="史詩英雄",
 		["desc"]="可以獲得史詩英雄。"
+	},
+	[7]={
+
 	},
 	[12001]={
 		["name"]="洛克西英雄碎片",
@@ -57,6 +60,6 @@ local item = {
 	}
 }
 local config = {
-data=item,count=14
+data=item,count=15
 }
 return config

lua/app/config/task.lua.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 5124369656d774c49b1c69aae81c3f9e
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

lua/app/config/task_daily.lua

@@ -0,0 +1,712 @@
+local task_daily = {
+	[1]={
+		["type"]=1,
+		["reset"]=2,
+		["task"]={
+			{
+				1,
+				100
+			}
+		}
+	},
+	[2]={
+		["type"]=1,
+		["reset"]=1,
+		["task"]={
+			{
+				2,
+				100
+			}
+		}
+	},
+	[3]={
+		["type"]=1,
+		["reset"]=1,
+		["task"]={
+			{
+				4,
+				100
+			},
+			{
+				5,
+				100
+			},
+			{
+				6,
+				100
+			},
+			{
+				8,
+				100
+			},
+			{
+				9,
+				100
+			},
+			{
+				10,
+				100
+			}
+		},
+		["ad_task"]={
+			{
+				7,
+				100
+			},
+			{
+				11,
+				100
+			},
+			{
+				14,
+				100
+			},
+			{
+				15,
+				100
+			},
+			{
+				18,
+				100
+			},
+			{
+				19,
+				100
+			},
+			{
+				34,
+				100
+			},
+			{
+				35,
+				100
+			},
+			{
+				74,
+				100
+			},
+			{
+				75,
+				100
+			},
+			{
+				58,
+				100
+			},
+			{
+				59,
+				100
+			},
+			{
+				62,
+				100
+			},
+			{
+				63,
+				100
+			},
+			{
+				70,
+				100
+			},
+			{
+				71,
+				100
+			},
+			{
+				54,
+				100
+			},
+			{
+				55,
+				100
+			}
+		},
+		["ad_refresh"]=1
+	},
+	[4]={
+		["type"]=1,
+		["reset"]=1,
+		["task"]={
+			{
+				12,
+				100
+			},
+			{
+				13,
+				100
+			},
+			{
+				14,
+				100
+			},
+			{
+				16,
+				100
+			},
+			{
+				17,
+				100
+			},
+			{
+				18,
+				100
+			}
+		},
+		["ad_task"]={
+			{
+				6,
+				100
+			},
+			{
+				7,
+				100
+			},
+			{
+				10,
+				100
+			},
+			{
+				11,
+				100
+			},
+			{
+				15,
+				100
+			},
+			{
+				19,
+				100
+			},
+			{
+				34,
+				100
+			},
+			{
+				35,
+				100
+			},
+			{
+				74,
+				100
+			},
+			{
+				75,
+				100
+			},
+			{
+				58,
+				100
+			},
+			{
+				59,
+				100
+			},
+			{
+				62,
+				100
+			},
+			{
+				63,
+				100
+			},
+			{
+				70,
+				100
+			},
+			{
+				71,
+				100
+			},
+			{
+				54,
+				100
+			},
+			{
+				55,
+				100
+			}
+		},
+		["ad_refresh"]=1
+	},
+	[5]={
+		["type"]=1,
+		["reset"]=1,
+		["task"]={
+			{
+				32,
+				100
+			},
+			{
+				33,
+				100
+			},
+			{
+				34,
+				100
+			},
+			{
+				72,
+				100
+			},
+			{
+				73,
+				100
+			},
+			{
+				74,
+				100
+			}
+		},
+		["ad_task"]={
+			{
+				6,
+				100
+			},
+			{
+				7,
+				100
+			},
+			{
+				10,
+				100
+			},
+			{
+				11,
+				100
+			},
+			{
+				14,
+				100
+			},
+			{
+				15,
+				100
+			},
+			{
+				18,
+				100
+			},
+			{
+				19,
+				100
+			},
+			{
+				35,
+				100
+			},
+			{
+				75,
+				100
+			},
+			{
+				58,
+				100
+			},
+			{
+				59,
+				100
+			},
+			{
+				62,
+				100
+			},
+			{
+				63,
+				100
+			},
+			{
+				70,
+				100
+			},
+			{
+				71,
+				100
+			},
+			{
+				54,
+				100
+			},
+			{
+				55,
+				100
+			}
+		},
+		["ad_refresh"]=1
+	},
+	[6]={
+		["type"]=1,
+		["reset"]=1,
+		["task"]={
+			{
+				56,
+				100
+			},
+			{
+				57,
+				100
+			},
+			{
+				58,
+				100
+			},
+			{
+				60,
+				100
+			},
+			{
+				61,
+				100
+			},
+			{
+				62,
+				100
+			}
+		},
+		["ad_task"]={
+			{
+				6,
+				100
+			},
+			{
+				7,
+				100
+			},
+			{
+				10,
+				100
+			},
+			{
+				11,
+				100
+			},
+			{
+				14,
+				100
+			},
+			{
+				15,
+				100
+			},
+			{
+				18,
+				100
+			},
+			{
+				19,
+				100
+			},
+			{
+				34,
+				100
+			},
+			{
+				35,
+				100
+			},
+			{
+				74,
+				100
+			},
+			{
+				75,
+				100
+			},
+			{
+				59,
+				100
+			},
+			{
+				63,
+				100
+			},
+			{
+				70,
+				100
+			},
+			{
+				71,
+				100
+			},
+			{
+				54,
+				100
+			},
+			{
+				55,
+				100
+			}
+		},
+		["ad_refresh"]=1
+	},
+	[7]={
+		["type"]=1,
+		["reset"]=1,
+		["task"]={
+			{
+				3,
+				100
+			}
+		}
+	},
+	[8]={
+		["type"]=1,
+		["reset"]=1,
+		["task"]={
+			{
+				68,
+				100
+			},
+			{
+				69,
+				100
+			},
+			{
+				70,
+				100
+			},
+			{
+				52,
+				100
+			},
+			{
+				53,
+				100
+			},
+			{
+				54,
+				100
+			}
+		},
+		["ad_task"]={
+			{
+				6,
+				100
+			},
+			{
+				7,
+				100
+			},
+			{
+				10,
+				100
+			},
+			{
+				11,
+				100
+			},
+			{
+				14,
+				100
+			},
+			{
+				15,
+				100
+			},
+			{
+				18,
+				100
+			},
+			{
+				19,
+				100
+			},
+			{
+				34,
+				100
+			},
+			{
+				35,
+				100
+			},
+			{
+				74,
+				100
+			},
+			{
+				75,
+				100
+			},
+			{
+				58,
+				100
+			},
+			{
+				59,
+				100
+			},
+			{
+				62,
+				100
+			},
+			{
+				63,
+				100
+			},
+			{
+				71,
+				100
+			},
+			{
+				55,
+				100
+			}
+		},
+		["ad_refresh"]=1,
+		["bounty"]=1
+	},
+	[9]={
+		["type"]=2,
+		["reset"]=1,
+		["task"]={
+			{
+				26,
+				100
+			},
+			{
+				27,
+				100
+			},
+			{
+				76,
+				50
+			},
+			{
+				77,
+				50
+			}
+		}
+	},
+	[10]={
+		["type"]=2,
+		["reset"]=1,
+		["task"]={
+			{
+				38,
+				100
+			},
+			{
+				39,
+				100
+			},
+			{
+				78,
+				50
+			}
+		}
+	},
+	[11]={
+		["type"]=2,
+		["reset"]=1,
+		["task"]={
+			{
+				50,
+				100
+			},
+			{
+				51,
+				100
+			},
+			{
+				91,
+				50
+			}
+		}
+	},
+	[12]={
+		["type"]=2,
+		["reset"]=1,
+		["task"]={
+			{
+				66,
+				100
+			},
+			{
+				67,
+				100
+			},
+			{
+				82,
+				50
+			}
+		}
+	},
+	[13]={
+		["type"]=2,
+		["reset"]=1,
+		["task"]={
+			{
+				30,
+				100
+			},
+			{
+				31,
+				100
+			}
+		}
+	},
+	[14]={
+		["type"]=2,
+		["reset"]=1,
+		["task"]={
+			{
+				87,
+				50
+			},
+			{
+				42,
+				100
+			},
+			{
+				43,
+				100
+			}
+		}
+	},
+	[15]={
+		["type"]=2,
+		["reset"]=1,
+		["task"]={
+			{
+				88,
+				50
+			},
+			{
+				89,
+				50
+			},
+			{
+				46,
+				100
+			},
+			{
+				47,
+				100
+			}
+		},
+		["bounty"]=1
+	},
+	[16]={
+		["type"]=2,
+		["reset"]=1,
+		["task"]={
+			{
+				92,
+				100
+			},
+			{
+				22,
+				100
+			},
+			{
+				23,
+				100
+			}
+		},
+		["bounty"]=1
+	}
+}
+local config = {
+data=task_daily,count=16
+}
+return config

lua/app/config/task_daily.lua.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 3f8b7577440284a40a0c05d699d80292
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

lua/app/ui/game_setting/game_setting_ui.lua

@@ -37,12 +37,34 @@ function GameSettingUI:_display()
     local language = I18N:getCurLanguage()
     self.uiMap["game_setting_ui.bg.language_btn.status"]:setSprite(GConst.ATLAS_PATH.UI_SETTING, "language_" .. language)
     local acountId = DataManager.PlayerData:getAcountId() or GConst.EMPTY_STRING
-    self.uiMap["game_setting_ui.bg.player_id"]:setText(I18N:getGlobalText(I18N.GlobalConst.SETTING_DESC_1, acountId))
+    self.uiMap["game_setting_ui.bg.player_bg.player_id"]:setText(I18N:getGlobalText(I18N.GlobalConst.SETTING_DESC_1, acountId))
 
+    self:initLoginBtn()
     self:refreshMusic()
     self:refreshVoice()
 end
 
+function GameSettingUI:initLoginBtn()
+    self.uiMap["game_setting_ui.bg.google_sign_btn"]:addClickListener(function()
+        
+    end)
+    if DataManager.PlayerData:getIsBinded() then
+        self.uiMap["game_setting_ui.bg.google_sign_btn.desc"]:setText(I18N:getGlobalText(I18N.GlobalConst.ACCOUNT_ALREADY_BINDED_DESC))
+    else
+        self.uiMap["game_setting_ui.bg.google_sign_btn.desc"]:setText(I18N:getGlobalText(I18N.GlobalConst.BIND_ACCOUNT_DESC))
+    end
+
+    self.uiMap["game_setting_ui.bg.google_switch_btn"]:addClickListener(function()
+        
+    end)
+    self.uiMap["game_setting_ui.bg.google_switch_btn.desc"]:setText(I18N:getGlobalText(I18N.GlobalConst.CHANGE_ACCOUNT_DESC))
+
+    local deleteTx = self.uiMap["game_setting_ui.bg.delete_tx"]
+    deleteTx:setText(I18N:getGlobalText(I18N.GlobalConst.DELETE_ACCOUNT_DESC))
+    deleteTx:addClickListener(function()
+    end)
+end
+
 function GameSettingUI:_addListeners()
     self.uiMap["game_setting_ui.bg.close_btn"]:addClickListener(function()
         self:closeUI()

lua/app/userdata/player/player_data.lua

@@ -43,4 +43,8 @@ function PlayerData:getAcountId()
 	return self:getAccountInfo().id or GConst.EMPTY_STRING
 end
 
+function PlayerData:getIsBinded()
+	return false
+end
+
 return PlayerData