fenix 8 years ago
parent
commit
7ffcb7f07c

+ 7 - 0
Assets/Models/Powers.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: adc019b90144b36498f5480b11bd0807
+folderAsset: yes
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 7 - 0
Assets/Models/StartPage.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 97a390ccbd78eb444b302fed00fa7fec
+folderAsset: yes
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 9 - 0
Assets/Plugins/iOS.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 044ce91500562494bbfb926267cf2c0f
+folderAsset: yes
+timeCreated: 1426488285
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 16 - 8
Assets/Resources/XML/Config/Chinese/shop_config.xml

@@ -1,12 +1,11 @@
 <data>
-  <item id="1" name="VIP 三天" description="3天VIP会员,全体机甲无限制选取" code="VIP1" platform="1" price="1" type="" icon="" />
-  <item id="2" name="VIP 七天" description="7天VIP会员,全体机甲无限制选取" code="VIP2" platform="1" price="2" type="" icon="" />
-  <item id="3" name="VIP 一年" description="一年VIP会员,全体机甲无限制选取" code="VIP3" platform="1" price="12" type="" icon="" />
-  <item id="4" name="VIP 一年" description="一年VIP会员,全体机甲无限制选取" code="VIP4" platform="2" price="12" type="" icon="VIP3" />
-  <item id="5" name="水晶10000" description="购买10000水晶" code="C10000" platform="1" price="1" type="" icon="" />
-  <item id="6" name="水晶25000" description="购买25000水晶" code="C25000" platform="1" price="2" type="" icon="" />
-  <item id="7" name="水晶75000" description="购买75000水晶" code="C75000" platform="1" price="5" type="" icon="" />
-  <item id="8" name="水晶90000" description="购买90000水晶" code="C90000" platform="2" price="6" type="" icon="" />
+  <item id="1" name="VIP 三天" description="3天VIP会员,全体机甲无限制选取" code="VIP1" value="" sort="" platform="1" price="1" type="" icon="" />
+  <item id="2" name="VIP 七天" description="7天VIP会员,全体机甲无限制选取" code="VIP2" value="" sort="" platform="1" price="2" type="" icon="" />
+  <item id="3" name="VIP 一年" description="一年VIP会员,全体机甲无限制选取" code="VIP3" value="" sort="" platform="1" price="12" type="" icon="" />
+  <item id="4" name="VIP one year" description="One year VIP, unlock all mechas." code="VIP4" value="" sort="1" platform="2" price="¥ 12.00" type="" icon="VIP3" />
+  <item id="5" name="水晶10000" description="X10000" code="C10000" value="10 000" sort="2" platform="2" price="¥ 6.00" type="" icon="" />
+  <item id="6" name="水晶25000" description="购买25000水晶" code="C25000" value="25 000" sort="2" platform="2" price="¥ 12.00" type="" icon="" />
+  <item id="7" name="水晶75000" description="购买75000水晶" code="C75000" value="75 000" sort="2" platform="2" price="¥ 30.00" type="" icon="" />
   <comment>
     <id>
 ID
@@ -20,6 +19,15 @@ ID
     <code>
 代码
 </code>
+    <value>
+值
+</value>
+    <sort>
+分类
+1.VIP
+2.水晶
+3.能量块
+</sort>
     <platform>
 平台
 

+ 132 - 21
Assets/Resources/XML/Language/Chinese.xml

@@ -8,14 +8,27 @@
     <continue>继续</continue>
     <back>返回</back>
     <noFunction>功能即将开放</noFunction>
+    <loading>加载中...</loading>
+    <share>分享</share>
+    <play>播放</play>
+    <replay>回放</replay>
+    <exit>离开</exit>
+    <watch>观看</watch>
   </Public>
   <Time>
+  	<day>日</day>
     <hour>小时</hour>
     <minute>分</minute>
     <second>秒</second>
+    <days>日</days>
     <hours>小时</hours>
     <minutes>分</minutes>
     <seconds>秒</seconds>
+    <d>天</d>
+    <h>时</h>
+    <min>分</min>
+    <justNow>刚刚</justNow>
+    <ago>之前</ago>
   </Time>
   <SNS>
     <getMyInfo>正在获取用户信息...</getMyInfo>
@@ -33,6 +46,9 @@
   	<loginFail><![CDATA[通行证邮箱或者密码错误\n\n请检查后重新输入]]></loginFail>
     <lost>与服务器断开了链接!</lost>
   </Connection>
