diff --git a/lua/app/config/act_chapter_store.lua b/lua/app/config/act_chapter_store.lua
index 70927d00..dffd044d 100644
--- a/lua/app/config/act_chapter_store.lua
+++ b/lua/app/config/act_chapter_store.lua
@@ -17,14 +17,6 @@ local act_chapter_store = {
  				["id_for_nothing"]="Vw==",
 				["num"]=1500,
  				["num_for_nothing"]="Vw1cAw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=13,
- 				["id_for_nothing"]="Vws=",
-				["num"]=4,
- 				["num_for_nothing"]="Ug=="
 			}
 		},
 		["original"]=4,
@@ -47,24 +39,8 @@ local act_chapter_store = {
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=2000,
- 				["num_for_nothing"]="VAhcAw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=13,
- 				["id_for_nothing"]="Vws=",
-				["num"]=6,
- 				["num_for_nothing"]="UA=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=5,
- 				["id_for_nothing"]="Uw==",
-				["num"]=12,
- 				["num_for_nothing"]="Vwo="
+				["num"]=1501,
+ 				["num_for_nothing"]="Vw1cAg=="
 			}
 		},
 		["original"]=6,
@@ -87,24 +63,8 @@ local act_chapter_store = {
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=2000,
- 				["num_for_nothing"]="VAhcAw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=13,
- 				["id_for_nothing"]="Vws=",
-				["num"]=6,
- 				["num_for_nothing"]="UA=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=5,
- 				["id_for_nothing"]="Uw==",
-				["num"]=12,
- 				["num_for_nothing"]="Vwo="
+				["num"]=1502,
+ 				["num_for_nothing"]="Vw1cAQ=="
 			}
 		},
 		["original"]=6,
@@ -119,32 +79,16 @@ local act_chapter_store = {
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=90,
- 				["num_for_nothing"]="Xwg="
+				["num"]=60,
+ 				["num_for_nothing"]="UAg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=2500,
- 				["num_for_nothing"]="VA1cAw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=14,
- 				["id_for_nothing"]="Vww=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
+				["num"]=1503,
+ 				["num_for_nothing"]="Vw1cAA=="
 			}
 		},
 		["original"]=10,
@@ -159,32 +103,16 @@ local act_chapter_store = {
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=90,
- 				["num_for_nothing"]="Xwg="
+				["num"]=60,
+ 				["num_for_nothing"]="UAg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=2500,
- 				["num_for_nothing"]="VA1cAw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=14,
- 				["id_for_nothing"]="Vww=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
+				["num"]=1504,
+ 				["num_for_nothing"]="Vw1cBw=="
 			}
 		},
 		["original"]=10,
@@ -199,32 +127,16 @@ local act_chapter_store = {
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=120,
- 				["num_for_nothing"]="Vwpc"
+				["num"]=60,
+ 				["num_for_nothing"]="UAg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=4000,
- 				["num_for_nothing"]="UghcAw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=14,
- 				["id_for_nothing"]="Vww=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=3,
- 				["num_for_nothing"]="VQ=="
+				["num"]=1505,
+ 				["num_for_nothing"]="Vw1cBg=="
 			}
 		},
 		["original"]=12,
@@ -239,32 +151,16 @@ local act_chapter_store = {
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=120,
- 				["num_for_nothing"]="Vwpc"
+				["num"]=60,
+ 				["num_for_nothing"]="UAg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=4000,
- 				["num_for_nothing"]="UghcAw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=14,
- 				["id_for_nothing"]="Vww=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=3,
- 				["num_for_nothing"]="VQ=="
+				["num"]=1506,
+ 				["num_for_nothing"]="Vw1cBQ=="
 			}
 		},
 		["original"]=12,
@@ -279,32 +175,16 @@ local act_chapter_store = {
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=180,
- 				["num_for_nothing"]="VwBc"
+				["num"]=60,
+ 				["num_for_nothing"]="UAg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=5000,
- 				["num_for_nothing"]="UwhcAw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=14,
- 				["id_for_nothing"]="Vww=",
-				["num"]=2,
- 				["num_for_nothing"]="VA=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=6,
- 				["num_for_nothing"]="UA=="
+				["num"]=1507,
+ 				["num_for_nothing"]="Vw1cBA=="
 			}
 		},
 		["original"]=14,
@@ -319,32 +199,16 @@ local act_chapter_store = {
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=180,
- 				["num_for_nothing"]="VwBc"
+				["num"]=60,
+ 				["num_for_nothing"]="UAg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=5000,
- 				["num_for_nothing"]="UwhcAw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=14,
- 				["id_for_nothing"]="Vww=",
-				["num"]=2,
- 				["num_for_nothing"]="VA=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=6,
- 				["num_for_nothing"]="UA=="
+				["num"]=1508,
+ 				["num_for_nothing"]="Vw1cCw=="
 			}
 		},
 		["original"]=14,
@@ -359,32 +223,16 @@ local act_chapter_store = {
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=240,
- 				["num_for_nothing"]="VAxc"
+				["num"]=60,
+ 				["num_for_nothing"]="UAg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=8000,
- 				["num_for_nothing"]="XghcAw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=14,
- 				["id_for_nothing"]="Vww=",
-				["num"]=3,
- 				["num_for_nothing"]="VQ=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=8,
- 				["num_for_nothing"]="Xg=="
+				["num"]=1509,
+ 				["num_for_nothing"]="Vw1cCg=="
 			}
 		},
 		["original"]=15,
@@ -399,32 +247,16 @@ local act_chapter_store = {
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=240,
- 				["num_for_nothing"]="VAxc"
+				["num"]=60,
+ 				["num_for_nothing"]="UAg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=8000,
- 				["num_for_nothing"]="XghcAw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=14,
- 				["id_for_nothing"]="Vww=",
-				["num"]=3,
- 				["num_for_nothing"]="VQ=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=8,
- 				["num_for_nothing"]="Xg=="
+				["num"]=1510,
+ 				["num_for_nothing"]="Vw1dAw=="
 			}
 		},
 		["original"]=15,
@@ -439,32 +271,16 @@ local act_chapter_store = {
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=240,
- 				["num_for_nothing"]="VAxc"
+				["num"]=60,
+ 				["num_for_nothing"]="UAg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=8000,
- 				["num_for_nothing"]="XghcAw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=14,
- 				["id_for_nothing"]="Vww=",
-				["num"]=3,
- 				["num_for_nothing"]="VQ=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=8,
- 				["num_for_nothing"]="Xg=="
+				["num"]=1511,
+ 				["num_for_nothing"]="Vw1dAg=="
 			}
 		},
 		["original"]=15,
