1

Assets/Resources/XML/Config/English/shop_config.xml

@@ -2,10 +2,10 @@
   <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_EN" value="" sort="1" platform="2" price="$ 1.99" type="" icon="VIP3" />
-  <item id="5" name="水晶10000" description="X10000" code="C10000_EN" value="10 000" sort="2" platform="2" price="$ 0.99" type="" icon="" />
-  <item id="6" name="水晶25000" description="购买25000水晶" code="C25000_EN" value="25 000" sort="2" platform="2" price="$ 1.99" type="" icon="" />
-  <item id="7" name="水晶75000" description="购买75000水晶" code="C75000_EN" value="75 000" sort="2" platform="2" price="$ 4.99" type="" icon="" />
+  <item id="4" name="VIP one year" description="One year VIP, unlock all mechas." code="VIP4" value="" sort="1" platform="2" price="$ 1.99" type="" icon="VIP3" />
+  <item id="5" name="水晶10000" description="X10000" code="C10000" value="10 000" sort="2" platform="2" price="$ 0.99" type="" icon="" />
+  <item id="6" name="水晶25000" description="购买25000水晶" code="C25000" value="25 000" sort="2" platform="2" price="$ 1.99" type="" icon="" />
+  <item id="7" name="水晶75000" description="购买75000水晶" code="C75000" value="75 000" sort="2" platform="2" price="$ 4.99" type="" icon="" />
   <comment>
     <id>
 ID

Assets/Scripts/Battle/BattleController.cs

@@ -619,7 +619,7 @@ public class BattleController : MonoBehaviour
 
 		if(GameTime.time - lastSyncTime > 4f)
 		{
-			lastCheckReliveTime = GameTime.time;
+			lastSyncTime = GameTime.time;
 		}
 		else
 		{

Assets/Scripts/Net/Message/Data/SyncMessage.cs

@@ -0,0 +1,20 @@
+using UnityEngine;
+using System.Collections;
+using System.Collections.Generic;
+using Sfs2X.Entities.Data;
+
+public class SyncMessage : Message
+{
+
+	public SyncMessage()
+	{
+		this.cmd = Command.SimpleSync;
+		this.data = new SFSObject();
+	}
+
+	public override bool AttempOverride (Message msg)
+	{
+		return true;
+	}
+}
+

Assets/Scripts/Net/Message/Data/SyncMessage.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 71811ba9e2367184092f24ef5b2b5f9d
+timeCreated: 1479283407
+licenseType: Pro
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Net/Message/MessageManager.cs

@@ -213,6 +213,8 @@ public class MessageManager
 
 	public void SearchBattle(MapData.Mode mode)
 	{
+		LocalToRemote ();
+
 		battleSession.mode = mode;
 		LoadingPanel panel = LoadingPanel.Show ();
 		LoadingPanel.Increase (0.1f);
@@ -1365,7 +1367,7 @@ public class MessageManager
 	public void SimpleSync()
 	{
 		ISFSObject data = new SFSObject ();
-		Message msg = new Message (Command.SimpleSync, data);
+		Message msg = new SyncMessage ();
 		EnSendQueue (msg);
 	}
 

Assets/Scripts/UI/Shop/PaymentManager.cs

@@ -16,25 +16,25 @@ public class PaymentManager : IStoreListener
 	public PaymentManager () 
 	{
 		var builder = ConfigurationBuilder.Instance(StandardPurchasingModule.Instance());
-		builder.AddProduct("VIP4_EN", ProductType.Subscription, new IDs
+		builder.AddProduct("VIP4", ProductType.Subscription, new IDs
 			{
 				{"VIP4_EN", GooglePlay.Name},
 				{"VIP4_EN", AppleAppStore.Name}
 			});
 
-		builder.AddProduct("C10000_EN", ProductType.Consumable, new IDs
+		builder.AddProduct("C10000", ProductType.Consumable, new IDs
 			{
 				{"C10000_EN", GooglePlay.Name},
 				{"C10000_EN", AppleAppStore.Name}
 			});
 
-		builder.AddProduct("C25000_EN", ProductType.Consumable, new IDs
+		builder.AddProduct("C25000", ProductType.Consumable, new IDs
 			{
 				{"C25000_EN", GooglePlay.Name},
 				{"C25000_EN", AppleAppStore.Name}
 			});
 
-		builder.AddProduct("C75000_EN", ProductType.Consumable, new IDs
+		builder.AddProduct("C75000", ProductType.Consumable, new IDs
 			{
 				{"C75000_EN", GooglePlay.Name},
 				{"C75000_EN", AppleAppStore.Name}

Assets/XlsxSource/Chinese/xlsx_md5.xml

@@ -5,5 +5,5 @@
   <a p="power_config.xlsx" m="dc424315fdf655a192fd74d8f5f9453" />
   <a p="shop_config.xlsx" m="43f35bf57d5dd053cb77a434c62ea96" />
   <a p="skin_config.xlsx" m="d22bb89e92d138debcc49f4dacd4d64" />
-  <a p="xlsx_md5.xml" m="92eb57f74f257930f548dfe889985041" />
+  <a p="xlsx_md5.xml" m="c48db0ae46d8b031378bbfeba22af6f" />
 </xlsx>

Assets/XlsxSource/English/xlsx_md5.xml

@@ -3,7 +3,7 @@
   <a p="craft_config.xlsx" m="8748d8947332ab6928845a34ce6f6d" />
   <a p="halo_config.xlsx" m="94d38fe33310a5bbee5567e854a6c62" />
   <a p="power_config.xlsx" m="5756477bb15c3838933a43aeada27de1" />
-  <a p="shop_config.xlsx" m="2787107620b261cd89cc14dd6314c86" />
+  <a p="shop_config.xlsx" m="665373fd8c777e6ba8e4498ed8e736" />
   <a p="skin_config.xlsx" m="789f4f375c2a74b6364d92515a7bc35" />
-  <a p="xlsx_md5.xml" m="8874157f7d4f2b0847ddd2e20eaa1" />
+  <a p="xlsx_md5.xml" m="cdc43546a319a95af1832223c69f58c2" />
 </xlsx>