+  <Login>
+  	<toGCUser><![CDATA[该Game Center账号已经有积分 {0}角色. \n你要换这个角色吗?]]></toGCUser>
+  </Login>
   <Activation>
     <activeBtn>激活账户</activeBtn>
     <activeTitle>输入激活码</activeTitle>
@@ -59,7 +75,88 @@
   	<toGame>返回机甲</toGame>
   	<Cooperation>合作模式</Cooperation>
   	<Normal>快速比赛</Normal>
+  	<vip>VIP</vip>
+  	<free>免费</free>
+  	<active>激活</active>
   </Menu>
+  <LeaderBoard>
+  	<title>排行榜</title>
+  	<myRank>我的排名</myRank>
+  </LeaderBoard>
+  <ClanPanel>
+  	<tab1Btn0>创建纵队</tab1Btn0>
+  	<tab1Btn1>加入纵队</tab1Btn1>
+  	<tab2Btn0>我的纵队</tab2Btn0>
+  	<tab2Btn1>搜索纵队</tab2Btn1>
+  	<nameLabel>纵队名字:</nameLabel>
+  	<descLabel>描述:</descLabel>
+  	<create>创建</create>
+  	<edit>编辑</edit>
+  	<emptyName>纵队名字不能为空!</emptyName>
+  	<menberLabel>成员:</menberLabel>
+  	<findLabel>搜索纵队:</findLabel>
+  	<findBtnLabel>搜索</findBtnLabel>
+  	<join>加入</join>
+  	<leave>离开</leave>
+  	<kick>你要让%NICK%离开纵队吗?</kick>
+  	<findTips>输入纵队ID或者纵队名字的前几个字</findTips>
+  	<rankLabel>纵队积分:</rankLabel>
+  	<idLabel>纵队ID:</idLabel>
+  	<requireLabel>进入要求:</requireLabel>
+  	<typeLabel>类型:</typeLabel>
+  	<type0>任何人都可以加入</type0>
+  	<type1>只有被批准才能加入</type1>
+  	<type2>不可加入</type2>
+  </ClanPanel>
+  <ChatPanel>
+  	<global>全部</global>
+  	<chat>聊天</chat>
+  	<follow>关注</follow>
+  	<fans>粉丝</fans>
+  	<array>纵队</array>
+  	<say>说:</say>
+  	<placeholder>点击这里聊天...</placeholder>
+  	<replayTitle>的战斗回放</replayTitle>
+  	<createClanTip>创建或加入一个纵队,一起变得强大.</createClanTip>
+  	<createClanLabel>立即加入</createClanLabel>
+  	<findLabel>搜索玩家:</findLabel>
+  	<findBtnLabel>搜索</findBtnLabel>
+  	<findTip>输入玩家ID或者玩家名字的前几个字</findTip>
+  	<chatWith>和 %NICK%聊天</chatWith>
+  	<findPlayer>搜索玩家</findPlayer>
+  	<findMorePlayer>寻找更多的玩家</findMorePlayer>
+  </ChatPanel>
+  <UserPanel>
+  	<profile>玩家简介</profile>
+  	<changeName>修改名称</changeName>
+  	<unfollow>取消关注</unfollow>
+  	<follow>关注</follow>
+  	<followed>你已经关注了 %NICK%.</followed>
+  	<unfollowed>你取消了对%NICK%的关注.</unfollowed>
+  	<win>胜利</win>
+  	<changeNick>输入你的新名字</changeNick>
+  </UserPanel>
+  <Invite>
+  	<navTab>邀请玩家一起战斗</navTab>
+  	<invite>邀请</invite>
+  	<state0><![CDATA[<color=#74FF51FF>在线</color>]]></state0>
+  	<state1><![CDATA[<color=#CDEBFFFF>战斗中</color>]]></state1>
+  	<state2><![CDATA[<color=#606060FF>离线</color>]]></state2>
+  	<nameState0><![CDATA[%NICK%]]></nameState0>
+  	<nameState1><![CDATA[<color=#FF9800FF>%NICK%</color>]]></nameState1>
+  	<nameState2><![CDATA[<color=#606060FF>%NICK%</color>]]></nameState2>
+  	<action0><![CDATA[邀请]]></action0>
+  	<action1><![CDATA[等待 (%SEC%)]]></action1>
+  	<action2><![CDATA[<color=#CDEBFFFF>拒绝 (%SEC%)</color>]]></action2>
+  	<action3><![CDATA[<color=#74FF51FF>在队伍中</color>]]></action3>
+  	<inviteLabel>邀请玩家</inviteLabel>
+  	<leaveLabel>离开队伍</leaveLabel>
+  	<teamLeftConfirm>你要离开队伍吗?</teamLeftConfirm>
+  	<teamInviteConfirm>%NICK%邀请你加入他的队伍.</teamInviteConfirm>
+  	<teamKickConfirm>你想让%NICK%离开队伍吗?</teamKickConfirm>
+  	<createClanTip>只能邀请同一个纵队的玩家,创建或者加入一个纵队.</createClanTip>
+  	<createClanLabel>立即加入</createClanLabel>
+  </Invite>
   <Mission>
   	<rewardFailed>获取奖励失败</rewardFailed>
   	<progress>进度 : %PROGRESS% / %TOTAL%</progress>
@@ -87,23 +184,6 @@
   	<heal><![CDATA[<color="#ffcc00ff">恢复:%VALUE%</color>]]></heal>
   	<cd><![CDATA[<color="#ffcc00ff">冷却时间:%CD%s</color>]]></cd>
   </Power>
-  <ResultPanel>
-  	<blueTeam>蓝队</blueTeam>
-  	<redTeam>红队</redTeam>
-  	<title>比赛结果</title>
-  	<stats>统计</stats>
-  	<kill>击杀</kill>
-  	<assist>助攻</assist>
-  	<death>阵亡</death>
-  	<damage>伤害</damage>
-  	<heal>治疗</heal>
-  	<score>荣誉</score>
-  	<total>总计</total>
-    <staging>进行中</staging>
-    <win>胜利</win>
-    <lose>失败</lose>
-    <draw>平局</draw>
-  </ResultPanel>
   <MenuPage>
     <connecting>正在连接服务器......</connecting>
     <connecFailed>连接服务器失败</connecFailed>
@@ -296,7 +376,7 @@
     <assistsInfo><![CDATA[,助攻<color=%ASSISTS_COLOR%>%ASSISTS%</color>。]]></assistsInfo>
     <occupy><![CDATA[<color=%COLOR%>%NAME%占领了%DIRECTION%能量塔</color>]]></occupy>
     <exit><![CDATA[<color=#FFCC00ff>战斗中断</color>]]></exit>
-    <selectCraft><![CDATA[选择操纵的<color=#FF9900ff>{0}机甲</color>]]></selectCraft>
+    <selectCraft><![CDATA[选择操纵的机甲]]></selectCraft>
     <craftIndex0><![CDATA[第一辆]]></craftIndex0>
     <craftIndex1><![CDATA[第二辆]]></craftIndex1>
     <craftIndex2><![CDATA[第三辆]]></craftIndex2>
@@ -463,7 +543,38 @@
 	<buyInfo>购买一年VIP会员,解锁所有机甲选取?</buyInfo>
 	<bought>购买成功,所有机甲已经解锁。</bought>
   </BuyVIP>
-  <LeaderBoard>
-  	<myRank>我的排名</myRank>
-  </LeaderBoard>
+  <BuyCoinPanel>
+	<title>商店</title>
+	<vipInfo>购买VIP,将解锁所有机甲.</vipInfo>
+	<vipBought>已经成为VIP, 所有机甲已经解锁.</vipBought>
+	<coinBought>获得{0}水晶.</coinBought>
+	<diamondBought>获得{0}能量块.</diamondBought>
+  </BuyCoinPanel>
+  <ResultPanel>
+  	<complete>战斗结束</complete>
+  	<winner><![CDATA[胜利者\n是]]></winner>
+    <draw>平局</draw>
+  </ResultPanel>
+  <NPCNick>
+  	<nick0>克利普顿</nick0>
+  	<nick1>卡艾尔</nick1>
+  	<nick2>斯蒂夫</nick2>
+  	<nick3>托尼</nick3>
+  	<nick4>班纳</nick4>
+  	<nick5>罗杰斯</nick5>
+  	<nick6>帕克</nick6>
+  	<nick7>克林特</nick7>
+  	<nick8>皮特罗</nick8>
+  	<nick9>强尼</nick9>
+  	<nick10>娜塔莎</nick10>
+  	<nick11>布鲁斯</nick11>
+  	<nick12>巴特曼</nick12>
+  	<nick13>欧比王</nick13>
+  	<nick14>奥干纳</nick14>
+  	<nick15>阿纳金</nick15>
+  	<nick16>鲁斯特</nick16>
+  	<nick17>格里多</nick17>
+  	<nick18>沙拉克</nick18>
+  	<nick19>萨缪尔</nick19>
+  </NPCNick>
 </lan>

+ 1 - 1
Assets/Resources/XML/Language/English.xml

@@ -26,7 +26,6 @@
     <hours>hours</hours>
     <minutes>minutes</minutes>
     <seconds>seconds</seconds>
-    <day>days</day>
     <d>d</d>
     <h>h</h>
     <min>min</min>
@@ -116,6 +115,7 @@
   	<findTip>Type player ID or the first letters of the player's name</findTip>
   	<chatWith>Chat with %NICK%</chatWith>
   	<findPlayer>Find Player</findPlayer>
+  	<findMorePlayer>Find more players</findMorePlayer>
   </ChatPanel>
   <UserPanel>
   	<profile>Profile</profile>

BIN
Assets/Scenes/Battle.unity


+ 2 - 2
Assets/Scripts/Config.cs

@@ -15,8 +15,8 @@ public class Config
 	//server port for china is empty string, for international is intl
 	public const string USER_PORT_CHINA = "";
 	public const string USER_PORT_INTERNATIONAL = "intl";
-	public static string USER_PORT = USER_PORT_INTERNATIONAL;
-//	public static string USER_PORT = USER_PORT_CHINA;
+//	public static string USER_PORT = USER_PORT_INTERNATIONAL;
+	public static string USER_PORT = USER_PORT_CHINA;
 
 
 //	public static bool USE_LOCAL_SERVER = true;

+ 2 - 0
Assets/Scripts/UI/ChatPanel/ChatBarChatView.cs

@@ -13,6 +13,8 @@ public class ChatBarChatView : View
 
 	protected override void OnInitCompleted ()
 	{
+		findFriendBtnLabel.text = Language.GetStr ("ChatPanel", "findMorePlayer");
+
 		if (!FollowManager.GetInstance ().initialized) 
 		{
 			ListHelper.HideAll (container);

+ 2 - 1
Assets/Scripts/UI/Team/InviteBar.cs

@@ -29,13 +29,14 @@ public class InviteBar : MonoBehaviour {
 		createClanTip.text = Language.GetStr ("Invite", "createClanTip");
 		createClanLabel.text = Language.GetStr ("Invite", "createClanLabel");
 
+		ListHelper.HideAll (itemContainer);
+
 		if(!isShown)
 			this.gameObject.SetActive (false);
 	}
 
 	private void OnInitComplete()
 	{
-		ListHelper.HideAll (itemContainer);
 		InviteManager.GetInstance ().InitCompleted.RemoveListener (OnInitComplete);
 
 		ListHelper.FillList<InviteData> (itemContainer, InviteManager.GetInstance().GetDataList(), itemPrefab);

BIN
Assets/XlsxSource/Chinese/shop_config.xlsx


+ 2 - 2
Assets/XlsxSource/Chinese/shop_config.xlsx.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: b7b17c00e698de44e9a1f9e3c578f1e1
-timeCreated: 1448958427
+guid: da1eca7eaf42a064e9dac8204b66f9e5
+timeCreated: 1467612799
 licenseType: Pro
 DefaultImporter:
   userData: 

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

@@ -3,7 +3,7 @@
   <a p="craft_config.xlsx" m="6ca0c8ddd27574fba9edf33ab8aa95a" />
   <a p="halo_config.xlsx" m="c96d9b93e011d284e931eabeec7eb4b" />
   <a p="power_config.xlsx" m="dc424315fdf655a192fd74d8f5f9453" />
-  <a p="shop_config.xlsx" m="43f35bf57d5dd053cb77a434c62ea96" />
+  <a p="shop_config.xlsx" m="2c1cedfc351409eebc392d1eff93e7" />
   <a p="skin_config.xlsx" m="d22bb89e92d138debcc49f4dacd4d64" />
-  <a p="xlsx_md5.xml" m="c48db0ae46d8b031378bbfeba22af6f" />
+  <a p="xlsx_md5.xml" m="8bf54f2d276a4175ef684728ac0a6" />
 </xlsx>

+ 1 - 1
Assets/XlsxSource/English/xlsx_md5.xml

@@ -5,5 +5,5 @@
   <a p="power_config.xlsx" m="5756477bb15c3838933a43aeada27de1" />
   <a p="shop_config.xlsx" m="665373fd8c777e6ba8e4498ed8e736" />
   <a p="skin_config.xlsx" m="789f4f375c2a74b6364d92515a7bc35" />
-  <a p="xlsx_md5.xml" m="cdc43546a319a95af1832223c69f58c2" />
+  <a p="xlsx_md5.xml" m="8c40c8d41799e89a2b33ee97b69c47e0" />
 </xlsx>