@@ -479,32 +295,16 @@ local act_chapter_store = {
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=360,
- 				["num_for_nothing"]="VQ5c"
+				["num"]=60,
+ 				["num_for_nothing"]="UAg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=10000,
- 				["num_for_nothing"]="VwhcA2U="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=15,
- 				["id_for_nothing"]="Vw0=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=20,
- 				["num_for_nothing"]="VAg="
+				["num"]=1512,
+ 				["num_for_nothing"]="Vw1dAQ=="
 			}
 		},
 		["original"]=16,
@@ -519,32 +319,16 @@ local act_chapter_store = {
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=360,
- 				["num_for_nothing"]="VQ5c"
+				["num"]=60,
+ 				["num_for_nothing"]="UAg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=10000,
- 				["num_for_nothing"]="VwhcA2U="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=15,
- 				["id_for_nothing"]="Vw0=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=20,
- 				["num_for_nothing"]="VAg="
+				["num"]=1513,
+ 				["num_for_nothing"]="Vw1dAA=="
 			}
 		},
 		["original"]=16,
@@ -559,32 +343,16 @@ local act_chapter_store = {
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=360,
- 				["num_for_nothing"]="VQ5c"
+				["num"]=60,
+ 				["num_for_nothing"]="UAg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=10000,
- 				["num_for_nothing"]="VwhcA2U="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=15,
- 				["id_for_nothing"]="Vw0=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=20,
- 				["num_for_nothing"]="VAg="
+				["num"]=1514,
+ 				["num_for_nothing"]="Vw1dBw=="
 			}
 		},
 		["original"]=16,
@@ -599,32 +367,16 @@ local act_chapter_store = {
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=360,
- 				["num_for_nothing"]="VQ5c"
+				["num"]=60,
+ 				["num_for_nothing"]="UAg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=10000,
- 				["num_for_nothing"]="VwhcA2U="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=15,
- 				["id_for_nothing"]="Vw0=",
-				["num"]=1,
- 				["num_for_nothing"]="Vw=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=20,
- 				["num_for_nothing"]="VAg="
+				["num"]=1515,
+ 				["num_for_nothing"]="Vw1dBg=="
 			}
 		},
 		["original"]=16,
@@ -639,32 +391,16 @@ local act_chapter_store = {
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=450,
- 				["num_for_nothing"]="Ug1c"
+				["num"]=60,
+ 				["num_for_nothing"]="UAg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=15000,
- 				["num_for_nothing"]="Vw1cA2U="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=14,
- 				["id_for_nothing"]="Vww=",
-				["num"]=2,
- 				["num_for_nothing"]="VA=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=15,
- 				["id_for_nothing"]="Vw0=",
-				["num"]=2,
- 				["num_for_nothing"]="VA=="
+				["num"]=1516,
+ 				["num_for_nothing"]="Vw1dBQ=="
 			}
 		},
 		["original"]=17,
@@ -679,32 +415,16 @@ local act_chapter_store = {
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=450,
- 				["num_for_nothing"]="Ug1c"
+				["num"]=60,
+ 				["num_for_nothing"]="UAg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=15000,
- 				["num_for_nothing"]="Vw1cA2U="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=14,
- 				["id_for_nothing"]="Vww=",
-				["num"]=2,
- 				["num_for_nothing"]="VA=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=15,
- 				["id_for_nothing"]="Vw0=",
-				["num"]=2,
- 				["num_for_nothing"]="VA=="
+				["num"]=1517,
+ 				["num_for_nothing"]="Vw1dBA=="
 			}
 		},
 		["original"]=17,
@@ -719,32 +439,16 @@ local act_chapter_store = {
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=450,
- 				["num_for_nothing"]="Ug1c"
+				["num"]=60,
+ 				["num_for_nothing"]="UAg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=15000,
- 				["num_for_nothing"]="Vw1cA2U="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=14,
- 				["id_for_nothing"]="Vww=",
-				["num"]=2,
- 				["num_for_nothing"]="VA=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=15,
- 				["id_for_nothing"]="Vw0=",
-				["num"]=2,
- 				["num_for_nothing"]="VA=="
+				["num"]=1518,
+ 				["num_for_nothing"]="Vw1dCw=="
 			}
 		},
 		["original"]=17,
@@ -759,32 +463,16 @@ local act_chapter_store = {
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=450,
- 				["num_for_nothing"]="Ug1c"
+				["num"]=60,
+ 				["num_for_nothing"]="UAg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=15000,
- 				["num_for_nothing"]="Vw1cA2U="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=14,
- 				["id_for_nothing"]="Vww=",
-				["num"]=2,
- 				["num_for_nothing"]="VA=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=15,
- 				["id_for_nothing"]="Vw0=",
-				["num"]=2,
- 				["num_for_nothing"]="VA=="
+				["num"]=1519,
+ 				["num_for_nothing"]="Vw1dCg=="
 			}
 		},
 		["original"]=17,
@@ -799,32 +487,16 @@ local act_chapter_store = {
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=540,
- 				["num_for_nothing"]="Uwxc"
+				["num"]=60,
+ 				["num_for_nothing"]="UAg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=18000,
- 				["num_for_nothing"]="VwBcA2U="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=14,
- 				["id_for_nothing"]="Vww=",
-				["num"]=3,
- 				["num_for_nothing"]="VQ=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=15,
- 				["id_for_nothing"]="Vw0=",
-				["num"]=2,
- 				["num_for_nothing"]="VA=="
+				["num"]=1520,
+ 				["num_for_nothing"]="Vw1eAw=="
 			}
 		},
 		["original"]=18,
@@ -839,32 +511,16 @@ local act_chapter_store = {
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=540,
- 				["num_for_nothing"]="Uwxc"
+				["num"]=60,
+ 				["num_for_nothing"]="UAg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=18000,
- 				["num_for_nothing"]="VwBcA2U="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=14,
- 				["id_for_nothing"]="Vww=",
-				["num"]=3,
- 				["num_for_nothing"]="VQ=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=15,
- 				["id_for_nothing"]="Vw0=",
-				["num"]=2,
- 				["num_for_nothing"]="VA=="
+				["num"]=1521,
+ 				["num_for_nothing"]="Vw1eAg=="
 			}
 		},
 		["original"]=18,
@@ -879,32 +535,16 @@ local act_chapter_store = {
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=540,
- 				["num_for_nothing"]="Uwxc"
+				["num"]=60,
+ 				["num_for_nothing"]="UAg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=18000,
- 				["num_for_nothing"]="VwBcA2U="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=14,
- 				["id_for_nothing"]="Vww=",
-				["num"]=3,
- 				["num_for_nothing"]="VQ=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=15,
- 				["id_for_nothing"]="Vw0=",
-				["num"]=2,
- 				["num_for_nothing"]="VA=="
+				["num"]=1522,
+ 				["num_for_nothing"]="Vw1eAQ=="
 			}
 		},
 		["original"]=18,
