fenix 8 years ago
parent
commit
a257c3a41c

+ 9 - 0
Assets/Resources/XML/Config/All/word_config.xml

@@ -140,6 +140,7 @@
   <item title="GameInfo" label="deathInfo" English="%KILLER_NAME% have slain %DEATH_NAME%" Chinese="%KILLER_NAME%摧毁了%DEATH_NAME%" />
   <item title="GameInfo" label="selectCraft" English="Choose your mecha" Chinese="选择操纵的机甲" />
   <item title="GameInfo" label="swapCraft" English="Choose the mecha, which you want to swap." Chinese="选取将要交换机甲" />
+  <item title="GameInfo" label="occupy" English="&lt;color=%COLOR%&gt;%NAME% has occupied energy tower&lt;/color&gt;" Chinese="&lt;color=%COLOR%&gt;%NAME%占领了%DIRECTION%能量塔&lt;/color&gt;" />
   <item title="GameInfo" label="combo1" English="" Chinese="" />
   <item title="GameInfo" label="combo2" English="Double kill" Chinese="双杀" />
   <item title="GameInfo" label="combo3" English="Triple kill" Chinese="三杀" />
@@ -206,6 +207,14 @@
   <item title="Team" label="team1" English="Blue team" Chinese="蓝队" />
   <item title="Team" label="team2" English="Red team" Chinese="红队" />
   <item title="Team" label="team3" English="Yellow team" Chinese="黄队" />
+  <item title="Mission" label="rewardFailed" English="Get reward failed" Chinese="获取奖励失败" />
+  <item title="Mission" label="progress" English="Progress : %PROGRESS% / %TOTAL%" Chinese="进度 : %PROGRESS% / %TOTAL%" />
+  <item title="Mission" label="done" English="Tap to get reward" Chinese="已完成,点击领取" />
+  <item title="Mission" label="rewarded" English="Rewards already got" Chinese="已领取" />
+  <item title="Mission" label="rewardBelow" English="Get rewards below" Chinese="获得以下奖励" />
+  <item title="Mission" label="mission1" English="Daily reward." Chinese="签到:已累计%NUM%天" />
+  <item title="Mission" label="mission1Max" English="Sign in:Already maximum days" Chinese="签到:已累计最大天数" />
+  <item title="Mission" label="mission2" English="Complete %NUM% battles" Chinese="完成%NUM%场战斗" />
   <comment>
     <title>
 标题

BIN
Assets/ScenesNew/Base.unity


BIN
Assets/ScenesNew/Defense.unity


BIN
Assets/ScenesNew/Flag.unity


+ 4 - 1
Assets/Scripts/Misssion/MissionData.cs

@@ -44,7 +44,10 @@ public class MissionData
 	{
 		if(missionType == MissionData.MissionType.Checkin.GetHashCode())
 		{
-			return Language.GetStr("Mission", "mission1");
+			if(rewardCount >= rewardMaxCount )
+				return Language.GetStr("Mission", "mission1Max");
+			else
+				return Language.GetStr("Mission", "mission1").Replace("%NUM%", rewardCount.ToString());
 		}
 		else if(missionType == MissionData.MissionType.Battle.GetHashCode())
 		{

+ 1 - 1
Assets/Scripts/UI/Menu/MenuUI.cs

@@ -55,7 +55,7 @@ public class MenuUI : MonoBehaviour {
 
 		startBtnContainer.Show();
 		clanChatBar.Refresh ();
-//		missionBar.PrepareData ();
+		missionBar.PrepareData ();
 		//GetComponent<WoodenDummyManager>().enabled = true;
 	}
 

BIN
Assets/XlsxSource/All/word_config.xlsx


+ 2 - 2
Assets/XlsxSource/All/xlsx_md5.xml

@@ -7,6 +7,6 @@
   <a p="shop_config.xlsx" m="6cb07440e569e46bab9271ac43f7e84" />
   <a p="skin_config.xlsx" m="789f4f375c2a74b6364d92515a7bc35" />
   <a p="uav_config.xlsx" m="2b63e78ee3976e9c547a2829ea9a9bc" />
-  <a p="word_config.xlsx" m="2a46d0c0f4ba4070b1273a31864e4afb" />
-  <a p="xlsx_md5.xml" m="90cc057f236d1be5947fd7753812f64" />
+  <a p="word_config.xlsx" m="87f594888e8ad43612bbf266dc69d8f" />
+  <a p="xlsx_md5.xml" m="efb45f2fddef159878b8d1589d1e8b4e" />
 </xlsx>

BIN
Keys/qjh.kdb