@@ -919,32 +559,16 @@ local act_chapter_store = {
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=540,
- 				["num_for_nothing"]="Uwxc"
+				["num"]=60,
+ 				["num_for_nothing"]="UAg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=18000,
- 				["num_for_nothing"]="VwBcA2U="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=14,
- 				["id_for_nothing"]="Vww=",
-				["num"]=3,
- 				["num_for_nothing"]="VQ=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=15,
- 				["id_for_nothing"]="Vw0=",
-				["num"]=2,
- 				["num_for_nothing"]="VA=="
+				["num"]=1523,
+ 				["num_for_nothing"]="Vw1eAA=="
 			}
 		},
 		["original"]=18,
@@ -959,32 +583,16 @@ local act_chapter_store = {
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=540,
- 				["num_for_nothing"]="Uwxc"
+				["num"]=60,
+ 				["num_for_nothing"]="UAg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=18000,
- 				["num_for_nothing"]="VwBcA2U="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=14,
- 				["id_for_nothing"]="Vww=",
-				["num"]=3,
- 				["num_for_nothing"]="VQ=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=15,
- 				["id_for_nothing"]="Vw0=",
-				["num"]=2,
- 				["num_for_nothing"]="VA=="
+				["num"]=1524,
+ 				["num_for_nothing"]="Vw1eBw=="
 			}
 		},
 		["original"]=18,
@@ -999,32 +607,16 @@ local act_chapter_store = {
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=900,
- 				["num_for_nothing"]="Xwhc"
+				["num"]=60,
+ 				["num_for_nothing"]="UAg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=30000,
- 				["num_for_nothing"]="VQhcA2U="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=14,
- 				["id_for_nothing"]="Vww=",
-				["num"]=4,
- 				["num_for_nothing"]="Ug=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=15,
- 				["id_for_nothing"]="Vw0=",
-				["num"]=4,
- 				["num_for_nothing"]="Ug=="
+				["num"]=1525,
+ 				["num_for_nothing"]="Vw1eBg=="
 			}
 		},
 		["original"]=19,
@@ -1039,32 +631,16 @@ local act_chapter_store = {
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=900,
- 				["num_for_nothing"]="Xwhc"
+				["num"]=60,
+ 				["num_for_nothing"]="UAg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=30000,
- 				["num_for_nothing"]="VQhcA2U="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=14,
- 				["id_for_nothing"]="Vww=",
-				["num"]=4,
- 				["num_for_nothing"]="Ug=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=15,
- 				["id_for_nothing"]="Vw0=",
-				["num"]=4,
- 				["num_for_nothing"]="Ug=="
+				["num"]=1526,
+ 				["num_for_nothing"]="Vw1eBQ=="
 			}
 		},
 		["original"]=19,
@@ -1079,32 +655,16 @@ local act_chapter_store = {
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=900,
- 				["num_for_nothing"]="Xwhc"
+				["num"]=60,
+ 				["num_for_nothing"]="UAg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=30000,
- 				["num_for_nothing"]="VQhcA2U="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=14,
- 				["id_for_nothing"]="Vww=",
-				["num"]=4,
- 				["num_for_nothing"]="Ug=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=15,
- 				["id_for_nothing"]="Vw0=",
-				["num"]=4,
- 				["num_for_nothing"]="Ug=="
+				["num"]=1527,
+ 				["num_for_nothing"]="Vw1eBA=="
 			}
 		},
 		["original"]=19,
@@ -1119,32 +679,16 @@ local act_chapter_store = {
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=900,
- 				["num_for_nothing"]="Xwhc"
+				["num"]=60,
+ 				["num_for_nothing"]="UAg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=30000,
- 				["num_for_nothing"]="VQhcA2U="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=14,
- 				["id_for_nothing"]="Vww=",
-				["num"]=4,
- 				["num_for_nothing"]="Ug=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=15,
- 				["id_for_nothing"]="Vw0=",
-				["num"]=4,
- 				["num_for_nothing"]="Ug=="
+				["num"]=1528,
+ 				["num_for_nothing"]="Vw1eCw=="
 			}
 		},
 		["original"]=19,
@@ -1159,32 +703,16 @@ local act_chapter_store = {
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=900,
- 				["num_for_nothing"]="Xwhc"
+				["num"]=60,
+ 				["num_for_nothing"]="UAg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=30000,
- 				["num_for_nothing"]="VQhcA2U="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=14,
- 				["id_for_nothing"]="Vww=",
-				["num"]=4,
- 				["num_for_nothing"]="Ug=="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=15,
- 				["id_for_nothing"]="Vw0=",
-				["num"]=4,
- 				["num_for_nothing"]="Ug=="
+				["num"]=1529,
+ 				["num_for_nothing"]="Vw1eCg=="
 			}
 		},
 		["original"]=19,
@@ -1199,32 +727,16 @@ local act_chapter_store = {
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=900,
- 				["num_for_nothing"]="Xwhc"
+				["num"]=60,
+ 				["num_for_nothing"]="UAg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=30000,
- 				["num_for_nothing"]="VQhcA2U="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=28,
- 				["num_for_nothing"]="VAA="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=15,
- 				["id_for_nothing"]="Vw0=",
-				["num"]=4,
- 				["num_for_nothing"]="Ug=="
+				["num"]=1530,
+ 				["num_for_nothing"]="Vw1fAw=="
 			}
 		},
 		["original"]=19,
@@ -1239,32 +751,16 @@ local act_chapter_store = {
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=900,
- 				["num_for_nothing"]="Xwhc"
+				["num"]=60,
+ 				["num_for_nothing"]="UAg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=30000,
- 				["num_for_nothing"]="VQhcA2U="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=28,
- 				["num_for_nothing"]="VAA="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=15,
- 				["id_for_nothing"]="Vw0=",
-				["num"]=4,
- 				["num_for_nothing"]="Ug=="
+				["num"]=1531,
+ 				["num_for_nothing"]="Vw1fAg=="
 			}
 		},
 		["original"]=19,
@@ -1279,32 +775,16 @@ local act_chapter_store = {
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=900,
- 				["num_for_nothing"]="Xwhc"
+				["num"]=60,
+ 				["num_for_nothing"]="UAg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=30000,
- 				["num_for_nothing"]="VQhcA2U="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=28,
- 				["num_for_nothing"]="VAA="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=15,
- 				["id_for_nothing"]="Vw0=",
-				["num"]=4,
- 				["num_for_nothing"]="Ug=="
+				["num"]=1532,
+ 				["num_for_nothing"]="Vw1fAQ=="
 			}
 		},
 		["original"]=19,
@@ -1319,32 +799,16 @@ local act_chapter_store = {
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=900,
- 				["num_for_nothing"]="Xwhc"
+				["num"]=60,
+ 				["num_for_nothing"]="UAg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=30000,
- 				["num_for_nothing"]="VQhcA2U="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=28,
- 				["num_for_nothing"]="VAA="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=15,
- 				["id_for_nothing"]="Vw0=",
-				["num"]=4,
- 				["num_for_nothing"]="Ug=="
+				["num"]=1533,
+ 				["num_for_nothing"]="Vw1fAA=="
 			}
 		},
 		["original"]=19,
@@ -1359,32 +823,16 @@ local act_chapter_store = {
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=900,
- 				["num_for_nothing"]="Xwhc"
+				["num"]=60,
+ 				["num_for_nothing"]="UAg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=30000,
- 				["num_for_nothing"]="VQhcA2U="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=28,
- 				["num_for_nothing"]="VAA="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=15,
- 				["id_for_nothing"]="Vw0=",
-				["num"]=4,
- 				["num_for_nothing"]="Ug=="
+				["num"]=1534,
+ 				["num_for_nothing"]="Vw1fBw=="
 			}
 		},
 		["original"]=19,
@@ -1399,32 +847,16 @@ local act_chapter_store = {
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=1200,
- 				["num_for_nothing"]="VwpcAw=="
+				["num"]=60,
+ 				["num_for_nothing"]="UAg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=50000,
- 				["num_for_nothing"]="UwhcA2U="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=42,
- 				["num_for_nothing"]="Ugo="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=15,
- 				["id_for_nothing"]="Vw0=",
-				["num"]=6,
- 				["num_for_nothing"]="UA=="
+				["num"]=1535,
+ 				["num_for_nothing"]="Vw1fBg=="
 			}
 		},
 		["original"]=19,
@@ -1439,32 +871,16 @@ local act_chapter_store = {
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=1200,
- 				["num_for_nothing"]="VwpcAw=="
+				["num"]=60,
+ 				["num_for_nothing"]="UAg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=50000,
- 				["num_for_nothing"]="UwhcA2U="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=42,
- 				["num_for_nothing"]="Ugo="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=15,
- 				["id_for_nothing"]="Vw0=",
-				["num"]=6,
- 				["num_for_nothing"]="UA=="
+				["num"]=1536,
+ 				["num_for_nothing"]="Vw1fBQ=="
 			}
 		},
 		["original"]=19,
@@ -1479,32 +895,16 @@ local act_chapter_store = {
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=1200,
- 				["num_for_nothing"]="VwpcAw=="
+				["num"]=60,
+ 				["num_for_nothing"]="UAg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=50000,
- 				["num_for_nothing"]="UwhcA2U="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=42,
- 				["num_for_nothing"]="Ugo="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=15,
- 				["id_for_nothing"]="Vw0=",
-				["num"]=6,
- 				["num_for_nothing"]="UA=="
+				["num"]=1537,
+ 				["num_for_nothing"]="Vw1fBA=="
 			}
 		},
 		["original"]=19,
@@ -1519,32 +919,16 @@ local act_chapter_store = {
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=1200,
- 				["num_for_nothing"]="VwpcAw=="
+				["num"]=60,
+ 				["num_for_nothing"]="UAg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=50000,
- 				["num_for_nothing"]="UwhcA2U="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=42,
- 				["num_for_nothing"]="Ugo="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=15,
- 				["id_for_nothing"]="Vw0=",
-				["num"]=6,
- 				["num_for_nothing"]="UA=="
+				["num"]=1538,
+ 				["num_for_nothing"]="Vw1fCw=="
 			}
 		},
 		["original"]=19,
@@ -1559,32 +943,16 @@ local act_chapter_store = {
  				["type_for_nothing"]="Vw==",
 				["id"]=2,
  				["id_for_nothing"]="VA==",
-				["num"]=1200,
- 				["num_for_nothing"]="VwpcAw=="
+				["num"]=60,
+ 				["num_for_nothing"]="UAg="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=50000,
- 				["num_for_nothing"]="UwhcA2U="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=47,
- 				["id_for_nothing"]="Ug8=",
-				["num"]=42,
- 				["num_for_nothing"]="Ugo="
-			},
-			{
-				["type"]=1,
- 				["type_for_nothing"]="Vw==",
-				["id"]=15,
- 				["id_for_nothing"]="Vw0=",
-				["num"]=6,
- 				["num_for_nothing"]="UA=="
+				["num"]=1539,
+ 				["num_for_nothing"]="Vw1fCg=="
 			}
 		},
 		["original"]=19,
diff --git a/lua/app/module/battle/battle_const.lua b/lua/app/module/battle/battle_const.lua
index 9845136e..61002e0d 100644
--- a/lua/app/module/battle/battle_const.lua
+++ b/lua/app/module/battle/battle_const.lua
@@ -220,7 +220,7 @@ BattleConst.SPINE_ANIMATION_NAME = {
 	IDLE = "idle",
     ATTACK = "attack01",
     MOVE = "move",
-    HIT = "suffer",
+    HIT = "suffer01",
     HIT_2 = "suffer02",
     DEAD = "death",
     BORN = "born",
diff --git a/lua/app/ui/idle/idle_drop_ui.lua b/lua/app/ui/idle/idle_drop_ui.lua
index 82a62896..acf9b40e 100644
--- a/lua/app/ui/idle/idle_drop_ui.lua
+++ b/lua/app/ui/idle/idle_drop_ui.lua
@@ -7,373 +7,380 @@ local FIGHT_STATE_WAIT = 2
 local REFRESH_INTERVAL_TIME = 60
 
 function IdleDropUI:isFullScreen()
-    return  false
+	return  false
 end
 
 function IdleDropUI:getPrefabPath()
-    return "assets/prefabs/ui/idle/idle_drop_ui.prefab"
+	return "assets/prefabs/ui/idle/idle_drop_ui.prefab"
 end
 
 function IdleDropUI:ctor()
-    self.itemList = {}
-    self.canRefreshReward = false
-    self.fightState = FIGHT_STATE_STOP
-    self.fightWaitTime = 0
+	self.itemList = {}
+	self.canRefreshReward = false
+	self.fightState = FIGHT_STATE_STOP
+	self.fightWaitTime = 0
 end
 
 function IdleDropUI:onCover()
-    if self.cdSid then
-        self:pauseScheduleGlobal(self.cdSid)
-    end
+	if self.cdSid then
+		self:pauseScheduleGlobal(self.cdSid)
+	end
 end
 
 function IdleDropUI:onReshow()
-    if self.cdSid then
-        self:resumeScheduleGlobal(self.cdSid)
-    end
-    -- 检查是否升级
-    if DataManager.PlayerData:getIfCanLevelUp() then
-        ModuleManager.PlayerManager:levelUp()
-    end
+	if self.cdSid then
+		self:resumeScheduleGlobal(self.cdSid)
+	end
+	-- 检查是否升级
+	if DataManager.PlayerData:getIfCanLevelUp() then
+		ModuleManager.PlayerManager:levelUp()
+	end
 end
 
 function IdleDropUI:onClose()
-    if self.fightRoot then
-        self.fightRoot:removeAllChildren()
-    end
+	if self.fightRoot then
+		self.fightRoot:removeAllChildren()
+	end
 end
 
 function IdleDropUI:onLoadRootComplete()
-    local uiMap = self.root:genAllChildren()
-    self.uiMap = uiMap
-    uiMap["idle_drop_ui.bg.title_text"]:setText(I18N:getGlobalText(I18N.GlobalConst.IDLE_DROP_REWARD))
-    uiMap["idle_drop_ui.bg.desc_tx_1"]:setText(I18N:getGlobalText(I18N.GlobalConst.IDLE_DROP_DESC_1))
-    self.timeTx = uiMap["idle_drop_ui.bg.time_tx"]
+	local uiMap = self.root:genAllChildren()
+	self.uiMap = uiMap
+	uiMap["idle_drop_ui.bg.title_text"]:setText(I18N:getGlobalText(I18N.GlobalConst.IDLE_DROP_REWARD))
+	self.timeTx = uiMap["idle_drop_ui.bg.time_tx"]
 
-    local goldPerHour = GFunc.num2Str(DataManager.IdleData:getGoldPerHour())
-    local expPerHour = GFunc.num2Str(DataManager.IdleData:getExpPerHour())
-    uiMap["idle_drop_ui.bg.bg_1.desc"]:setText(I18N:getGlobalText(I18N.GlobalConst.PER_HOUR, goldPerHour))
-    uiMap["idle_drop_ui.bg.bg_2.desc"]:setText(I18N:getGlobalText(I18N.GlobalConst.PER_HOUR, expPerHour))
+	local goldPerHour = GFunc.num2Str(DataManager.IdleData:getGoldPerHour())
+	local expPerHour = GFunc.num2Str(DataManager.IdleData:getExpPerHour())
+	uiMap["idle_drop_ui.bg.bg_1.desc"]:setText(I18N:getGlobalText(I18N.GlobalConst.PER_HOUR, goldPerHour))
+	uiMap["idle_drop_ui.bg.bg_2.desc"]:setText(I18N:getGlobalText(I18N.GlobalConst.PER_HOUR, expPerHour))
 
-    local idleMaxTime = DataManager.IdleData:getIdleMaxTime()
-    uiMap["idle_drop_ui.bg.desc_tx_2"]:setText(I18N:getGlobalText(I18N.GlobalConst.IDLE_DROP_DESC_2, idleMaxTime // 3600))
-    self.quickBtn = uiMap["idle_drop_ui.bg.quick_btn"]
-    self.quickBtn:addClickListener(function()
-        ModuleManager.IdleManager:showIdleQuickDropUI()
-    end)
-    uiMap["idle_drop_ui.bg.quick_btn.text"]:setText(I18N:getGlobalText(I18N.GlobalConst.IDLE_QUICK))
-    self.getBtn = uiMap["idle_drop_ui.bg.get_btn"]
-    self.getBtn:addClickListener(function()
-        self.lastRefreshTime = Time:getServerTime()
-        ModuleManager.IdleManager:getIdleRewrad()
-    end)
-    uiMap["idle_drop_ui.bg.get_btn.text"]:setText(I18N:getGlobalText(I18N.GlobalConst.BTN_CLAIM))
-    uiMap["idle_drop_ui.bg.close_btn"]:addClickListener(function()
-        self:closeUI()
-    end)
+	local idleMaxTime = DataManager.IdleData:getIdleMaxTime()
+	-- uiMap["idle_drop_ui.bg.desc_tx_2"]:setText(I18N:getGlobalText(I18N.GlobalConst.IDLE_DROP_DESC_2, idleMaxTime // 3600))
+	uiMap["idle_drop_ui.bg.desc_tx_1"]:setText(I18N:getGlobalText(I18N.GlobalConst.IDLE_DROP_DESC_1) .. I18N:getGlobalText(I18N.GlobalConst.IDLE_DROP_DESC_2, idleMaxTime // 3600))
+	self.quickBtn = uiMap["idle_drop_ui.bg.quick_btn"]
+	self.quickBtn:addClickListener(function()
+		ModuleManager.IdleManager:showIdleQuickDropUI()
+	end)
+	uiMap["idle_drop_ui.bg.quick_btn.text"]:setText(I18N:getGlobalText(I18N.GlobalConst.IDLE_QUICK))
+	self.getBtn = uiMap["idle_drop_ui.bg.get_btn"]
+	self.getBtn:addClickListener(function()
+		self.lastRefreshTime = Time:getServerTime()
+		ModuleManager.IdleManager:getIdleRewrad()
+	end)
+	uiMap["idle_drop_ui.bg.get_btn.text"]:setText(I18N:getGlobalText(I18N.GlobalConst.BTN_CLAIM))
+	self.root:addClickListener(function()
+		self:closeUI()
+	end)
 
-    self.fightRoot = self.uiMap["idle_drop_ui.bg.fight_root"]
+	uiMap["idle_drop_ui.bg.desc_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.CLICK_CLOSE_DESC))
+	uiMap["idle_drop_ui.bg.bg1.desc_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.IDLE_DROP_DESC_3))
+	uiMap["idle_drop_ui.bg.bg1.desc_tx_1"]:setText(I18N:getGlobalText(I18N.GlobalConst.IDLE_DROP_DESC_3))
+	uiMap["idle_drop_ui.bg.bg1"]:addClickListener(function()
+		self:closeUI()
+	end)
 
-    self:initRewards()
-    self:initSmallFight()
-    self:bindData()
-    self:refreshCD()
+	self.fightRoot = self.uiMap["idle_drop_ui.bg.fight_root"]
+
+	self:initRewards()
+	self:initSmallFight()
+	self:bindData()
+	self:refreshCD()
 	self.cdSid = self:scheduleGlobal(function()
 		self:refreshCD()
 	end, 1)
-    self:scheduleGlobal(function(dt)
+	self:scheduleGlobal(function(dt)
 		self:tickFight(dt)
 	end, 0)
 end
 
 function IdleDropUI:initRewards()
-    self.scrollRect = self.uiMap["idle_drop_ui.bg.scroll_rect"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.SCROLL_RECT_BASE)
-    self.scrollRect:addInitCallback(function()
+	self.scrollRect = self.uiMap["idle_drop_ui.bg.scroll_rect"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.SCROLL_RECT_BASE)
+	self.scrollRect:addInitCallback(function()
 		return GConst.TYPEOF_LUA_CLASS.REWARD_CELL
 	end)
 	self.scrollRect:addRefreshCallback(function(index, cell)
 		cell:refreshByConfig(self.itemList[index])
 	end)
-    self.scrollRect:clearCells()
-    self.scrollRect:setTotalCount(0)
+	self.scrollRect:clearCells()
+	self.scrollRect:setTotalCount(0)
 end
 
 function IdleDropUI:initSmallFight()
-    if self.atkUnit == nil then
-        local stageFormation = DataManager.FormationData:getStageFormation()
-        local tmpList = GFunc.getTempList()
-        for k, v in pairs(stageFormation) do
-            table.insert(tmpList, v)
-        end
-        if #tmpList <= 0 then
-            GFunc.recycleTempList(tmpList)
-            return
-        end
-        local heroId = tmpList[math.random(1, #tmpList)]
-        GFunc.recycleTempList(tmpList)
-        local heroInfo = ConfigManager:getConfig("hero")[heroId]
-        if heroInfo == nil then
-            return
-        end
-        SpineManager:loadHeroAsync(heroInfo.model_id, self.fightRoot, function(spineObject)
-            spineObject:setDefaultMix(0)
-            local atkUnitComp = spineObject:addLuaComponent(IDLE_UNIT_COMPONENT)
+	if self.atkUnit == nil then
+		local stageFormation = DataManager.FormationData:getStageFormation()
+		local tmpList = GFunc.getTempList()
+		for k, v in pairs(stageFormation) do
+			table.insert(tmpList, v)
+		end
+		if #tmpList <= 0 then
+			GFunc.recycleTempList(tmpList)
+			return
+		end
+		local heroId = tmpList[math.random(1, #tmpList)]
+		GFunc.recycleTempList(tmpList)
+		local heroInfo = ConfigManager:getConfig("hero")[heroId]
+		if heroInfo == nil then
+			return
+		end
+		SpineManager:loadHeroAsync(heroInfo.model_id, self.fightRoot, function(spineObject)
+			spineObject:setDefaultMix(0)
+			local atkUnitComp = spineObject:addLuaComponent(IDLE_UNIT_COMPONENT)
 			atkUnitComp:prepare(1, heroInfo.model_id)
-            atkUnitComp:initSkills(heroInfo.hurt_skill)
+			atkUnitComp:initSkills(heroInfo.hurt_skill)
 			self.atkUnit = atkUnitComp
-            self:onIdleUnitInitFinish()
-        end)
-    end
+			self:onIdleUnitInitFinish()
+		end)
+	end
 
-    if self.defUnit == nil then
-        local chapterId = DataManager.ChapterData:getMaxChapterId()
-        if chapterId <= 0 then
-            chapterId = DataManager.ChapterData:getChapterId()
-        end
-        local chapterInfo = ConfigManager:getConfig("chapter")[chapterId]
-        if chapterInfo == nil then
-            return
-        end
-        local tmpMap = GFunc.getTempMap()
-        self.monsterList = {}
-        local monsterCfg = ConfigManager:getConfig("monster")
-        for k, v in ipairs(chapterInfo.monster) do
-            local monsterInfo = monsterCfg[v]
-            if monsterInfo ~= nil then
-                if monsterInfo.is_boss == nil and tmpMap[monsterInfo.model_id] == nil then
-                    tmpMap[monsterInfo.model_id] = true
-                    table.insert(self.monsterList, v)
-                end
-            end
-        end
-        GFunc.recycleTempMap(tmpMap)
-        if #self.monsterList <= 0 then
-            return
-        end
-        if self.idleMonsterIndex == nil then
-            self.idleMonsterIndex = math.random(1, #self.monsterList)
-        else
-            local temp = self.monsterList[#self.monsterList]
-            self.monsterList[#self.monsterList] = self.monsterList[self.idleMonsterIndex]
-            self.monsterList[self.idleMonsterIndex] = temp
-            self.idleMonsterIndex = math.random(1, #self.monsterList - 1)
-        end
-        self.idleMonsterId = self.monsterList[self.idleMonsterIndex]
-        self:getDefUnit(function(defUnitComp)
-            self.defUnit = defUnitComp
-            self:onIdleUnitInitFinish()
-        end)
-    end
+	if self.defUnit == nil then
+		local chapterId = DataManager.ChapterData:getMaxChapterId()
+		if chapterId <= 0 then
+			chapterId = DataManager.ChapterData:getChapterId()
+		end
+		local chapterInfo = ConfigManager:getConfig("chapter")[chapterId]
+		if chapterInfo == nil then
+			return
+		end
+		local tmpMap = GFunc.getTempMap()
+		self.monsterList = {}
+		local monsterCfg = ConfigManager:getConfig("monster")
+		for k, v in ipairs(chapterInfo.monster) do
+			local monsterInfo = monsterCfg[v]
+			if monsterInfo ~= nil then
+				if monsterInfo.is_boss == nil and tmpMap[monsterInfo.model_id] == nil then
+					tmpMap[monsterInfo.model_id] = true
+					table.insert(self.monsterList, v)
+				end
+			end
+		end
+		GFunc.recycleTempMap(tmpMap)
+		if #self.monsterList <= 0 then
+			return
+		end
+		if self.idleMonsterIndex == nil then
+			self.idleMonsterIndex = math.random(1, #self.monsterList)
+		else
+			local temp = self.monsterList[#self.monsterList]
+			self.monsterList[#self.monsterList] = self.monsterList[self.idleMonsterIndex]
+			self.monsterList[self.idleMonsterIndex] = temp
+			self.idleMonsterIndex = math.random(1, #self.monsterList - 1)
+		end
+		self.idleMonsterId = self.monsterList[self.idleMonsterIndex]
+		self:getDefUnit(function(defUnitComp)
+			self.defUnit = defUnitComp
+			self:onIdleUnitInitFinish()
+		end)
+	end
 end
 
 function IdleDropUI:onIdleUnitInitFinish()
-    if self.atkUnit == nil then
-        return
-    end
-    if self.defUnit == nil then
-        return
-    end
-    self.atkUnit:setTarget(self.defUnit)
-    self.defUnit:setTarget(self.atkUnit)
-    self.fightWaitTime = self.defUnit:getBornTime() + 0.2
-    self.fightState = FIGHT_STATE_WAIT
-    self.atkUnit:playBorn()
-    self.defUnit:playBorn()
+	if self.atkUnit == nil then
+		return
+	end
+	if self.defUnit == nil then
+		return
+	end
+	self.atkUnit:setTarget(self.defUnit)
+	self.defUnit:setTarget(self.atkUnit)
+	self.fightWaitTime = self.defUnit:getBornTime() + 0.2
+	self.fightState = FIGHT_STATE_WAIT
+	self.atkUnit:playBorn()
+	self.defUnit:playBorn()
 end
 
 function IdleDropUI:bindData()
-    self:bind(DataManager.IdleData, "dirty", function()
-        self:onRefresh()
-        self.canRefreshReward = true
-        self:refreshCD()
-    end)
+	self:bind(DataManager.IdleData, "dirty", function()
+		self:onRefresh()
+		self.canRefreshReward = true
+		self:refreshCD()
+	end)
 end
 
 function IdleDropUI:onRefresh()
-    self:refreshRewards()
-    self:refreshBtns()
+	self:refreshRewards()
+	self:refreshBtns()
 end
 
 function IdleDropUI:refreshRewards()
-    for i = 1, #self.itemList do
-        table.remove(self.itemList)
-    end
-    local rewards = DataManager.IdleData:getIdleRewards()
-    for _, item in pairs(rewards) do
-        if item.num > 0 then
-            table.insert(self.itemList, item)
-        end
-    end
-    if #self.itemList > 1 then
-        -- 道具类型从低到高>道具ID从低到高>品质从高到低
-        local cfg = ConfigManager:getConfig("item")
-        local infoA
-        local infoB
-        table.sort(self.itemList, function(a, b)
-            infoA = cfg[a.id]
-            infoB = cfg[b.id]
-            if infoA.type == infoB.type then
-                if infoA.qlt == infoB.qlt then
-                    return infoA.qlt > infoB.qlt
-                else
-                    return a.id < b.id
-                end
-            else
-                return infoA.type < infoB.type
-            end
-        end)
-    end
-    if self.scrollRect:getTotalCount() ~= #self.itemList then -- 打开界面的时候定位到当前可领取的最低等级奖励，如果没有则定位到当前等级
+	for i = 1, #self.itemList do
+		table.remove(self.itemList)
+	end
+	local rewards = DataManager.IdleData:getIdleRewards()
+	for _, item in pairs(rewards) do
+		if item.num > 0 then
+			table.insert(self.itemList, item)
+		end
+	end
+	if #self.itemList > 1 then
+		-- 道具类型从低到高>道具ID从低到高>品质从高到低
+		local cfg = ConfigManager:getConfig("item")
+		local infoA
+		local infoB
+		table.sort(self.itemList, function(a, b)
+			infoA = cfg[a.id]
+			infoB = cfg[b.id]
+			if infoA.type == infoB.type then
+				if infoA.qlt == infoB.qlt then
+					return infoA.qlt > infoB.qlt
+				else
+					return a.id < b.id
+				end
+			else
+				return infoA.type < infoB.type
+			end
+		end)
+	end
+	if self.scrollRect:getTotalCount() ~= #self.itemList then -- 打开界面的时候定位到当前可领取的最低等级奖励，如果没有则定位到当前等级
 		self.scrollRect:refillCells(#self.itemList)
 	else
 		self.scrollRect:updateAllCell()
-    end
+	end
 end
 
 function IdleDropUI:refreshBtns()
-    if #self.itemList > 0 then
-        self.getBtn:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_green_2")
-        self.getBtn:setTouchEnable(true)
-    else
-        self.getBtn:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_grey_2")
-        self.getBtn:setTouchEnable(false)
-    end
-    local quickTimes = DataManager.IdleData:getQuickIdleRemainTimes()
-    if quickTimes > 0 then
-        self.quickBtn:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_yellow_2")
-        self.quickBtn:setTouchEnable(true)
-        self:addQuickBtnRedPoint()
-    else
-        self.quickBtn:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_grey_2")
-        self.quickBtn:setTouchEnable(false)
-        self:removeQuickBtnRedPoint()
-    end
+	if #self.itemList > 0 then
+		self.getBtn:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_yellow_1")
+		self.getBtn:setTouchEnable(true)
+	else
+		self.getBtn:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_grey_1")
+		self.getBtn:setTouchEnable(false)
+	end
+	local quickTimes = DataManager.IdleData:getQuickIdleRemainTimes()
+	if quickTimes > 0 then
+		self.quickBtn:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_blue_1")
+		self.quickBtn:setTouchEnable(true)
+		self:addQuickBtnRedPoint()
+	else
+		self.quickBtn:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_grey_1")
+		self.quickBtn:setTouchEnable(false)
+		self:removeQuickBtnRedPoint()
+	end
 end
 
 function IdleDropUI:refreshCD()
-    local time = Time:getServerTime() - DataManager.IdleData:getLastDropTime()
-    local idleMaxTime = DataManager.IdleData:getIdleMaxTime()
-    if time >= idleMaxTime then
-        if #self.itemList > 0 then
-            self:addGetBtnRedPoint()
-        else
-            self:removeGetBtnRedPoint()
-        end
-        self.timeTx:setText(Time:formatNumTime(idleMaxTime))
-    else
-        self:removeGetBtnRedPoint()
-        self.timeTx:setText(Time:formatNumTime(time))
-    end
-    if self.lastRefreshTime == nil then
-        self.lastRefreshTime = Time:getServerTime()
-    elseif Time:getServerTime() - self.lastRefreshTime > REFRESH_INTERVAL_TIME then
-        if not self.canRefreshReward then
-            return
-        end
-        self.canRefreshReward = false
-        self.lastRefreshTime = Time:getServerTime()
-        ModuleManager.IdleManager:getIdleShowRewrad()
-    end
+	local time = Time:getServerTime() - DataManager.IdleData:getLastDropTime()
+	local idleMaxTime = DataManager.IdleData:getIdleMaxTime()
+	if time >= idleMaxTime then
+		if #self.itemList > 0 then
+			self:addGetBtnRedPoint()
+		else
+			self:removeGetBtnRedPoint()
+		end
+		self.timeTx:setText(Time:formatNumTime(idleMaxTime))
+	else
+		self:removeGetBtnRedPoint()
+		self.timeTx:setText(Time:formatNumTime(time))
+	end
+	if self.lastRefreshTime == nil then
+		self.lastRefreshTime = Time:getServerTime()
+	elseif Time:getServerTime() - self.lastRefreshTime > REFRESH_INTERVAL_TIME then
+		if not self.canRefreshReward then
+			return
+		end
+		self.canRefreshReward = false
+		self.lastRefreshTime = Time:getServerTime()
+		ModuleManager.IdleManager:getIdleShowRewrad()
+	end
 end
 
 function IdleDropUI:addGetBtnRedPoint()
-    if self.getBtnRedPoint == true then
-        return
-    end
-    self.getBtnRedPoint = true
-    self.getBtn:addRedPoint(121, 42, 0.8)
+	if self.getBtnRedPoint == true then
+		return
+	end
+	self.getBtnRedPoint = true
+	self.getBtn:addRedPoint(70, 30, 0.5)
 end
 
 function IdleDropUI:removeGetBtnRedPoint()
-    if self.getBtnRedPoint == false then
-        return
-    end
-    self.getBtnRedPoint = false
-    self.getBtn:removeRedPoint()
+	if self.getBtnRedPoint == false then
+		return
+	end
+	self.getBtnRedPoint = false
+	self.getBtn:removeRedPoint()
 end
 
 function IdleDropUI:addQuickBtnRedPoint()
-    if self.quickBtnRedPoint == true then
-        return
-    end
-    self.quickBtnRedPoint = true
-    self.quickBtn:addRedPoint(121, 42, 0.8)
+	if self.quickBtnRedPoint == true then
+		return
+	end
+	self.quickBtnRedPoint = true
+	self.quickBtn:addRedPoint(90, 30, 0.5)
 end
 
 function IdleDropUI:removeQuickBtnRedPoint()
-    if self.quickBtnRedPoint == false then
-        return
-    end
-    self.quickBtnRedPoint = false
-    self.quickBtn:removeRedPoint()
+	if self.quickBtnRedPoint == false then
+		return
+	end
+	self.quickBtnRedPoint = false
+	self.quickBtn:removeRedPoint()
 end
 
 function IdleDropUI:findNextDefUnit()
-    local temp = self.monsterList[#self.monsterList]
-    self.monsterList[#self.monsterList] = self.monsterList[self.idleMonsterIndex]
-    self.monsterList[self.idleMonsterIndex] = temp
-    self.idleMonsterIndex = math.random(1, #self.monsterList - 1)
-    self.idleMonsterId = self.monsterList[self.idleMonsterIndex]
-    self:getDefUnit(function(defUnit)
-        self:recycleDefUnit(self.defUnit)
-        self.defUnit = defUnit
-        self.atkUnit:setTarget(self.defUnit)
-        self.defUnit:setTarget(self.atkUnit)
-        self.fightWaitTime = self.defUnit:getBornTime() + 0.2
-        self.fightState = FIGHT_STATE_WAIT
-        self.defUnit:playBorn()
-    end)
+	local temp = self.monsterList[#self.monsterList]
+	self.monsterList[#self.monsterList] = self.monsterList[self.idleMonsterIndex]
+	self.monsterList[self.idleMonsterIndex] = temp
+	self.idleMonsterIndex = math.random(1, #self.monsterList - 1)
+	self.idleMonsterId = self.monsterList[self.idleMonsterIndex]
+	self:getDefUnit(function(defUnit)
+		self:recycleDefUnit(self.defUnit)
+		self.defUnit = defUnit
+		self.atkUnit:setTarget(self.defUnit)
+		self.defUnit:setTarget(self.atkUnit)
+		self.fightWaitTime = self.defUnit:getBornTime() + 0.2
+		self.fightState = FIGHT_STATE_WAIT
+		self.defUnit:playBorn()
+	end)
 end
 
 function IdleDropUI:getDefUnit(callback)
-    if self.cacheUnit == nil then
-        self.cacheUnit = {}
-    end
-    local monsterCfg = ConfigManager:getConfig("monster")
-    local monsterInfo = monsterCfg[self.idleMonsterId]
-    local defUnit = self.cacheUnit[monsterInfo.model_id]
-    if defUnit then
-        defUnit:setActive(true)
-        return callback(defUnit)
-    end
-    SpineManager:loadHeroAsync(monsterInfo.model_id, self.fightRoot, function(spineObject)
-        spineObject:setDefaultMix(0)
-        local defUnitComp = spineObject:addLuaComponent(IDLE_UNIT_COMPONENT)
-        defUnitComp:prepare(2, monsterInfo.model_id)
-        callback(defUnitComp)
-    end)
+	if self.cacheUnit == nil then
+		self.cacheUnit = {}
+	end
+	local monsterCfg = ConfigManager:getConfig("monster")
+	local monsterInfo = monsterCfg[self.idleMonsterId]
+	local defUnit = self.cacheUnit[monsterInfo.model_id]
+	if defUnit then
+		defUnit:setActive(true)
+		return callback(defUnit)
+	end
+	SpineManager:loadHeroAsync(monsterInfo.model_id, self.fightRoot, function(spineObject)
+		spineObject:setDefaultMix(0)
+		local defUnitComp = spineObject:addLuaComponent(IDLE_UNIT_COMPONENT)
+		defUnitComp:prepare(2, monsterInfo.model_id)
+		callback(defUnitComp)
+	end)
 end
 
 function IdleDropUI:recycleDefUnit(defUnit)
-    if self.cacheUnit == nil then
-        self.cacheUnit = {}
-    end
-    defUnit:setActive(false)
-    self.cacheUnit[defUnit:getModelId()] = defUnit
+	if self.cacheUnit == nil then
+		self.cacheUnit = {}
+	end
+	defUnit:setActive(false)
+	self.cacheUnit[defUnit:getModelId()] = defUnit
 end
 
 function IdleDropUI:changeNextDefUnit()
-    self.defUnit:playDead(function()
-        self:findNextDefUnit()
-    end)
+	self.defUnit:playDead(function()
+		self:findNextDefUnit()
+	end)
 end
 
 function IdleDropUI:tickFight(dt)
-    if self.fightState == FIGHT_STATE_STOP then
-        return
-    end
-    self.atkUnit:tick(dt)
-    self.defUnit:tick(dt)
-    if self.fightState == FIGHT_STATE_FIGHT then
-    elseif self.fightState == FIGHT_STATE_WAIT then
-        self.fightWaitTime = self.fightWaitTime - dt
-        if self.fightWaitTime < 0 then
-            self.fightState = FIGHT_STATE_FIGHT
-            self.atkUnit:doAttack(function()
-                self:changeNextDefUnit()
-            end)
-        end
-    end
+	if self.fightState == FIGHT_STATE_STOP then
+		return
+	end
+	self.atkUnit:tick(dt)
+	self.defUnit:tick(dt)
+	if self.fightState == FIGHT_STATE_FIGHT then
+	elseif self.fightState == FIGHT_STATE_WAIT then
+		self.fightWaitTime = self.fightWaitTime - dt
+		if self.fightWaitTime < 0 then
+			self.fightState = FIGHT_STATE_FIGHT
+			self.atkUnit:doAttack(function()
+				self:changeNextDefUnit()
+			end)
+		end
+	end
 end
 
 return IdleDropUI
\ No newline at end of file