Przeglądaj źródła

升级unity版本为2022.3 live2d升到最新版本--解决H5打包问题,当前只需要几分钟就可以出包.

hexiaojie 6 miesięcy temu
rodzic
commit
504764cd58
100 zmienionych plików z 4484 dodań i 797 usunięć
  1. 973 39
      GameClient/.idea/.idea.GameClient/.idea/workspace.xml
  2. 1 1
      GameClient/Assets/Editor/FairyGUI/UIPanelEditor.cs
  3. 14 2
      GameClient/Assets/Game/HotUpdate/Controller/GameController.cs
  4. 9 7
      GameClient/Assets/Game/HotUpdate/Data/PoemGalleryDataManager.cs
  5. 0 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_RewardUI.cs
  6. 2 1
      GameClient/Assets/Game/HotUpdate/Game.HotUpdate.asmdef
  7. 1 1
      GameClient/Assets/Game/HotUpdate/Platform/QDJGameManager.cs
  8. 57 24
      GameClient/Assets/Game/HotUpdate/ServerProxy/PoemGallerySProxy.cs
  9. 1 1
      GameClient/Assets/Game/HotUpdate/UGUI/UGUIManager.cs
  10. 26 42
      GameClient/Assets/Game/HotUpdate/Views/CommonGame/RewardView.cs
  11. 590 395
      GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxBonusShowView.cs
  12. 88 65
      GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxNewDressView.cs
  13. 20 1
      GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs
  14. 1 1
      GameClient/Assets/Game/HotUpdate/Views/ViewManager.cs
  15. 0 1
      GameClient/Assets/Game/Launcher/Game.Launcher.asmdef
  16. BIN
      GameClient/Assets/Plugins/Android/arm64-v8a/libLive2DCubismCore.so
  17. 39 0
      GameClient/Assets/Plugins/Android/arm64-v8a/libLive2DCubismCore.so.meta
  18. BIN
      GameClient/Assets/Plugins/Android/x86/libLive2DCubismCore.so
  19. 40 1
      GameClient/Assets/Plugins/Android/x86/libLive2DCubismCore.so.meta
  20. BIN
      GameClient/Assets/Plugins/Experimental/Emscripten/Live2DCubismCore.bc
  21. 8 0
      GameClient/Assets/Plugins/Experimental/Emscripten/latest.meta
  22. BIN
      GameClient/Assets/Plugins/Experimental/Emscripten/latest/Live2DCubismCore.bc
  23. 1 1
      GameClient/Assets/Plugins/Experimental/Emscripten/latest/Live2DCubismCore.bc.meta
  24. BIN
      GameClient/Assets/Plugins/Experimental/UWP/arm/Live2DCubismCore.dll
  25. 2 5
      GameClient/Assets/Plugins/Experimental/UWP/arm/Live2DCubismCore.dll.meta
  26. BIN
      GameClient/Assets/Plugins/Experimental/UWP/arm64/Live2DCubismCore.dll
  27. 2 5
      GameClient/Assets/Plugins/Experimental/UWP/arm64/Live2DCubismCore.dll.meta
  28. BIN
      GameClient/Assets/Plugins/Experimental/UWP/x64/Live2DCubismCore.dll
  29. BIN
      GameClient/Assets/Plugins/Experimental/UWP/x86/Live2DCubismCore.dll
  30. BIN
      GameClient/Assets/Plugins/Linux/x86_64/libLive2DCubismCore.so
  31. 91 5
      GameClient/Assets/Plugins/Linux/x86_64/libLive2DCubismCore.so.meta
  32. BIN
      GameClient/Assets/Plugins/MacOS/Live2DCubismCore.bundle
  33. 9 4
      GameClient/Assets/Plugins/MacOS/Live2DCubismCore.bundle.meta
  34. BIN
      GameClient/Assets/Plugins/Windows/x86/Live2DCubismCore.dll
  35. 2 5
      GameClient/Assets/Plugins/Windows/x86/Live2DCubismCore.dll.meta
  36. BIN
      GameClient/Assets/Plugins/Windows/x86_64/Live2DCubismCore.dll
  37. BIN
      GameClient/Assets/Plugins/iOS/Debug-iphoneos/libLive2DCubismCore.a
  38. 85 5
      GameClient/Assets/Plugins/iOS/Debug-iphoneos/libLive2DCubismCore.a.meta
  39. BIN
      GameClient/Assets/Plugins/iOS/Debug-iphonesimulator/libLive2DCubismCore.a
  40. 85 5
      GameClient/Assets/Plugins/iOS/Debug-iphonesimulator/libLive2DCubismCore.a.meta
  41. BIN
      GameClient/Assets/Plugins/iOS/Release-iphoneos/libLive2DCubismCore.a
  42. 84 4
      GameClient/Assets/Plugins/iOS/Release-iphoneos/libLive2DCubismCore.a.meta
  43. BIN
      GameClient/Assets/Plugins/iOS/Release-iphonesimulator/libLive2DCubismCore.a
  44. 85 5
      GameClient/Assets/Plugins/iOS/Release-iphonesimulator/libLive2DCubismCore.a.meta
  45. 37 3
      GameClient/Assets/ResIn/Fight/bg_fhl.png.meta
  46. 37 3
      GameClient/Assets/ResIn/Fight/fightBg.png.meta
  47. 37 3
      GameClient/Assets/ResIn/Fight/jingzhongh_bg.png.meta
  48. 37 3
      GameClient/Assets/ResIn/Fight/zd_bj_bja_1.png.meta
  49. 37 3
      GameClient/Assets/ResIn/Fight/zd_bj_bja_2.png.meta
  50. 37 3
      GameClient/Assets/ResIn/Fight/zd_bj_qg_1 1.png.meta
  51. 37 3
      GameClient/Assets/ResIn/Fight/zd_bj_qgqg_1.png.meta
  52. 37 3
      GameClient/Assets/ResIn/Fight/zd_bj_qgqg_2.png.meta
  53. 37 3
      GameClient/Assets/ResIn/Fight/zd_drpf_dzuo.png.meta
  54. 37 3
      GameClient/Assets/ResIn/Fight/zd_jsjm_bjtu.png.meta
  55. 37 3
      GameClient/Assets/ResIn/LoginRes/LoginSkin1/bg_02.png.meta
  56. 37 3
      GameClient/Assets/ResIn/LoginRes/LoginSkin1/bg_t.png.meta
  57. 37 3
      GameClient/Assets/ResIn/LoginRes/LoginSkin1/bg_top.png.meta
  58. 37 3
      GameClient/Assets/ResIn/UI/Activity/Activity_atlas0!a.png.meta
  59. 37 3
      GameClient/Assets/ResIn/UI/Activity/Activity_atlas0.png.meta
  60. 37 3
      GameClient/Assets/ResIn/UI/Activity/Activity_atlas0_1!a.png.meta
  61. 37 3
      GameClient/Assets/ResIn/UI/Activity/Activity_atlas0_1.png.meta
  62. 37 3
      GameClient/Assets/ResIn/UI/ActivityAFuGift/ActivityAFuGift_atlas0!a.png.meta
  63. 37 3
      GameClient/Assets/ResIn/UI/ActivityAFuGift/ActivityAFuGift_atlas0.png.meta
  64. 37 3
      GameClient/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0!a.png.meta
  65. 37 3
      GameClient/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0.png.meta
  66. 37 3
      GameClient/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0_1!a.png.meta
  67. 37 3
      GameClient/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0_1.png.meta
  68. 49 3
      GameClient/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0_2!a.png.meta
  69. 49 3
      GameClient/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0_2.png.meta
  70. 49 3
      GameClient/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0_3!a.png.meta
  71. 49 3
      GameClient/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0_3.png.meta
  72. 37 3
      GameClient/Assets/ResIn/UI/ActivityDay7/ActivityDay7_atlas0!a.png.meta
  73. 37 3
      GameClient/Assets/ResIn/UI/ActivityDay7/ActivityDay7_atlas0.png.meta
  74. 37 3
      GameClient/Assets/ResIn/UI/ActivityGetYuanXiao/ActivityGetYuanXiao_atlas0!a.png.meta
  75. 37 3
      GameClient/Assets/ResIn/UI/ActivityGetYuanXiao/ActivityGetYuanXiao_atlas0.png.meta
  76. 37 3
      GameClient/Assets/ResIn/UI/ActivityGetYuanXiao/ActivityGetYuanXiao_atlas0_1!a.png.meta
  77. 37 3
      GameClient/Assets/ResIn/UI/ActivityGetYuanXiao/ActivityGetYuanXiao_atlas0_1.png.meta
  78. 49 3
      GameClient/Assets/ResIn/UI/ActivityGetYuanXiao/ActivityGetYuanXiao_atlas0_2!a.png.meta
  79. 49 3
      GameClient/Assets/ResIn/UI/ActivityGetYuanXiao/ActivityGetYuanXiao_atlas0_2.png.meta
  80. 37 3
      GameClient/Assets/ResIn/UI/ActivityGetYuanXiaoUI/ActivityGetYuanXiao_atlas0!a.png.meta
  81. 37 3
      GameClient/Assets/ResIn/UI/ActivityGetYuanXiaoUI/ActivityGetYuanXiao_atlas0.png.meta
  82. 37 3
      GameClient/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0!a.png.meta
  83. 37 3
      GameClient/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0.png.meta
  84. 37 3
      GameClient/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0_1!a.png.meta
  85. 37 3
      GameClient/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0_1.png.meta
  86. 37 3
      GameClient/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0_2!a.png.meta
  87. 37 3
      GameClient/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0_2.png.meta
  88. 37 3
      GameClient/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0_3!a.png.meta
  89. 37 3
      GameClient/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0_3.png.meta
  90. 37 3
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0!a.png.meta
  91. 37 3
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0.png.meta
  92. 37 3
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_1!a.png.meta
  93. 37 3
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_1.png.meta
  94. 49 3
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_10!a.png.meta
  95. 49 3
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_10.png.meta
  96. 37 3
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_2!a.png.meta
  97. 37 3
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_2.png.meta
  98. 37 3
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_3!a.png.meta
  99. 37 3
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_3.png.meta
  100. 37 3
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_4!a.png.meta

+ 973 - 39
GameClient/.idea/.idea.GameClient/.idea/workspace.xml

@@ -6,9 +6,920 @@
   <component name="ChangeListManager">
   <component name="ChangeListManager">
     <list default="true" id="19bfabb9-fe2e-4e01-a01b-df7ac5ab759f" name="更改" comment="">
     <list default="true" id="19bfabb9-fe2e-4e01-a01b-df7ac5ab759f" name="更改" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/.idea.GameClient/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.GameClient/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/.idea.GameClient/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.GameClient/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Editor/FairyGUI/UIPanelEditor.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Editor/FairyGUI/UIPanelEditor.cs" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Controller/GameController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Controller/GameController.cs" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Controller/GameController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Controller/GameController.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Data/PoemGalleryDataManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Data/PoemGalleryDataManager.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_BonusBoxDetailUI.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_BonusBoxDetailUI.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_BtnBuy.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_BtnBuy.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_BtnNormal1.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_BtnNormal1.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_BtnReceive.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_BtnReceive.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_BtnStyle000.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_BtnStyle000.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_BtnStyle006.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_BtnStyle006.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Button16.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Button16.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Button18.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Button18.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Button19.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Button19.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Button2.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Button2.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Button21.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Button21.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Button22.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Button22.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Button24.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Button24.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Button3.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Button3.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ButtonApproach.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ButtonApproach.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ButtonInValueBar.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ButtonInValueBar.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_BuyConfirmUI.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_BuyConfirmUI.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_BuyCountUI.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_BuyCountUI.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_BuyTipsUI.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_BuyTipsUI.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComBg000.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComBg000.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComBg001.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComBg001.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComCardMask.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComCardMask.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComContent.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComContent.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComCost.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComCost.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComCostCurrency.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComCostCurrency.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComCostCurrencyWithHas.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComCostCurrencyWithHas.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComCurSupplyItem.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComCurSupplyItem.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComDiscount.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComDiscount.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComDodgeStar.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComDodgeStar.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComFilterType.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComFilterType.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComFunctionOpen.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComFunctionOpen.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComGouMaiGetText.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComGouMaiGetText.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHead.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHead.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHead1.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHead1.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHead2.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHead2.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHeadIcon.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHeadIcon.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHeadLv.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHeadLv.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHeadLv1.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHeadLv1.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHeadWithLv.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHeadWithLv.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHeadWithLv1.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHeadWithLv1.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHeadWithLv2.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHeadWithLv2.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHead_new.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHead_new.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem000.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem000.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComLeftGiftBox.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComLeftGiftBox.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComRedDot.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComRedDot.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComRewardList.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComRewardList.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComScaleList.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComScaleList.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComSpecialOfferGiftBoxItem.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComSpecialOfferGiftBoxItem.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComStar.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComStar.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComTag.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComTag.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComTipsApproach.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComTipsApproach.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComTipsBase.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComTipsBase.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComTitle.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComTitle.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComTopTitle.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComTopTitle.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_CompFlower.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_CompFlower.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Component1.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Component1.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Component2.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Component2.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComponentValueBar.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComponentValueBar.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_DressUpItemTips.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_DressUpItemTips.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_FunctionOpenUI.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_FunctionOpenUI.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_GetSuitItemUI.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_GetSuitItemUI.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_GoodsItemTips.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_GoodsItemTips.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ItemExchangeUI.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ItemExchangeUI.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ListCardItem.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ListCardItem.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ListLevelItem.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ListLevelItem.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ListScoreItem.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ListScoreItem.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ListScoreItem2.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ListScoreItem2.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ListSourceItem.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ListSourceItem.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ListTagItem.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ListTagItem.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_RewardIconYellow.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_RewardIconYellow.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_RewardPreviewUI.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_RewardPreviewUI.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_RewardUI.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_RewardUI.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_RuleUI.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_RuleUI.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_SuitItemUI.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_SuitItemUI.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_SuitPartsDetailUI.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_SuitPartsDetailUI.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_TaskListItem.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_TaskListItem.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_holderBg.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_holderBg.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Game.HotUpdate.asmdef" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Game.HotUpdate.asmdef" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Platform/QDJGameManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Platform/QDJGameManager.cs" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Platform/QDJGameManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Platform/QDJGameManager.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/YooAsset/Runtime/PackageSystem/ResourcePackage.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/YooAsset/Runtime/PackageSystem/ResourcePackage.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/ServerProxy/PoemGallerySProxy.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/ServerProxy/PoemGallerySProxy.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/UGUI/UGUIManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/UGUI/UGUIManager.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/CommonGame/RewardView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/CommonGame/RewardView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxBonusShowView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxBonusShowView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxNewDressView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxNewDressView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/ViewManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/ViewManager.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/Launcher/Game.Launcher.asmdef" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/Launcher/Game.Launcher.asmdef" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Plugins/Android/arm64-v8a.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Plugins/Android/arm64-v8a.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Plugins/Android/arm64-v8a/libLive2DCubismCore.so" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Plugins/Android/arm64-v8a/libLive2DCubismCore.so" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Plugins/Android/arm64-v8a/libLive2DCubismCore.so.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Plugins/Android/arm64-v8a/libLive2DCubismCore.so.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Plugins/Android/x86.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Plugins/Android/x86.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Plugins/Android/x86/libLive2DCubismCore.so" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Plugins/Android/x86/libLive2DCubismCore.so" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Plugins/Android/x86/libLive2DCubismCore.so.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Plugins/Android/x86/libLive2DCubismCore.so.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Plugins/Experimental.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Plugins/Experimental.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Plugins/Experimental/Emscripten.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Plugins/Experimental/Emscripten.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Plugins/Experimental/Emscripten/Live2DCubismCore.bc" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Plugins/Experimental/Emscripten/Live2DCubismCore.bc.meta" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Plugins/Experimental/UWP.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Plugins/Experimental/UWP.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Plugins/Experimental/UWP/arm.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Plugins/Experimental/UWP/arm.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Plugins/Experimental/UWP/arm/Live2DCubismCore.dll" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Plugins/Experimental/UWP/arm/Live2DCubismCore.dll" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Plugins/Experimental/UWP/arm/Live2DCubismCore.dll.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Plugins/Experimental/UWP/arm/Live2DCubismCore.dll.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Plugins/Experimental/UWP/arm64.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Plugins/Experimental/UWP/arm64.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Plugins/Experimental/UWP/arm64/Live2DCubismCore.dll" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Plugins/Experimental/UWP/arm64/Live2DCubismCore.dll" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Plugins/Experimental/UWP/arm64/Live2DCubismCore.dll.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Plugins/Experimental/UWP/arm64/Live2DCubismCore.dll.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Plugins/Experimental/UWP/x64.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Plugins/Experimental/UWP/x64.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Plugins/Experimental/UWP/x64/Live2DCubismCore.dll" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Plugins/Experimental/UWP/x64/Live2DCubismCore.dll" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Plugins/Experimental/UWP/x64/Live2DCubismCore.dll.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Plugins/Experimental/UWP/x64/Live2DCubismCore.dll.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Plugins/Experimental/UWP/x86.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Plugins/Experimental/UWP/x86.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Plugins/Experimental/UWP/x86/Live2DCubismCore.dll" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Plugins/Experimental/UWP/x86/Live2DCubismCore.dll" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Plugins/Experimental/UWP/x86/Live2DCubismCore.dll.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Plugins/Experimental/UWP/x86/Live2DCubismCore.dll.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Plugins/Linux.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Plugins/Linux.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Plugins/Linux/x86_64.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Plugins/Linux/x86_64.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Plugins/Linux/x86_64/libLive2DCubismCore.so" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Plugins/Linux/x86_64/libLive2DCubismCore.so" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Plugins/Linux/x86_64/libLive2DCubismCore.so.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Plugins/Linux/x86_64/libLive2DCubismCore.so.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Plugins/MacOS/Live2DCubismCore.bundle" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Plugins/MacOS/Live2DCubismCore.bundle" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Plugins/MacOS/Live2DCubismCore.bundle.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Plugins/MacOS/Live2DCubismCore.bundle.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Plugins/Windows.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Plugins/Windows.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Plugins/Windows/x86.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Plugins/Windows/x86.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Plugins/Windows/x86/Live2DCubismCore.dll" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Plugins/Windows/x86/Live2DCubismCore.dll" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Plugins/Windows/x86/Live2DCubismCore.dll.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Plugins/Windows/x86/Live2DCubismCore.dll.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Plugins/Windows/x86_64.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Plugins/Windows/x86_64.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Plugins/Windows/x86_64/Live2DCubismCore.dll" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Plugins/Windows/x86_64/Live2DCubismCore.dll" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Plugins/Windows/x86_64/Live2DCubismCore.dll.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Plugins/Windows/x86_64/Live2DCubismCore.dll.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Plugins/iOS/Debug-iphoneos.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Plugins/iOS/Debug-iphoneos.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Plugins/iOS/Debug-iphoneos/libLive2DCubismCore.a" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Plugins/iOS/Debug-iphoneos/libLive2DCubismCore.a" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Plugins/iOS/Debug-iphoneos/libLive2DCubismCore.a.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Plugins/iOS/Debug-iphoneos/libLive2DCubismCore.a.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Plugins/iOS/Debug-iphonesimulator.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Plugins/iOS/Debug-iphonesimulator.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Plugins/iOS/Debug-iphonesimulator/libLive2DCubismCore.a" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Plugins/iOS/Debug-iphonesimulator/libLive2DCubismCore.a" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Plugins/iOS/Debug-iphonesimulator/libLive2DCubismCore.a.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Plugins/iOS/Debug-iphonesimulator/libLive2DCubismCore.a.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Plugins/iOS/Release-iphoneos.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Plugins/iOS/Release-iphoneos.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Plugins/iOS/Release-iphoneos/libLive2DCubismCore.a" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Plugins/iOS/Release-iphoneos/libLive2DCubismCore.a" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Plugins/iOS/Release-iphoneos/libLive2DCubismCore.a.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Plugins/iOS/Release-iphoneos/libLive2DCubismCore.a.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Plugins/iOS/Release-iphonesimulator.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Plugins/iOS/Release-iphonesimulator.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Plugins/iOS/Release-iphonesimulator/libLive2DCubismCore.a" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Plugins/iOS/Release-iphonesimulator/libLive2DCubismCore.a" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Plugins/iOS/Release-iphonesimulator/libLive2DCubismCore.a.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Plugins/iOS/Release-iphonesimulator/libLive2DCubismCore.a.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/Fight/bg_fhl.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/Fight/bg_fhl.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/Fight/fightBg.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/Fight/fightBg.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/Fight/jingzhongh_bg.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/Fight/jingzhongh_bg.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/Fight/zd_bj_bja_1.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/Fight/zd_bj_bja_1.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/Fight/zd_bj_bja_2.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/Fight/zd_bj_bja_2.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/Fight/zd_bj_qg_1 1.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/Fight/zd_bj_qg_1 1.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/Fight/zd_bj_qgqg_1.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/Fight/zd_bj_qgqg_1.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/Fight/zd_bj_qgqg_2.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/Fight/zd_bj_qgqg_2.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/Fight/zd_drpf_dzuo.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/Fight/zd_drpf_dzuo.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/Fight/zd_jsjm_bjtu.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/Fight/zd_jsjm_bjtu.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/LoginRes/LoginSkin1/bg_02.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/LoginRes/LoginSkin1/bg_02.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/LoginRes/LoginSkin1/bg_t.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/LoginRes/LoginSkin1/bg_t.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/LoginRes/LoginSkin1/bg_top.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/LoginRes/LoginSkin1/bg_top.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Activity/Activity_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Activity/Activity_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Activity/Activity_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Activity/Activity_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Activity/Activity_atlas0_1!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Activity/Activity_atlas0_1!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Activity/Activity_atlas0_1.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Activity/Activity_atlas0_1.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityAFuGift/ActivityAFuGift_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityAFuGift/ActivityAFuGift_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityAFuGift/ActivityAFuGift_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityAFuGift/ActivityAFuGift_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0_1!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0_1!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0_1.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0_1.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0_2!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0_2!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0_2.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0_2.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0_3!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0_3!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0_3.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0_3.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityDay7/ActivityDay7_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityDay7/ActivityDay7_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityDay7/ActivityDay7_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityDay7/ActivityDay7_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityGetYuanXiao/ActivityGetYuanXiao_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityGetYuanXiao/ActivityGetYuanXiao_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityGetYuanXiao/ActivityGetYuanXiao_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityGetYuanXiao/ActivityGetYuanXiao_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityGetYuanXiao/ActivityGetYuanXiao_atlas0_1!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityGetYuanXiao/ActivityGetYuanXiao_atlas0_1!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityGetYuanXiao/ActivityGetYuanXiao_atlas0_1.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityGetYuanXiao/ActivityGetYuanXiao_atlas0_1.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityGetYuanXiao/ActivityGetYuanXiao_atlas0_2!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityGetYuanXiao/ActivityGetYuanXiao_atlas0_2!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityGetYuanXiao/ActivityGetYuanXiao_atlas0_2.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityGetYuanXiao/ActivityGetYuanXiao_atlas0_2.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityGetYuanXiaoUI/ActivityGetYuanXiao_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityGetYuanXiaoUI/ActivityGetYuanXiao_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityGetYuanXiaoUI/ActivityGetYuanXiao_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityGetYuanXiaoUI/ActivityGetYuanXiao_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0_1!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0_1!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0_1.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0_1.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0_2!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0_2!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0_2.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0_2.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0_3!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0_3!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0_3.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0_3.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_1!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_1!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_1.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_1.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_10!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_10!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_10.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_10.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_2!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_2!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_2.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_2.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_3!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_3!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_3.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_3.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_4!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_4!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_4.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_4.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_5!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_5!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_5.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_5.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_6!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_6!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_6.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_6.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_7!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_7!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_7.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_7.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_8!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_8!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_8.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_8.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_9!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_9!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_9.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_9.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityThemeLuckyBox/ActivityThemeLuckyBox_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityThemeLuckyBox/ActivityThemeLuckyBox_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityThemeLuckyBox/ActivityThemeLuckyBox_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityThemeLuckyBox/ActivityThemeLuckyBox_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityThemeLuckyBox/ActivityThemeLuckyBox_atlas0_1!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityThemeLuckyBox/ActivityThemeLuckyBox_atlas0_1!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityThemeLuckyBox/ActivityThemeLuckyBox_atlas0_1.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityThemeLuckyBox/ActivityThemeLuckyBox_atlas0_1.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityWanShiLi/ActivityWanShiLi_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityWanShiLi/ActivityWanShiLi_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityWanShiLi/ActivityWanShiLi_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ActivityWanShiLi/ActivityWanShiLi_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Arena/Arena_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Arena/Arena_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Arena/Arena_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Arena/Arena_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Arena/Arena_atlas0_1!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Arena/Arena_atlas0_1!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Arena/Arena_atlas0_1.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Arena/Arena_atlas0_1.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Arena/Arena_atlas0_2!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Arena/Arena_atlas0_2!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Arena/Arena_atlas0_2.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Arena/Arena_atlas0_2.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Arena/Arena_atlas0_3!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Arena/Arena_atlas0_3!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Arena/Arena_atlas0_3.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Arena/Arena_atlas0_3.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Arena/Arena_atlas0_4!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Arena/Arena_atlas0_4!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Arena/Arena_atlas0_4.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Arena/Arena_atlas0_4.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Arena/Arena_atlas0_5!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Arena/Arena_atlas0_5!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Arena/Arena_atlas0_5.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Arena/Arena_atlas0_5.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Bag/Bag_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Bag/Bag_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Bag/Bag_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Bag/Bag_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/BagEquipment/BagEquipment_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/BagEquipment/BagEquipment_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/BagEquipment/BagEquipment_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/BagEquipment/BagEquipment_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/BlindBox/BlindBox_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/BlindBox/BlindBox_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/BlindBox/BlindBox_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/BlindBox/BlindBox_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/BlindBox/BlindBox_atlas0_1!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/BlindBox/BlindBox_atlas0_1!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/BlindBox/BlindBox_atlas0_1.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/BlindBox/BlindBox_atlas0_1.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/BornLimit/BornLimit_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/BornLimit/BornLimit_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/BornLimit/BornLimit_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/BornLimit/BornLimit_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Card/Card_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Card/Card_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Card/Card_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Card/Card_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Card/Card_atlas0_1!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Card/Card_atlas0_1!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Card/Card_atlas0_1.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Card/Card_atlas0_1.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Card/Card_atlas0_2!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Card/Card_atlas0_2!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Card/Card_atlas0_2.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Card/Card_atlas0_2.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CardSynthetic/CardSynthetic_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CardSynthetic/CardSynthetic_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CardSynthetic/CardSynthetic_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CardSynthetic/CardSynthetic_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ClothingDecompose/ClothingDecompose_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ClothingDecompose/ClothingDecompose_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ClothingDecompose/ClothingDecompose_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ClothingDecompose/ClothingDecompose_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ClothingFoster/ClothingFoster_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ClothingFoster/ClothingFoster_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ClothingFoster/ClothingFoster_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ClothingFoster/ClothingFoster_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ClothingFoster/ClothingFoster_atlas0_1!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ClothingFoster/ClothingFoster_atlas0_1!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ClothingFoster/ClothingFoster_atlas0_1.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ClothingFoster/ClothingFoster_atlas0_1.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ClothingShop/ClothingShop_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ClothingShop/ClothingShop_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ClothingShop/ClothingShop_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ClothingShop/ClothingShop_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ClothingShop/ClothingShop_atlas_lj7e62!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ClothingShop/ClothingShop_atlas_lj7e62!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ClothingShop/ClothingShop_atlas_lj7e62.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ClothingShop/ClothingShop_atlas_lj7e62.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ClothingSynthetic/ClothingSynthetic_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ClothingSynthetic/ClothingSynthetic_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ClothingSynthetic/ClothingSynthetic_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ClothingSynthetic/ClothingSynthetic_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ClothingUpgrade/ClothingUpgrade_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ClothingUpgrade/ClothingUpgrade_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ClothingUpgrade/ClothingUpgrade_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ClothingUpgrade/ClothingUpgrade_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ClothingUpgrade/ClothingUpgrade_atlas0_1!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ClothingUpgrade/ClothingUpgrade_atlas0_1!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ClothingUpgrade/ClothingUpgrade_atlas0_1.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ClothingUpgrade/ClothingUpgrade_atlas0_1.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ClothingUpgrade/ClothingUpgrade_atlas0_2!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ClothingUpgrade/ClothingUpgrade_atlas0_2!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/ClothingUpgrade/ClothingUpgrade_atlas0_2.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/ClothingUpgrade/ClothingUpgrade_atlas0_2.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Common/Common_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Common/Common_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Common/Common_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Common/Common_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Common/Common_atlas0_1!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Common/Common_atlas0_1!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Common/Common_atlas0_1.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Common/Common_atlas0_1.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1!a.png" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1!a.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1.png" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_2!a.png" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_2!a.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_2!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_2!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_2.png" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_2.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_2.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_2.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_3!a.png" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_3!a.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_3!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_3!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_3.png" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_3.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_3.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_3.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_4!a.png" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_4!a.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_4!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_4!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_4.png" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_4.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_4.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_4.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_5!a.png" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_5!a.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_5!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_5!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_5.png" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_5.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_5.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_5.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_6!a.png" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_6!a.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_6!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_6!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_6.png" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_6.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_6.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_6.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_7!a.png" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_7!a.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_7!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_7!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_7.png" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_7.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_7.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_7.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_8!a.png" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_8!a.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_8!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_8!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_8.png" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_8.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_8.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_8.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas_tu965m.png" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas_tu965m.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas_tu965m.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas_tu965m.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CreateRole/CreateRole_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CreateRole/CreateRole_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CreateRole/CreateRole_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CreateRole/CreateRole_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CreateRole/CreateRole_atlas0_1!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CreateRole/CreateRole_atlas0_1!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CreateRole/CreateRole_atlas0_1.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CreateRole/CreateRole_atlas0_1.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CreateRole/CreateRole_atlas0_2!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CreateRole/CreateRole_atlas0_2!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CreateRole/CreateRole_atlas0_2.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CreateRole/CreateRole_atlas0_2.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/DailyLogin/Activit_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/DailyLogin/Activit_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/DailyLogin/Activit_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/DailyLogin/Activit_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/DailyLogin/Activit_atlas0_1!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/DailyLogin/Activit_atlas0_1!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/DailyLogin/Activit_atlas0_1.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/DailyLogin/Activit_atlas0_1.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/DailyLogin/DailyLogin_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/DailyLogin/DailyLogin_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/DailyLogin/DailyLogin_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/DailyLogin/DailyLogin_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/DailyLogin/DailyLogin_atlas0_1!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/DailyLogin/DailyLogin_atlas0_1!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/DailyLogin/DailyLogin_atlas0_1.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/DailyLogin/DailyLogin_atlas0_1.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/DailyTask/DailyTask_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/DailyTask/DailyTask_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/DailyTask/DailyTask_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/DailyTask/DailyTask_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_1!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_1!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_1.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_1.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_2!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_2!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_2.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_2.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_3!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_3!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_3.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_3.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_4!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_4!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_4.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_4.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_5!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_5!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_5.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_5.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_6!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_6!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_6.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_6.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/DeleteAccount/DeleteAccount_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/DeleteAccount/DeleteAccount_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/DeleteAccount/DeleteAccount_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/DeleteAccount/DeleteAccount_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/DressUp/DressUp_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/DressUp/DressUp_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/DressUp/DressUp_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/DressUp/DressUp_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/DressUp/DressUp_atlas0_1!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/DressUp/DressUp_atlas0_1!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/DressUp/DressUp_atlas0_1.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/DressUp/DressUp_atlas0_1.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/DressUp/DressUp_atlas1!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/DressUp/DressUp_atlas1!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/DressUp/DressUp_atlas1.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/DressUp/DressUp_atlas1.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/DressUp/DressUp_atlas_7dea4d!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/DressUp/DressUp_atlas_7dea4d!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/DressUp/DressUp_atlas_7dea4d.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/DressUp/DressUp_atlas_7dea4d.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/EnduringGiftBox/EnduringGiftBox_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/EnduringGiftBox/EnduringGiftBox_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/EnduringGiftBox/EnduringGiftBox_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/EnduringGiftBox/EnduringGiftBox_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/EnduringGiftBox/EnduringGiftBox_atlas0_1!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/EnduringGiftBox/EnduringGiftBox_atlas0_1!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/EnduringGiftBox/EnduringGiftBox_atlas0_1.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/EnduringGiftBox/EnduringGiftBox_atlas0_1.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/EnduringGiftBox/EnduringGiftBox_atlas0_2!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/EnduringGiftBox/EnduringGiftBox_atlas0_2!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/EnduringGiftBox/EnduringGiftBox_atlas0_2.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/EnduringGiftBox/EnduringGiftBox_atlas0_2.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/EnduringGiftBox/EnduringGiftBox_atlas0_3!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/EnduringGiftBox/EnduringGiftBox_atlas0_3!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/EnduringGiftBox/EnduringGiftBox_atlas0_3.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/EnduringGiftBox/EnduringGiftBox_atlas0_3.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Field/Field_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Field/Field_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Field/Field_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Field/Field_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0_1!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0_1!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0_1.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0_1.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0_2!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0_2!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0_2.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0_2.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0_3!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0_3!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0_3.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0_3.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0_4!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0_4!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0_4.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0_4.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/FieldWork/FieldWork_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/FieldWork/FieldWork_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/FieldWork/FieldWork_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/FieldWork/FieldWork_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/FieldWork/FieldWork_atlas0_1!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/FieldWork/FieldWork_atlas0_1!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/FieldWork/FieldWork_atlas0_1.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/FieldWork/FieldWork_atlas0_1.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/FieldWork/FieldWork_atlas0_2!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/FieldWork/FieldWork_atlas0_2!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/FieldWork/FieldWork_atlas0_2.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/FieldWork/FieldWork_atlas0_2.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Friend/Friend_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Friend/Friend_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Friend/Friend_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Friend/Friend_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Guide/Guide_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Guide/Guide_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Guide/Guide_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Guide/Guide_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/InstanceZones/InstanceZones_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/InstanceZones/InstanceZones_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/InstanceZones/InstanceZones_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/InstanceZones/InstanceZones_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/League/League_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/League/League_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/League/League_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/League/League_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/League/League_atlas0_1!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/League/League_atlas0_1!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/League/League_atlas0_1.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/League/League_atlas0_1.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/League/League_atlas0_2!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/League/League_atlas0_2!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/League/League_atlas0_2.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/League/League_atlas0_2.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/League/League_atlas0_3!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/League/League_atlas0_3!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/League/League_atlas0_3.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/League/League_atlas0_3.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/League/League_atlas0_4!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/League/League_atlas0_4!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/League/League_atlas0_4.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/League/League_atlas0_4.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/League/League_atlas0_5!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/League/League_atlas0_5!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/League/League_atlas0_5.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/League/League_atlas0_5.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/League/League_atlas0_6!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/League/League_atlas0_6!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/League/League_atlas0_6.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/League/League_atlas0_6.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/League/League_atlas0_7!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/League/League_atlas0_7!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/League/League_atlas0_7.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/League/League_atlas0_7.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Loading/Loading_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Loading/Loading_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Loading/Loading_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Loading/Loading_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Login/Login_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Login/Login_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Login/Login_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Login/Login_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_1!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_1!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_1.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_1.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_10!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_10!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_10.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_10.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_11!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_11!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_11.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_11.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_2!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_2!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_2.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_2.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_3!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_3!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_3.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_3.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_4!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_4!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_4.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_4.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_5!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_5!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_5.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_5.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_6!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_6!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_6.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_6.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_7!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_7!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_7.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_7.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_8!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_8!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_8.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_8.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_9!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_9!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_9.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_9.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas10!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas10!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas10.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas10.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas_duuftf2!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas_duuftf2!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas_duuftf2.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas_duuftf2.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Mail/Mail_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Mail/Mail_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Mail/Mail_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Mail/Mail_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Main/Main_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Main/Main_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Main/Main_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Main/Main_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Main/Main_atlas0_1!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Main/Main_atlas0_1!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Main/Main_atlas0_1.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Main/Main_atlas0_1.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Main/Main_atlas0_10!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Main/Main_atlas0_10!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Main/Main_atlas0_10.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Main/Main_atlas0_10.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Main/Main_atlas0_11!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Main/Main_atlas0_11!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Main/Main_atlas0_11.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Main/Main_atlas0_11.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Main/Main_atlas0_2!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Main/Main_atlas0_2!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Main/Main_atlas0_2.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Main/Main_atlas0_2.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Main/Main_atlas0_3!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Main/Main_atlas0_3!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Main/Main_atlas0_3.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Main/Main_atlas0_3.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Main/Main_atlas0_4!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Main/Main_atlas0_4!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Main/Main_atlas0_4.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Main/Main_atlas0_4.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Main/Main_atlas0_5!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Main/Main_atlas0_5!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Main/Main_atlas0_5.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Main/Main_atlas0_5.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Main/Main_atlas0_6!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Main/Main_atlas0_6!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Main/Main_atlas0_6.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Main/Main_atlas0_6.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Main/Main_atlas0_7!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Main/Main_atlas0_7!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Main/Main_atlas0_7.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Main/Main_atlas0_7.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Main/Main_atlas0_8!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Main/Main_atlas0_8!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Main/Main_atlas0_8.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Main/Main_atlas0_8.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Main/Main_atlas0_9!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Main/Main_atlas0_9!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Main/Main_atlas0_9.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Main/Main_atlas0_9.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Main/Main_atlas10!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Main/Main_atlas10!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Main/Main_atlas10.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Main/Main_atlas10.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/MatchingCompetition/MatchingCompetition_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/MatchingCompetition/MatchingCompetition_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/MatchingCompetition/MatchingCompetition_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/MatchingCompetition/MatchingCompetition_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/MatchingCompetition/MatchingCompetition_atlas0_1!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/MatchingCompetition/MatchingCompetition_atlas0_1!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/MatchingCompetition/MatchingCompetition_atlas0_1.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/MatchingCompetition/MatchingCompetition_atlas0_1.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/MatchingCompetition/MatchingCompetition_atlas0_2!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/MatchingCompetition/MatchingCompetition_atlas0_2!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/MatchingCompetition/MatchingCompetition_atlas0_2.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/MatchingCompetition/MatchingCompetition_atlas0_2.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/MatchingCompetition/MatchingCompetition_atlas0_3!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/MatchingCompetition/MatchingCompetition_atlas0_3!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/MatchingCompetition/MatchingCompetition_atlas0_3.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/MatchingCompetition/MatchingCompetition_atlas0_3.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/MatchingCompetition/MatchingCompetition_atlas1!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/MatchingCompetition/MatchingCompetition_atlas1!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/MatchingCompetition/MatchingCompetition_atlas1.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/MatchingCompetition/MatchingCompetition_atlas1.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/MiniGame/MiniGame_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/MiniGame/MiniGame_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/MiniGame/MiniGame_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/MiniGame/MiniGame_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/MiniGame/MiniGame_atlas0_1!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/MiniGame/MiniGame_atlas0_1!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/MiniGame/MiniGame_atlas0_1.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/MiniGame/MiniGame_atlas0_1.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/MiniGame/MiniGame_atlas0_2!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/MiniGame/MiniGame_atlas0_2!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/MiniGame/MiniGame_atlas0_2.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/MiniGame/MiniGame_atlas0_2.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/MiniGame/MiniGame_atlas0_3!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/MiniGame/MiniGame_atlas0_3!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/MiniGame/MiniGame_atlas0_3.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/MiniGame/MiniGame_atlas0_3.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/MiniGame/MiniGame_atlas0_4!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/MiniGame/MiniGame_atlas0_4!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/MiniGame/MiniGame_atlas0_4.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/MiniGame/MiniGame_atlas0_4.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/MiniGame/MiniGame_atlas0_5!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/MiniGame/MiniGame_atlas0_5!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/MiniGame/MiniGame_atlas0_5.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/MiniGame/MiniGame_atlas0_5.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/NewYearLogin/NewYearLogin_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/NewYearLogin/NewYearLogin_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/NewYearLogin/NewYearLogin_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/NewYearLogin/NewYearLogin_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/NewYearRedEnvelope/NewYearRedEnvelope_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/NewYearRedEnvelope/NewYearRedEnvelope_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/NewYearRedEnvelope/NewYearRedEnvelope_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/NewYearRedEnvelope/NewYearRedEnvelope_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Notice/Notice_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Notice/Notice_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Notice/Notice_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Notice/Notice_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/OpenServerActivity/OpenServerActivity_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/OpenServerActivity/OpenServerActivity_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/OpenServerActivity/OpenServerActivity_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/OpenServerActivity/OpenServerActivity_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/OpenServerActivity/OpenServerActivity_atlas0_1!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/OpenServerActivity/OpenServerActivity_atlas0_1!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/OpenServerActivity/OpenServerActivity_atlas0_1.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/OpenServerActivity/OpenServerActivity_atlas0_1.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Poem/Poem_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Poem/Poem_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Poem/Poem_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Poem/Poem_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Poem/Poem_atlas0_1!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Poem/Poem_atlas0_1!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Poem/Poem_atlas0_1.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Poem/Poem_atlas0_1.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Poem/Poem_atlas0_2!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Poem/Poem_atlas0_2!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Poem/Poem_atlas0_2.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Poem/Poem_atlas0_2.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Poem/Poem_atlas0_3!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Poem/Poem_atlas0_3!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Poem/Poem_atlas0_3.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Poem/Poem_atlas0_3.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Poem/Poem_atlas0_4!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Poem/Poem_atlas0_4!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Poem/Poem_atlas0_4.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Poem/Poem_atlas0_4.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Poem/Poem_atlas0_5!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Poem/Poem_atlas0_5!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Poem/Poem_atlas0_5.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Poem/Poem_atlas0_5.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/PopWindow/PopWindow_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/PopWindow/PopWindow_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/PopWindow/PopWindow_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/PopWindow/PopWindow_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/RechargeStore/RechargeStore_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/RechargeStore/RechargeStore_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/RechargeStore/RechargeStore_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/RechargeStore/RechargeStore_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/RechargeStore/RechargeStore_atlas0_1!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/RechargeStore/RechargeStore_atlas0_1!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/RechargeStore/RechargeStore_atlas0_1.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/RechargeStore/RechargeStore_atlas0_1.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/RechargeStore/RechargeStore_atlas0_2!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/RechargeStore/RechargeStore_atlas0_2!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/RechargeStore/RechargeStore_atlas0_2.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/RechargeStore/RechargeStore_atlas0_2.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/RechargeStore/RechargeStore_atlas0_3!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/RechargeStore/RechargeStore_atlas0_3!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/RechargeStore/RechargeStore_atlas0_3.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/RechargeStore/RechargeStore_atlas0_3.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/RoleInfo/RoleInfo_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/RoleInfo/RoleInfo_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/RoleInfo/RoleInfo_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/RoleInfo/RoleInfo_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/RoleInfo/RoleInfo_atlas0_1!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/RoleInfo/RoleInfo_atlas0_1!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/RoleInfo/RoleInfo_atlas0_1.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/RoleInfo/RoleInfo_atlas0_1.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/RoleInfo/RoleInfo_atlas0_2!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/RoleInfo/RoleInfo_atlas0_2!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/RoleInfo/RoleInfo_atlas0_2.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/RoleInfo/RoleInfo_atlas0_2.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/RoleInfo/RoleInfo_atlas0_3!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/RoleInfo/RoleInfo_atlas0_3!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/RoleInfo/RoleInfo_atlas0_3.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/RoleInfo/RoleInfo_atlas0_3.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/RoleInfo/RoleInfo_atlas0_4!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/RoleInfo/RoleInfo_atlas0_4!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/RoleInfo/RoleInfo_atlas0_4.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/RoleInfo/RoleInfo_atlas0_4.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/RoleInfo/RoleInfo_atlas0_5!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/RoleInfo/RoleInfo_atlas0_5!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/RoleInfo/RoleInfo_atlas0_5.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/RoleInfo/RoleInfo_atlas0_5.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/RoleInfo/RoleInfo_atlas0_6!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/RoleInfo/RoleInfo_atlas0_6!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/RoleInfo/RoleInfo_atlas0_6.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/RoleInfo/RoleInfo_atlas0_6.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/RoleLvUp/RoleLvUp_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/RoleLvUp/RoleLvUp_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/RoleLvUp/RoleLvUp_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/RoleLvUp/RoleLvUp_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Share/Share_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Share/Share_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Share/Share_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Share/Share_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Share/Share_atlas0_1!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Share/Share_atlas0_1!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Share/Share_atlas0_1.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Share/Share_atlas0_1.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Store/Store_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Store/Store_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Store/Store_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Store/Store_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Store/Store_atlas0_1!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Store/Store_atlas0_1!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Store/Store_atlas0_1.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Store/Store_atlas0_1.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Store/Store_atlas0_2!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Store/Store_atlas0_2!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Store/Store_atlas0_2.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Store/Store_atlas0_2.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Store/Store_atlas0_3!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Store/Store_atlas0_3!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Store/Store_atlas0_3.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Store/Store_atlas0_3.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Store/Store_atlas0_4!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Store/Store_atlas0_4!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Store/Store_atlas0_4.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Store/Store_atlas0_4.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Store/Store_atlas0_5!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Store/Store_atlas0_5!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Store/Store_atlas0_5.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Store/Store_atlas0_5.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Store/Store_atlas_hhx91q!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Store/Store_atlas_hhx91q!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Store/Store_atlas_hhx91q.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Store/Store_atlas_hhx91q.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Studio/Studio_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Studio/Studio_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Studio/Studio_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Studio/Studio_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Studio/Studio_atlas0_1!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Studio/Studio_atlas0_1!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Studio/Studio_atlas0_1.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Studio/Studio_atlas0_1.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Task/Task_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Task/Task_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Task/Task_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Task/Task_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Task/Task_atlas0_1!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Task/Task_atlas0_1!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Task/Task_atlas0_1.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Task/Task_atlas0_1.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Task/Task_atlas0_2!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Task/Task_atlas0_2!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Task/Task_atlas0_2.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Task/Task_atlas0_2.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Task/Task_atlas0_3!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Task/Task_atlas0_3!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Task/Task_atlas0_3.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Task/Task_atlas0_3.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Task/Task_atlas0_4!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Task/Task_atlas0_4!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Task/Task_atlas0_4.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Task/Task_atlas0_4.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/TimeTracing/TimeTracing_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/TimeTracing/TimeTracing_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/TimeTracing/TimeTracing_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/TimeTracing/TimeTracing_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/TimeTracing/TimeTracing_atlas0_1!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/TimeTracing/TimeTracing_atlas0_1!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/TimeTracing/TimeTracing_atlas0_1.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/TimeTracing/TimeTracing_atlas0_1.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/TimeTracing/TimeTracing_atlas0_2!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/TimeTracing/TimeTracing_atlas0_2!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/TimeTracing/TimeTracing_atlas0_2.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/TimeTracing/TimeTracing_atlas0_2.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Travel/Travel_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Travel/Travel_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Travel/Travel_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Travel/Travel_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Travel/Travel_atlas0_1!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Travel/Travel_atlas0_1!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/Travel/Travel_atlas0_1.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/Travel/Travel_atlas0_1.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/TurnTable/TurnTable_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/TurnTable/TurnTable_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/TurnTable/TurnTable_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/TurnTable/TurnTable_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/TurnTable/TurnTable_atlas0_1!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/TurnTable/TurnTable_atlas0_1!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/TurnTable/TurnTable_atlas0_1.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/TurnTable/TurnTable_atlas0_1.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/XiuFang/XiuFang_atlas0!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/XiuFang/XiuFang_atlas0!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/XiuFang/XiuFang_atlas0.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/XiuFang/XiuFang_atlas0.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/XiuFang/XiuFang_atlas0_1!a.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/XiuFang/XiuFang_atlas0_1!a.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/XiuFang/XiuFang_atlas0_1.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/XiuFang/XiuFang_atlas0_1.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UUI/bt_tiaoguo.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UUI/bt_tiaoguo.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UUI/pv_icon_quanping.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UUI/pv_icon_quanping.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UUI/pv_icon_tiaoguo.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UUI/pv_icon_tiaoguo.png.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Resources/Live2D.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Live2D.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/GlobalMaskTexture.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/GlobalMaskTexture.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/GlobalMaskTexture.asset.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/GlobalMaskTexture.asset.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/Mask.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/Mask.mat" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/Mask.mat.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/Mask.mat.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/MaskCulling.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/MaskCulling.mat" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/MaskCulling.mat.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/MaskCulling.mat.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/Unlit.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/Unlit.mat" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/Unlit.mat.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/Unlit.mat.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitAdditive.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitAdditive.mat" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitAdditive.mat.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitAdditive.mat.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitAdditiveCulling.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitAdditiveCulling.mat" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitAdditiveCulling.mat.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitAdditiveCulling.mat.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitAdditiveMasked.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitAdditiveMasked.mat" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitAdditiveMasked.mat.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitAdditiveMasked.mat.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitAdditiveMaskedCulling.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitAdditiveMaskedCulling.mat" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitAdditiveMaskedCulling.mat.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitAdditiveMaskedCulling.mat.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitAdditiveMaskedInverted.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitAdditiveMaskedInverted.mat" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitAdditiveMaskedInverted.mat.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitAdditiveMaskedInverted.mat.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitAdditiveMaskedInvertedCulling.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitAdditiveMaskedInvertedCulling.mat" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitAdditiveMaskedInvertedCulling.mat.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitAdditiveMaskedInvertedCulling.mat.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitCulling.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitCulling.mat" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitCulling.mat.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitCulling.mat.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitMasked.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitMasked.mat" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitMasked.mat.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitMasked.mat.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitMaskedCulling.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitMaskedCulling.mat" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitMaskedCulling.mat.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitMaskedCulling.mat.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitMaskedInverted.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitMaskedInverted.mat" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitMaskedInverted.mat.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitMaskedInverted.mat.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitMaskedInvertedCulling.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitMaskedInvertedCulling.mat" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitMaskedInvertedCulling.mat.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitMaskedInvertedCulling.mat.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitMultiply.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitMultiply.mat" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitMultiply.mat.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitMultiply.mat.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitMultiplyCulling.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitMultiplyCulling.mat" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitMultiplyCulling.mat.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitMultiplyCulling.mat.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitMultiplyMasked.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitMultiplyMasked.mat" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitMultiplyMasked.mat.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitMultiplyMasked.mat.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitMultiplyMaskedCulling.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitMultiplyMaskedCulling.mat" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitMultiplyMaskedCulling.mat.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitMultiplyMaskedCulling.mat.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitMultiplyMaskedInverted.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitMultiplyMaskedInverted.mat" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitMultiplyMaskedInverted.mat.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitMultiplyMaskedInverted.mat.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitMultiplyMaskedInvertedCulling.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitMultiplyMaskedInvertedCulling.mat" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitMultiplyMaskedInvertedCulling.mat.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Materials/UnlitMultiplyMaskedInvertedCulling.mat.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Shaders.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Shaders.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Shaders/CubismCG.cginc" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Shaders/CubismCG.cginc" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Shaders/CubismCG.cginc.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Shaders/CubismCG.cginc.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Shaders/Mask.shader" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Shaders/Mask.shader" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Shaders/Mask.shader.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Shaders/Mask.shader.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Shaders/Unlit.shader" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Shaders/Unlit.shader" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Shaders/Unlit.shader.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Live2D/Cubism/Shaders/Unlit.shader.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/CHANGELOG.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/CHANGELOG.md.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/CHANGELOG.md.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/ArrayExtensionMethods.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/ArrayExtensionMethods.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/ArrayExtensionMethods.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/ArrayExtensionMethods.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/ComponentExtensionMethods.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/ComponentExtensionMethods.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/ComponentExtensionMethods.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/ComponentExtensionMethods.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/CubismCanvasInformation.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/CubismCanvasInformation.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/CubismCanvasInformation.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/CubismCanvasInformation.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/CubismDrawable.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/CubismDrawable.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/CubismDrawable.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/CubismDrawable.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/CubismDynamicDrawableData.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/CubismDynamicDrawableData.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/CubismDynamicDrawableData.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/CubismDynamicDrawableData.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/CubismLogging.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/CubismLogging.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/CubismLogging.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/CubismLogging.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/CubismMoc.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/CubismMoc.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/CubismMoc.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/CubismMoc.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/CubismModel.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/CubismModel.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/CubismModel.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/CubismModel.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/CubismParameter.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/CubismParameter.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/CubismParameter.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/CubismParameter.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/CubismPart.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/CubismPart.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/CubismPart.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/CubismPart.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/CubismTaskQueue.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/CubismTaskQueue.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/CubismTaskQueue.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/CubismTaskQueue.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/CubismTaskableModel.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/CubismTaskableModel.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/CubismTaskableModel.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/CubismTaskableModel.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/GameObjectExtensionMethods.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/GameObjectExtensionMethods.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/GameObjectExtensionMethods.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/GameObjectExtensionMethods.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/ICubismTask.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/ICubismTask.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/ICubismTask.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/ICubismTask.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/Unmanaged.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/Unmanaged.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/Unmanaged/ByteExtensionMethods.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/Unmanaged/ByteExtensionMethods.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/Unmanaged/ByteExtensionMethods.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/Unmanaged/ByteExtensionMethods.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/Unmanaged/CubismCoreDll.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/Unmanaged/CubismCoreDll.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/Unmanaged/CubismCoreDll.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/Unmanaged/CubismCoreDll.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/Unmanaged/CubismUnmanagedArrayView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/Unmanaged/CubismUnmanagedArrayView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/Unmanaged/CubismUnmanagedArrayView.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/Unmanaged/CubismUnmanagedArrayView.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/Unmanaged/CubismUnmanagedCanvasInformation.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/Unmanaged/CubismUnmanagedCanvasInformation.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/Unmanaged/CubismUnmanagedCanvasInformation.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/Unmanaged/CubismUnmanagedCanvasInformation.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/Unmanaged/CubismUnmanagedDrawables.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/Unmanaged/CubismUnmanagedDrawables.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/Unmanaged/CubismUnmanagedDrawables.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/Unmanaged/CubismUnmanagedDrawables.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/Unmanaged/CubismUnmanagedMemory.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/Unmanaged/CubismUnmanagedMemory.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/Unmanaged/CubismUnmanagedMemory.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/Unmanaged/CubismUnmanagedMemory.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/Unmanaged/CubismUnmanagedMoc.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/Unmanaged/CubismUnmanagedMoc.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/Unmanaged/CubismUnmanagedMoc.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/Unmanaged/CubismUnmanagedMoc.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/Unmanaged/CubismUnmanagedModel.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/Unmanaged/CubismUnmanagedModel.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/Unmanaged/CubismUnmanagedModel.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/Unmanaged/CubismUnmanagedModel.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/Unmanaged/CubismUnmanagedParameters.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/Unmanaged/CubismUnmanagedParameters.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/Unmanaged/CubismUnmanagedParameters.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/Unmanaged/CubismUnmanagedParameters.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/Unmanaged/CubismUnmanagedParts.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/Unmanaged/CubismUnmanagedParts.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/Unmanaged/CubismUnmanagedParts.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Core/Unmanaged/CubismUnmanagedParts.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/ComponentExtensionMethods.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/ComponentExtensionMethods.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/ComponentExtensionMethods.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/ComponentExtensionMethods.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/CubismAutoEyeBlinkInput.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/CubismAutoEyeBlinkInput.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/CubismAutoEyeBlinkInput.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/CubismAutoEyeBlinkInput.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/CubismDisplayInfoParameterName.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/CubismDisplayInfoParameterName.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/CubismDisplayInfoParameterName.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/CubismDisplayInfoParameterName.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/CubismDisplayInfoPartName.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/CubismDisplayInfoPartName.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/CubismDisplayInfoPartName.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/CubismDisplayInfoPartName.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/CubismDontMoveOnReimportAttribute.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/CubismDontMoveOnReimportAttribute.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/CubismDontMoveOnReimportAttribute.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/CubismDontMoveOnReimportAttribute.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/CubismEyeBlinkController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/CubismEyeBlinkController.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/CubismEyeBlinkController.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/CubismEyeBlinkController.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/CubismEyeBlinkParameter.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/CubismEyeBlinkParameter.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/CubismEyeBlinkParameter.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/CubismEyeBlinkParameter.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/CubismHitDrawable.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/CubismHitDrawable.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/CubismHitDrawable.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/CubismHitDrawable.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/CubismMoveOnReimportCopyComponentsOnly.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/CubismMoveOnReimportCopyComponentsOnly.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/CubismMoveOnReimportCopyComponentsOnly.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/CubismMoveOnReimportCopyComponentsOnly.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/CubismParameterBlendMode.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/CubismParameterBlendMode.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/CubismParameterBlendMode.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/CubismParameterBlendMode.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/CubismParameterExtensionMethods.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/CubismParameterExtensionMethods.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/CubismParameterExtensionMethods.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/CubismParameterExtensionMethods.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/CubismParameterStore.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/CubismParameterStore.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/CubismParameterStore.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/CubismParameterStore.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/CubismParametersInspector.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/CubismParametersInspector.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/CubismParametersInspector.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/CubismParametersInspector.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/CubismPartsInspector.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/CubismPartsInspector.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/CubismPartsInspector.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/CubismPartsInspector.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/CubismUpdateController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/CubismUpdateController.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/CubismUpdateController.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/CubismUpdateController.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/CubismUpdateExecutionOrder.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/CubismUpdateExecutionOrder.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/CubismUpdateExecutionOrder.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/CubismUpdateExecutionOrder.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Expression.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Expression.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Expression/CubismExpressionController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Expression/CubismExpressionController.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Expression/CubismExpressionController.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Expression/CubismExpressionController.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Expression/CubismExpressionData.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Expression/CubismExpressionData.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Expression/CubismExpressionData.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Expression/CubismExpressionData.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Expression/CubismExpressionList.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Expression/CubismExpressionList.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Expression/CubismExpressionList.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Expression/CubismExpressionList.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Expression/CubismPlayingExpression.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Expression/CubismPlayingExpression.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Expression/CubismPlayingExpression.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Expression/CubismPlayingExpression.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/HarmonicMotion.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/HarmonicMotion.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/HarmonicMotion/CubismHarmonicMotionController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/HarmonicMotion/CubismHarmonicMotionController.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/HarmonicMotion/CubismHarmonicMotionController.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/HarmonicMotion/CubismHarmonicMotionController.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/HarmonicMotion/CubismHarmonicMotionDirection.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/HarmonicMotion/CubismHarmonicMotionDirection.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/HarmonicMotion/CubismHarmonicMotionDirection.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/HarmonicMotion/CubismHarmonicMotionDirection.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/HarmonicMotion/CubismHarmonicMotionParameter.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/HarmonicMotion/CubismHarmonicMotionParameter.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/HarmonicMotion/CubismHarmonicMotionParameter.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/HarmonicMotion/CubismHarmonicMotionParameter.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/ICubismUpdatable.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/ICubismUpdatable.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/ICubismUpdatable.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/ICubismUpdatable.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Json.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Json.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Json/CubismBuiltinPickers.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Json/CubismBuiltinPickers.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Json/CubismBuiltinPickers.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Json/CubismBuiltinPickers.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Json/CubismDisplayInfo3Json.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Json/CubismDisplayInfo3Json.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Json/CubismDisplayInfo3Json.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Json/CubismDisplayInfo3Json.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Json/CubismExp3Json.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Json/CubismExp3Json.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Json/CubismExp3Json.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Json/CubismExp3Json.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Json/CubismJsonParser.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Json/CubismJsonParser.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Json/CubismJsonParser.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Json/CubismJsonParser.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Json/CubismModel3Json.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Json/CubismModel3Json.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Json/CubismModel3Json.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Json/CubismModel3Json.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Json/CubismMotion3Json.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Json/CubismMotion3Json.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Json/CubismMotion3Json.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Json/CubismMotion3Json.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Json/CubismPhysics3Json.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Json/CubismPhysics3Json.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Json/CubismPhysics3Json.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Json/CubismPhysics3Json.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Json/CubismPose3Json.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Json/CubismPose3Json.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Json/CubismPose3Json.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Json/CubismPose3Json.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Json/CubismUserData3Json.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Json/CubismUserData3Json.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Json/CubismUserData3Json.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Json/CubismUserData3Json.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/LookAt.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/LookAt.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/LookAt/CubismLookAxis.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/LookAt/CubismLookAxis.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/LookAt/CubismLookAxis.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/LookAt/CubismLookAxis.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/LookAt/CubismLookController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/LookAt/CubismLookController.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/LookAt/CubismLookController.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/LookAt/CubismLookController.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/LookAt/CubismLookParameter.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/LookAt/CubismLookParameter.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/LookAt/CubismLookParameter.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/LookAt/CubismLookParameter.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/LookAt/CubismLookTargetBehaviour.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/LookAt/CubismLookTargetBehaviour.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/LookAt/CubismLookTargetBehaviour.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/LookAt/CubismLookTargetBehaviour.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/LookAt/ICubismLookTarget.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/LookAt/ICubismLookTarget.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/LookAt/ICubismLookTarget.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/LookAt/ICubismLookTarget.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Motion.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Motion.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Motion/CubismMotionController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Motion/CubismMotionController.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Motion/CubismMotionController.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Motion/CubismMotionController.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Motion/CubismMotionLayer.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Motion/CubismMotionLayer.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Motion/CubismMotionLayer.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Motion/CubismMotionLayer.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Motion/CubismMotionPriority.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Motion/CubismMotionPriority.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Motion/CubismMotionPriority.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Motion/CubismMotionPriority.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Motion/CubismMotionState.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Motion/CubismMotionState.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Motion/CubismMotionState.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Motion/CubismMotionState.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/MotionFade.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/MotionFade.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/MotionFade/CubismFadeController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/MotionFade/CubismFadeController.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/MotionFade/CubismFadeController.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/MotionFade/CubismFadeController.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/MotionFade/CubismFadeCurveType.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/MotionFade/CubismFadeCurveType.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/MotionFade/CubismFadeCurveType.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/MotionFade/CubismFadeCurveType.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/MotionFade/CubismFadeMath.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/MotionFade/CubismFadeMath.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/MotionFade/CubismFadeMath.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/MotionFade/CubismFadeMath.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/MotionFade/CubismFadeMotionData.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/MotionFade/CubismFadeMotionData.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/MotionFade/CubismFadeMotionData.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/MotionFade/CubismFadeMotionData.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/MotionFade/CubismFadeMotionList.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/MotionFade/CubismFadeMotionList.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/MotionFade/CubismFadeMotionList.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/MotionFade/CubismFadeMotionList.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/MotionFade/CubismFadePlayingMotion.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/MotionFade/CubismFadePlayingMotion.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/MotionFade/CubismFadePlayingMotion.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/MotionFade/CubismFadePlayingMotion.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/MotionFade/CubismFadeStateObserver.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/MotionFade/CubismFadeStateObserver.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/MotionFade/CubismFadeStateObserver.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/MotionFade/CubismFadeStateObserver.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/MotionFade/ICubismFadeState.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/MotionFade/ICubismFadeState.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/MotionFade/ICubismFadeState.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/MotionFade/ICubismFadeState.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/MouthMovement.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/MouthMovement.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/MouthMovement/CubismAudioMouthInput.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/MouthMovement/CubismAudioMouthInput.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/MouthMovement/CubismAudioMouthInput.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/MouthMovement/CubismAudioMouthInput.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/MouthMovement/CubismAudioSamplingQuality.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/MouthMovement/CubismAudioSamplingQuality.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/MouthMovement/CubismAudioSamplingQuality.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/MouthMovement/CubismAudioSamplingQuality.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/MouthMovement/CubismAutoMouthInput.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/MouthMovement/CubismAutoMouthInput.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/MouthMovement/CubismAutoMouthInput.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/MouthMovement/CubismAutoMouthInput.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/MouthMovement/CubismMouthController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/MouthMovement/CubismMouthController.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/MouthMovement/CubismMouthController.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/MouthMovement/CubismMouthController.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/MouthMovement/CubismMouthParameter.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/MouthMovement/CubismMouthParameter.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/MouthMovement/CubismMouthParameter.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/MouthMovement/CubismMouthParameter.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/ObjectExtensionMethods.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/ObjectExtensionMethods.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/ObjectExtensionMethods.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/ObjectExtensionMethods.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Physics.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Physics.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Physics/CubismPhysics.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Physics/CubismPhysics.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Physics/CubismPhysics.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Physics/CubismPhysics.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Physics/CubismPhysicsController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Physics/CubismPhysicsController.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Physics/CubismPhysicsController.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Physics/CubismPhysicsController.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Physics/CubismPhysicsInput.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Physics/CubismPhysicsInput.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Physics/CubismPhysicsInput.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Physics/CubismPhysicsInput.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Physics/CubismPhysicsMath.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Physics/CubismPhysicsMath.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Physics/CubismPhysicsMath.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Physics/CubismPhysicsMath.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Physics/CubismPhysicsNormalization.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Physics/CubismPhysicsNormalization.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Physics/CubismPhysicsNormalization.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Physics/CubismPhysicsNormalization.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Physics/CubismPhysicsOutput.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Physics/CubismPhysicsOutput.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Physics/CubismPhysicsOutput.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Physics/CubismPhysicsOutput.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Physics/CubismPhysicsParticle.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Physics/CubismPhysicsParticle.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Physics/CubismPhysicsParticle.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Physics/CubismPhysicsParticle.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Physics/CubismPhysicsRig.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Physics/CubismPhysicsRig.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Physics/CubismPhysicsRig.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Physics/CubismPhysicsRig.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Physics/CubismPhysicsSourceComponent.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Physics/CubismPhysicsSourceComponent.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Physics/CubismPhysicsSourceComponent.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Physics/CubismPhysicsSourceComponent.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Physics/CubismPhysicsSubRig.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Physics/CubismPhysicsSubRig.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Physics/CubismPhysicsSubRig.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Physics/CubismPhysicsSubRig.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Pose.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Pose.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Pose/CubismPoseController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Pose/CubismPoseController.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Pose/CubismPoseController.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Pose/CubismPoseController.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Pose/CubismPoseData.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Pose/CubismPoseData.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Pose/CubismPoseData.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Pose/CubismPoseData.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Pose/CubismPosePart.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Pose/CubismPosePart.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Pose/CubismPosePart.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Pose/CubismPosePart.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Raycasting.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Raycasting.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Raycasting/CubismRaycastHit.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Raycasting/CubismRaycastHit.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Raycasting/CubismRaycastHit.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Raycasting/CubismRaycastHit.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Raycasting/CubismRaycastable.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Raycasting/CubismRaycastable.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Raycasting/CubismRaycastable.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Raycasting/CubismRaycastable.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Raycasting/CubismRaycastablePrecision.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Raycasting/CubismRaycastablePrecision.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Raycasting/CubismRaycastablePrecision.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Raycasting/CubismRaycastablePrecision.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Raycasting/CubismRaycaster.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Raycasting/CubismRaycaster.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Raycasting/CubismRaycaster.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Raycasting/CubismRaycaster.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Tasking.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Tasking.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Tasking/CubismBuiltinAsyncTaskHandler.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Tasking/CubismBuiltinAsyncTaskHandler.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Tasking/CubismBuiltinAsyncTaskHandler.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/Tasking/CubismBuiltinAsyncTaskHandler.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/UserData.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/UserData.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/UserData/CubismUserDataBody.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/UserData/CubismUserDataBody.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/UserData/CubismUserDataBody.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/UserData/CubismUserDataBody.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/UserData/CubismUserDataTag.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/UserData/CubismUserDataTag.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/UserData/CubismUserDataTag.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/UserData/CubismUserDataTag.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/UserData/CubismUserDataTargetType.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/UserData/CubismUserDataTargetType.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/UserData/CubismUserDataTargetType.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Framework/UserData/CubismUserDataTargetType.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/LICENSE.md" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/LICENSE.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/LICENSE.md.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/LICENSE.md.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/NOTICE.md" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/NOTICE.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/NOTICE.md.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/NOTICE.md.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/README.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/README.md.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/README.md.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/ArrayExtensionMethods.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/ArrayExtensionMethods.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/ArrayExtensionMethods.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/ArrayExtensionMethods.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/CubismBuiltinMaterials.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/CubismBuiltinMaterials.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/CubismBuiltinMaterials.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/CubismBuiltinMaterials.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/CubismBuiltinShaders.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/CubismBuiltinShaders.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/CubismBuiltinShaders.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/CubismBuiltinShaders.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/CubismRenderController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/CubismRenderController.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/CubismRenderController.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/CubismRenderController.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/CubismRenderer.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/CubismRenderer.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/CubismRenderer.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/CubismRenderer.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/CubismShaderVariables.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/CubismShaderVariables.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/CubismShaderVariables.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/CubismShaderVariables.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/CubismSortingMode.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/CubismSortingMode.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/CubismSortingMode.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/CubismSortingMode.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/CubismSortingModeExtensionMethods.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/CubismSortingModeExtensionMethods.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/CubismSortingModeExtensionMethods.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/CubismSortingModeExtensionMethods.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/ICubismDrawOrderHandler.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/ICubismDrawOrderHandler.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/ICubismDrawOrderHandler.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/ICubismDrawOrderHandler.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/ICubismOpacityHandler.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/ICubismOpacityHandler.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/ICubismOpacityHandler.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/ICubismOpacityHandler.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/Masking.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/Masking.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/Masking/CubismMaskCommandBuffer.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/Masking/CubismMaskCommandBuffer.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/Masking/CubismMaskCommandBuffer.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/Masking/CubismMaskCommandBuffer.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/Masking/CubismMaskController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/Masking/CubismMaskController.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/Masking/CubismMaskController.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/Masking/CubismMaskController.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/Masking/CubismMaskMaskedJunction.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/Masking/CubismMaskMaskedJunction.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/Masking/CubismMaskMaskedJunction.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/Masking/CubismMaskMaskedJunction.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/Masking/CubismMaskProperties.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/Masking/CubismMaskProperties.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/Masking/CubismMaskProperties.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/Masking/CubismMaskProperties.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/Masking/CubismMaskRenderer.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/Masking/CubismMaskRenderer.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/Masking/CubismMaskRenderer.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/Masking/CubismMaskRenderer.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/Masking/CubismMaskRendererExtensionMethods.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/Masking/CubismMaskRendererExtensionMethods.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/Masking/CubismMaskRendererExtensionMethods.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/Masking/CubismMaskRendererExtensionMethods.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/Masking/CubismMaskTexture.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/Masking/CubismMaskTexture.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/Masking/CubismMaskTexture.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/Masking/CubismMaskTexture.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/Masking/CubismMaskTile.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/Masking/CubismMaskTile.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/Masking/CubismMaskTile.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/Masking/CubismMaskTile.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/Masking/CubismMaskTilePool.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/Masking/CubismMaskTilePool.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/Masking/CubismMaskTilePool.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/Masking/CubismMaskTilePool.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/Masking/CubismMaskTransform.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/Masking/CubismMaskTransform.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/Masking/CubismMaskTransform.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/Masking/CubismMaskTransform.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/Masking/ICubismMaskCommandSource.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/Masking/ICubismMaskCommandSource.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/Masking/ICubismMaskCommandSource.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/Masking/ICubismMaskCommandSource.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/Masking/ICubismMaskTextureCommandSource.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/Masking/ICubismMaskTextureCommandSource.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/Masking/ICubismMaskTextureCommandSource.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/Masking/ICubismMaskTextureCommandSource.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/Masking/IntExtensionMethods.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/Masking/IntExtensionMethods.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/Masking/IntExtensionMethods.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/Rendering/Masking/IntExtensionMethods.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/cubism-info.yml" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/cubism-info.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/cubism-info.yml.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ThirdParty/Live2D/Cubism/cubism-info.yml.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/WebGLTemplates/MyCustomTemplate/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/WebGLTemplates/MyCustomTemplate/index.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/csc.rsp" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/csc.rsp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/csc.rsp.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/csc.rsp.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/mcs.rsp" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/mcs.rsp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/mcs.rsp.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/mcs.rsp.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/GameClient.sln.DotSettings.user" beforeDir="false" afterPath="$PROJECT_DIR$/GameClient.sln.DotSettings.user" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Packages/manifest.json" beforeDir="false" afterPath="$PROJECT_DIR$/Packages/manifest.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Packages/packages-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/Packages/packages-lock.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ProjectSettings/ProjectSettings.asset" beforeDir="false" afterPath="$PROJECT_DIR$/ProjectSettings/ProjectSettings.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ProjectSettings/ProjectVersion.txt" beforeDir="false" afterPath="$PROJECT_DIR$/ProjectSettings/ProjectVersion.txt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ProjectSettings/boot.config" beforeDir="false" />
     </list>
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -23,7 +934,13 @@
   </component>
   </component>
   <component name="HighlightingSettingsPerFile">
   <component name="HighlightingSettingsPerFile">
     <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/351e49e2a5bf4fd6beabb458ce2255f3ff600/4e/84b60bbd/Enumerable.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/351e49e2a5bf4fd6beabb458ce2255f3ff600/4e/84b60bbd/Enumerable.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/3789ee403a53437cbb6b5d9ab6311f51573620/81/60297759/Action.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/683a2b31bf9142429c44f02c75dbc6c913ce00/3f/aa010310/MonoBehaviour.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/683a2b31bf9142429c44f02c75dbc6c913ce00/6d/b884eed9/Object.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/683a2b31bf9142429c44f02c75dbc6c913ce00/6d/b884eed9/Object.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/683a2b31bf9142429c44f02c75dbc6c913ce00/75/d87ba9d0/LogType.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/683a2b31bf9142429c44f02c75dbc6c913ce00/88/39e0e101/GameObject.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/683a2b31bf9142429c44f02c75dbc6c913ce00/f7/323a5d44/Application.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/695d1cc93cca45069c528c15c9fdd7493e2800/ae/712a485e/MemoryStream.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/ExcelConfig/Partical/StoryLevelCfg.cs" root0="SKIP_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/ExcelConfig/Partical/StoryLevelCfg.cs" root0="SKIP_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/Assets/Game/Launcher/Views/Alert/Alert.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/Assets/Game/Launcher/Views/Alert/Alert.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/Assets/Game/Launcher/Views/FullScreenTextView.cs" root0="SKIP_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/Assets/Game/Launcher/Views/FullScreenTextView.cs" root0="SKIP_HIGHLIGHTING" />
@@ -45,7 +962,7 @@
     &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
     &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
     &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
     &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
     &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
     &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
-    &quot;XThreadsFramesViewSplitterKey&quot;: &quot;0.6236111&quot;,
+    &quot;XThreadsFramesViewSplitterKey&quot;: &quot;0.5252396&quot;,
     &quot;git-widget-placeholder&quot;: &quot;H5sdk&quot;,
     &quot;git-widget-placeholder&quot;: &quot;H5sdk&quot;,
     &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
     &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
     &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
     &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
@@ -58,7 +975,7 @@
 }</component>
 }</component>
   <component name="RunManager" selected="附加到 Unity 编辑器.附加到 Unity 编辑器">
   <component name="RunManager" selected="附加到 Unity 编辑器.附加到 Unity 编辑器">
     <configuration name="启动 Unity" type="RunUnityExe" factoryName="Unity Executable">
     <configuration name="启动 Unity" type="RunUnityExe" factoryName="Unity Executable">
-      <option name="EXE_PATH" value="E:\ruanJian\2020.3.33f1c2\Editor\Unity.exe" />
+      <option name="EXE_PATH" value="E:\ruanJian\2022.3.0f1c1\Editor\Unity.exe" />
       <option name="PROGRAM_PARAMETERS" value="-projectPath D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient -debugCodeOptimization" />
       <option name="PROGRAM_PARAMETERS" value="-projectPath D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient -debugCodeOptimization" />
       <option name="WORKING_DIRECTORY" value="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient" />
       <option name="WORKING_DIRECTORY" value="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient" />
       <option name="PASS_PARENT_ENVS" value="1" />
       <option name="PASS_PARENT_ENVS" value="1" />
@@ -69,7 +986,7 @@
       <method v="2" />
       <method v="2" />
     </configuration>
     </configuration>
     <configuration name="单元测试(批处理模式)" type="RunUnityExe" factoryName="Unity Executable">
     <configuration name="单元测试(批处理模式)" type="RunUnityExe" factoryName="Unity Executable">
-      <option name="EXE_PATH" value="E:\ruanJian\2020.3.33f1c2\Editor\Unity.exe" />
+      <option name="EXE_PATH" value="E:\ruanJian\2022.3.0f1c1\Editor\Unity.exe" />
       <option name="PROGRAM_PARAMETERS" value="-runTests -batchmode -projectPath D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient -testResults Logs/results.xml -logFile Logs/Editor.log -testPlatform EditMode -debugCodeOptimization" />
       <option name="PROGRAM_PARAMETERS" value="-runTests -batchmode -projectPath D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient -testResults Logs/results.xml -logFile Logs/Editor.log -testPlatform EditMode -debugCodeOptimization" />
       <option name="WORKING_DIRECTORY" value="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient" />
       <option name="WORKING_DIRECTORY" value="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient" />
       <option name="PASS_PARENT_ENVS" value="1" />
       <option name="PASS_PARENT_ENVS" value="1" />
@@ -79,15 +996,13 @@
       <option name="PTY_MODE" value="Auto" />
       <option name="PTY_MODE" value="Auto" />
       <method v="2" />
       <method v="2" />
     </configuration>
     </configuration>
-    <configuration name="附加到 Unity 编辑器" type="UNITY_DEBUG_RUN_CONFIGURATION" factoryName="Unity Debug" show_console_on_std_err="false" show_console_on_std_out="false" port="50000" address="localhost" ignored-value-for-modified-check="34176">
+    <configuration name="附加到 Unity 编辑器" type="UNITY_DEBUG_RUN_CONFIGURATION" factoryName="Unity Debug" show_console_on_std_err="false" show_console_on_std_out="false" port="50000" address="localhost">
       <option name="allowRunningInParallel" value="false" />
       <option name="allowRunningInParallel" value="false" />
       <option name="listenPortForConnections" value="false" />
       <option name="listenPortForConnections" value="false" />
-      <option name="pid" value="34176" />
+      <option name="pid" />
       <option name="projectPathOnTarget" />
       <option name="projectPathOnTarget" />
       <option name="runtimes">
       <option name="runtimes">
-        <list>
-          <MonoRuntime />
-        </list>
+        <list />
       </option>
       </option>
       <option name="selectedOptions">
       <option name="selectedOptions">
         <list />
         <list />
@@ -125,6 +1040,12 @@
       <workItem from="1751800911301" duration="2198000" />
       <workItem from="1751800911301" duration="2198000" />
       <workItem from="1751831002680" duration="3915000" />
       <workItem from="1751831002680" duration="3915000" />
       <workItem from="1751909374445" duration="3014000" />
       <workItem from="1751909374445" duration="3014000" />
+      <workItem from="1752673889439" duration="12276000" />
+      <workItem from="1752757462885" duration="11792000" />
+      <workItem from="1752841832689" duration="3896000" />
+      <workItem from="1752928189525" duration="3474000" />
+      <workItem from="1753033108821" duration="943000" />
+      <workItem from="1753110504349" duration="1658000" />
     </task>
     </task>
     <servers />
     <servers />
   </component>
   </component>
@@ -158,69 +1079,82 @@
           <option name="timeStamp" value="26" />
           <option name="timeStamp" value="26" />
         </line-breakpoint>
         </line-breakpoint>
         <line-breakpoint enabled="true" type="DotNet Breakpoints">
         <line-breakpoint enabled="true" type="DotNet Breakpoints">
-          <url>file://$PROJECT_DIR$/Assets/Game/HotUpdate/Data/ScoreSystemData.cs</url>
-          <line>339</line>
-          <properties documentPath="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient\Assets\Game\HotUpdate\Data\ScoreSystemData.cs" containingFunctionPresentation="方法 'GetValidSkills'">
+          <url>file://$PROJECT_DIR$/Assets/Game/HotUpdate/Controller/LoginController.cs</url>
+          <line>325</line>
+          <properties documentPath="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient\Assets\Game\HotUpdate\Controller\LoginController.cs" containingFunctionPresentation="方法 'OnLoadConfigsEnterGame'">
             <startOffsets>
             <startOffsets>
-              <option value="12994" />
+              <option value="13223" />
             </startOffsets>
             </startOffsets>
             <endOffsets>
             <endOffsets>
-              <option value="13066" />
+              <option value="13241" />
             </endOffsets>
             </endOffsets>
           </properties>
           </properties>
-          <option name="timeStamp" value="27" />
+          <option name="timeStamp" value="46" />
         </line-breakpoint>
         </line-breakpoint>
         <line-breakpoint enabled="true" type="DotNet Breakpoints">
         <line-breakpoint enabled="true" type="DotNet Breakpoints">
-          <url>file://$PROJECT_DIR$/Assets/Game/HotUpdate/Controller/LoginController.cs</url>
-          <line>320</line>
-          <properties documentPath="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient\Assets\Game\HotUpdate\Controller\LoginController.cs" containingFunctionPresentation="方法 'OnLoadConfigsEnterGame'">
+          <url>file://$PROJECT_DIR$/Assets/Game/HotUpdate/Views/Poem/PoemGalleryView.cs</url>
+          <line>231</line>
+          <properties documentPath="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient\Assets\Game\HotUpdate\Views\Poem\PoemGalleryView.cs" containingFunctionPresentation="方法 'OnShown'">
             <startOffsets>
             <startOffsets>
-              <option value="13083" />
+              <option value="9993" />
             </startOffsets>
             </startOffsets>
             <endOffsets>
             <endOffsets>
-              <option value="13102" />
+              <option value="10027" />
             </endOffsets>
             </endOffsets>
           </properties>
           </properties>
-          <option name="timeStamp" value="46" />
+          <option name="timeStamp" value="66" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="DotNet Breakpoints">
+          <url>file://$PROJECT_DIR$/Assets/Game/HotUpdate/Views/Poem/PoemGalleryView.cs</url>
+          <line>237</line>
+          <properties documentPath="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient\Assets\Game\HotUpdate\Views\Poem\PoemGalleryView.cs" containingFunctionPresentation="方法 'OnHide'">
+            <startOffsets>
+              <option value="10129" />
+            </startOffsets>
+            <endOffsets>
+              <option value="10148" />
+            </endOffsets>
+          </properties>
+          <option name="timeStamp" value="67" />
         </line-breakpoint>
         </line-breakpoint>
         <line-breakpoint enabled="true" type="DotNet Breakpoints">
         <line-breakpoint enabled="true" type="DotNet Breakpoints">
-          <url>file://$PROJECT_DIR$/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxBonusShowView.cs</url>
-          <line>473</line>
-          <properties documentPath="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient\Assets\Game\HotUpdate\Views\LuckyBox\LuckyBoxBonusShowView.cs" containingFunctionPresentation="方法 'ShowTurnItem'">
+          <url>file://$PROJECT_DIR$/Assets/Game/HotUpdate/Views/Poem/PoemGalleryView.cs</url>
+          <line>528</line>
+          <properties documentPath="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient\Assets\Game\HotUpdate\Views\Poem\PoemGalleryView.cs" containingFunctionPresentation="方法 'RenderListItem'">
             <startOffsets>
             <startOffsets>
-              <option value="17355" />
+              <option value="21674" />
             </startOffsets>
             </startOffsets>
             <endOffsets>
             <endOffsets>
-              <option value="17411" />
+              <option value="21694" />
             </endOffsets>
             </endOffsets>
           </properties>
           </properties>
-          <option name="timeStamp" value="55" />
+          <option name="timeStamp" value="69" />
         </line-breakpoint>
         </line-breakpoint>
         <line-breakpoint enabled="true" type="DotNet Breakpoints">
         <line-breakpoint enabled="true" type="DotNet Breakpoints">
-          <url>file://$PROJECT_DIR$/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxBonusShowView.cs</url>
-          <line>355</line>
-          <properties documentPath="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient\Assets\Game\HotUpdate\Views\LuckyBox\LuckyBoxBonusShowView.cs" containingFunctionPresentation="方法 'ClickItem'">
+          <url>file://$PROJECT_DIR$/Assets/Game/HotUpdate/Views/Poem/PoemGalleryView.cs</url>
+          <line>543</line>
+          <properties documentPath="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient\Assets\Game\HotUpdate\Views\Poem\PoemGalleryView.cs" containingFunctionPresentation="方法 'RenderListItem1'">
             <startOffsets>
             <startOffsets>
-              <option value="13419" />
+              <option value="22125" />
             </startOffsets>
             </startOffsets>
             <endOffsets>
             <endOffsets>
-              <option value="13476" />
+              <option value="22149" />
             </endOffsets>
             </endOffsets>
           </properties>
           </properties>
-          <option name="timeStamp" value="59" />
+          <option name="timeStamp" value="70" />
         </line-breakpoint>
         </line-breakpoint>
         <line-breakpoint enabled="true" type="DotNet Breakpoints">
         <line-breakpoint enabled="true" type="DotNet Breakpoints">
-          <url>file://$PROJECT_DIR$/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxBonusShowView.cs</url>
-          <line>353</line>
-          <properties documentPath="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient\Assets\Game\HotUpdate\Views\LuckyBox\LuckyBoxBonusShowView.cs" containingFunctionPresentation="方法 'ClickItem'">
+          <url>file://$PROJECT_DIR$/Assets/Game/HotUpdate/Data/PoemGalleryDataManager.cs</url>
+          <line>286</line>
+          <properties documentPath="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient\Assets\Game\HotUpdate\Data\PoemGalleryDataManager.cs" containingFunctionPresentation="方法 'IsResulting'">
             <startOffsets>
             <startOffsets>
-              <option value="13357" />
+              <option value="8696" />
             </startOffsets>
             </startOffsets>
             <endOffsets>
             <endOffsets>
-              <option value="13377" />
+              <option value="8821" />
             </endOffsets>
             </endOffsets>
           </properties>
           </properties>
-          <option name="timeStamp" value="60" />
+          <option name="timeStamp" value="90" />
         </line-breakpoint>
         </line-breakpoint>
         <breakpoint enabled="true" type="DotNet_Exception_Breakpoints">
         <breakpoint enabled="true" type="DotNet_Exception_Breakpoints">
           <properties exception="System.OperationCanceledException" breakIfHandledByOtherCode="false" displayValue="System.OperationCanceledException" />
           <properties exception="System.OperationCanceledException" breakIfHandledByOtherCode="false" displayValue="System.OperationCanceledException" />

+ 1 - 1
GameClient/Assets/Editor/FairyGUI/UIPanelEditor.cs

@@ -144,7 +144,7 @@ namespace FairyGUIEditor
             Vector3 pos = panel.GetUIWorldPosition();
             Vector3 pos = panel.GetUIWorldPosition();
             float sizeFactor = HandleUtility.GetHandleSize(pos);
             float sizeFactor = HandleUtility.GetHandleSize(pos);
 #if UNITY_2017_1_OR_NEWER
 #if UNITY_2017_1_OR_NEWER
-            Vector3 newPos = Handles.FreeMoveHandle(pos, Quaternion.identity, sizeFactor, Vector3.one, Handles.ArrowHandleCap);
+            var fmh_147_58_638885597494862158 = Quaternion.identity; Vector3 newPos = Handles.FreeMoveHandle(pos, sizeFactor, Vector3.one, Handles.ArrowHandleCap);
 #else
 #else
             Vector3 newPos = Handles.FreeMoveHandle(pos, Quaternion.identity, sizeFactor, Vector3.one, Handles.ArrowCap);
             Vector3 newPos = Handles.FreeMoveHandle(pos, Quaternion.identity, sizeFactor, Vector3.one, Handles.ArrowCap);
 #endif
 #endif

+ 14 - 2
GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -76,7 +76,14 @@ namespace GFGGame
                     //界面
                     //界面
                     try
                     try
                     {
                     {
-                        UGUIManager.Instance.StartInitialization();
+                        UGUIManager.Instance.StartInitialization(() =>
+                        {
+                            ViewManager.PreloadViews<LoginView>();
+                            ViewManager.PreloadViews<SystemNoticeView>();
+                            ViewManager.PreloadViews<LoadingView>();
+                            ViewManager.PreloadViews<ModalStatusView>();
+                            ViewManager.PreloadViews<CreateRoleView>();
+                        });
                     }
                     }
                     catch (Exception e)
                     catch (Exception e)
                     {
                     {
@@ -92,6 +99,12 @@ namespace GFGGame
             }
             }
 
 
             await FontLoader.Instance.Init2();
             await FontLoader.Instance.Init2();
+            
+            ViewManager.PreloadViews<MainUIView>();
+            ViewManager.PreloadViews<StoryDialogView>();
+            ViewManager.PreloadViews<RewardView>();
+            ViewManager.PreloadViews<StoryChapterView>();
+            ViewManager.PreloadViews<SuitItemView>();
         }
         }
 
 
         public static bool CheckLoginCache(bool doLogin)
         public static bool CheckLoginCache(bool doLogin)
@@ -196,7 +209,6 @@ namespace GFGGame
 
 
         private static void EnterGame()
         private static void EnterGame()
         {
         {
-            
             LoadingView.Instance.SetProgress(100, () =>
             LoadingView.Instance.SetProgress(100, () =>
             {
             {
                 ViewManager.Hide<LoadingView>();
                 ViewManager.Hide<LoadingView>();

+ 9 - 7
GameClient/Assets/Game/HotUpdate/Data/PoemGalleryDataManager.cs

@@ -235,9 +235,9 @@ namespace GFGGame
         public string GetThemeTime()
         public string GetThemeTime()
         {
         {
             // int week = GlobalCfgArray.globalCfg.galleryClearingWeekTime - 1 == 0 ? 7 : GlobalCfgArray.globalCfg.galleryClearingWeekTime - 1;
             // int week = GlobalCfgArray.globalCfg.galleryClearingWeekTime - 1 == 0 ? 7 : GlobalCfgArray.globalCfg.galleryClearingWeekTime - 1;
-            long monday00 = TimeUtil.GetCurWeekTime(1); //本周一0点
+            var strTime = CommonDataManager.Tables.TblGlobalCfg.GalleryClearingStartTime.Split(' ')[1];
             long monday = TimeUtil.GetCurWeekTime(CommonDataManager.Tables.TblGlobalCfg.GalleryClearingWeekTime,
             long monday = TimeUtil.GetCurWeekTime(CommonDataManager.Tables.TblGlobalCfg.GalleryClearingWeekTime,
-                CommonDataManager.Tables.TblGlobalCfg.GalleryClearingStartTime); //本周结算时间
+                strTime); //本周结算时间
 
 
             long startTime = 0;
             long startTime = 0;
             long endTime = 0;
             long endTime = 0;
@@ -245,7 +245,7 @@ namespace GFGGame
             if ((TimeInfo.Instance.ServerNow()) < monday) //本周一5点之前显示上周
             if ((TimeInfo.Instance.ServerNow()) < monday) //本周一5点之前显示上周
             {
             {
                 startTime = TimeUtil.GetLastWeekTime(CommonDataManager.Tables.TblGlobalCfg.GalleryClearingWeekTime,
                 startTime = TimeUtil.GetLastWeekTime(CommonDataManager.Tables.TblGlobalCfg.GalleryClearingWeekTime,
-                    CommonDataManager.Tables.TblGlobalCfg.GalleryClearingStartTime);
+                    strTime);
                 if (CommonDataManager.Tables.TblGlobalCfg.GalleryClearingWeekTime == 1)
                 if (CommonDataManager.Tables.TblGlobalCfg.GalleryClearingWeekTime == 1)
                 {
                 {
                     endTime = TimeUtil.GetLastWeekTime(7);
                     endTime = TimeUtil.GetLastWeekTime(7);
@@ -283,8 +283,9 @@ namespace GFGGame
         /// <returns></returns>
         /// <returns></returns>
         public bool IsResulting()
         public bool IsResulting()
         {
         {
-            long start = TimeUtil.GetCurWeekTime(CommonDataManager.Tables.TblGlobalCfg.GalleryClearingWeekTime,
-                CommonDataManager.Tables.TblGlobalCfg.GalleryClearingStartTime);
+            var strTime = CommonDataManager.Tables.TblGlobalCfg.GalleryClearingStartTime.Split(' ')[1];
+            long start =
+                TimeUtil.GetCurWeekTime(CommonDataManager.Tables.TblGlobalCfg.GalleryClearingWeekTime, strTime);
             //本周一5点刷新本周
             //本周一5点刷新本周
             long end = TimeUtil.GetCurWeekTime(CommonDataManager.Tables.TblGlobalCfg.GalleryClearingWeekTime,
             long end = TimeUtil.GetCurWeekTime(CommonDataManager.Tables.TblGlobalCfg.GalleryClearingWeekTime,
                 CommonDataManager.Tables.TblGlobalCfg.GalleryClearingEndTime.Split(' ')[1]); //本周一4点结算上周
                 CommonDataManager.Tables.TblGlobalCfg.GalleryClearingEndTime.Split(' ')[1]); //本周一4点结算上周
@@ -298,13 +299,14 @@ namespace GFGGame
         /// <returns></returns>
         /// <returns></returns>
         public bool IsCurThemeWork(long time)
         public bool IsCurThemeWork(long time)
         {
         {
+            var strTime = CommonDataManager.Tables.TblGlobalCfg.GalleryClearingStartTime.Split(' ')[1];
             long monday = TimeUtil.GetCurWeekTime(CommonDataManager.Tables.TblGlobalCfg.GalleryClearingWeekTime,
             long monday = TimeUtil.GetCurWeekTime(CommonDataManager.Tables.TblGlobalCfg.GalleryClearingWeekTime,
-                CommonDataManager.Tables.TblGlobalCfg.GalleryClearingStartTime); //本周结算时间
+                strTime); //本周结算时间
             long startTime = 0;
             long startTime = 0;
             if ((TimeInfo.Instance.ServerNow()) < monday) //本周一5点之前显示上周
             if ((TimeInfo.Instance.ServerNow()) < monday) //本周一5点之前显示上周
             {
             {
                 startTime = TimeUtil.GetLastWeekTime(CommonDataManager.Tables.TblGlobalCfg.GalleryClearingWeekTime,
                 startTime = TimeUtil.GetLastWeekTime(CommonDataManager.Tables.TblGlobalCfg.GalleryClearingWeekTime,
-                    CommonDataManager.Tables.TblGlobalCfg.GalleryClearingStartTime);
+                    strTime);
                 return time > startTime;
                 return time > startTime;
             }
             }
             else
             else

+ 0 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_RewardUI.cs

@@ -13,7 +13,6 @@ namespace UI.CommonGame
         public GGroup m_downTipsText;
         public GGroup m_downTipsText;
         public UI_ComRewardList m_comList;
         public UI_ComRewardList m_comList;
         public GGroup m_grp;
         public GGroup m_grp;
-        public Transition m_openViewAction;
         public const string URL = "ui://eg2y0ldpm9wm8q";
         public const string URL = "ui://eg2y0ldpm9wm8q";
         public const string PACKAGE_NAME = "CommonGame";
         public const string PACKAGE_NAME = "CommonGame";
         public const string RES_NAME = "RewardUI";
         public const string RES_NAME = "RewardUI";
@@ -67,7 +66,6 @@ namespace UI.CommonGame
             m_downTipsText = (GGroup)comp.GetChild("downTipsText");
             m_downTipsText = (GGroup)comp.GetChild("downTipsText");
             m_comList = (UI_ComRewardList)UI_ComRewardList.Create(comp.GetChild("comList"));
             m_comList = (UI_ComRewardList)UI_ComRewardList.Create(comp.GetChild("comList"));
             m_grp = (GGroup)comp.GetChild("grp");
             m_grp = (GGroup)comp.GetChild("grp");
-            m_openViewAction = comp.GetTransition("openViewAction");
         }
         }
         public void Dispose(bool disposeTarget = false)
         public void Dispose(bool disposeTarget = false)
         {
         {
@@ -78,7 +76,6 @@ namespace UI.CommonGame
             m_comList.Dispose();
             m_comList.Dispose();
             m_comList = null;
             m_comList = null;
             m_grp = null;
             m_grp = null;
-            m_openViewAction = null;
             if(disposeTarget && target != null)
             if(disposeTarget && target != null)
             {
             {
                 target.RemoveFromParent();
                 target.RemoveFromParent();

+ 2 - 1
GameClient/Assets/Game/HotUpdate/Game.HotUpdate.asmdef

@@ -9,7 +9,8 @@
         "GUID:6e5063adab271564ba0098a06a8cebda",
         "GUID:6e5063adab271564ba0098a06a8cebda",
         "GUID:f22fac247a56d2d41b687bb0d900e54e",
         "GUID:f22fac247a56d2d41b687bb0d900e54e",
         "GUID:2a81c6962524d424a8ef5072bd3b0fa0",
         "GUID:2a81c6962524d424a8ef5072bd3b0fa0",
-        "GUID:3c0fd0809f219634896c0ddb3fa25f71"
+        "GUID:3c0fd0809f219634896c0ddb3fa25f71",
+        "GUID:b2b60b59554a33b41b16ef821fecbac2"
     ],
     ],
     "includePlatforms": [],
     "includePlatforms": [],
     "excludePlatforms": [],
     "excludePlatforms": [],

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Platform/QDJGameManager.cs

@@ -28,7 +28,7 @@ namespace GFGGame
 
 
             if (LauncherConfig.IsTest)
             if (LauncherConfig.IsTest)
             {
             {
-                string testUid =19382.ToString();
+                string testUid =191241.ToString();
                 url =
                 url =
                     $"https://webgltest.goufuguiwxw.com/?user_id={testUid}&user_name=12241433259&timestamp=175074382&sign=88cc86dd40f78dfbbfe46add3e8eaa9dac3ba8&cp_ext=&partner=platform";
                     $"https://webgltest.goufuguiwxw.com/?user_id={testUid}&user_name=12241433259&timestamp=175074382&sign=88cc86dd40f78dfbbfe46add3e8eaa9dac3ba8&cp_ext=&partner=platform";
             }
             }

+ 57 - 24
GameClient/Assets/Game/HotUpdate/ServerProxy/PoemGallerySProxy.cs

@@ -29,6 +29,7 @@ namespace GFGGame
                     return true;
                     return true;
                 }
                 }
             }
             }
+
             return false;
             return false;
         }
         }
 
 
@@ -36,7 +37,16 @@ namespace GFGGame
         public static async ETTask<bool> ReqGalleryList(int sortType, int startIndex, int Count)
         public static async ETTask<bool> ReqGalleryList(int sortType, int startIndex, int Count)
         {
         {
             S2C_GetGalleryList response = null;
             S2C_GetGalleryList response = null;
-            response = (S2C_GetGalleryList)await MessageHelper.SendToServer(new C2S_GetGalleryList() { SortType = sortType, StartIndex = startIndex, Count = Count });
+            try
+            {
+                response = (S2C_GetGalleryList)await MessageHelper.SendToServer(new C2S_GetGalleryList()
+                    { SortType = sortType, StartIndex = startIndex, Count = Count });
+            }
+            catch (Exception e)
+            {
+                Log.Error(e);
+            }
+
             if (response != null)
             if (response != null)
             {
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 if (response.Error == ErrorCode.ERR_Success)
@@ -60,16 +70,21 @@ namespace GFGGame
                             list = PoemGalleryDataManager.Instance.MySelfDatas;
                             list = PoemGalleryDataManager.Instance.MySelfDatas;
                             break;
                             break;
                     }
                     }
+
                     if (response.StartIndex == 0) list.Clear();
                     if (response.StartIndex == 0) list.Clear();
                     for (int i = 0; i < response.WorksList.Count; i++)
                     for (int i = 0; i < response.WorksList.Count; i++)
                     {
                     {
-                        PoemGalleryData data = PoemGalleryDataManager.Instance.GetGalleryDataById(response.WorksList[i].WorksId);
+                        PoemGalleryData data =
+                            PoemGalleryDataManager.Instance.GetGalleryDataById(response.WorksList[i].WorksId);
                         PoemGalleryDataManager.Instance.GalleryIDList.Add(response.WorksList[i].WorksId);
                         PoemGalleryDataManager.Instance.GalleryIDList.Add(response.WorksList[i].WorksId);
                         if (data != null)
                         if (data != null)
                         {
                         {
-                            PoemGalleryDataManager.Instance.UpdateRoleInfo(response.WorksList[i].WorksId, response.WorksList[i].AuthorName);
-                            PoemGalleryDataManager.Instance.UpdateFavoriteState(response.WorksList[i].WorksId, response.WorksList[i].CollectOrNot, response.WorksList[i].BeCollectedCount);
-                            PoemGalleryDataManager.Instance.UpdateVoteiteState(response.WorksList[i].WorksId, response.WorksList[i].LikeOrNot, response.WorksList[i].BelikedCount);
+                            PoemGalleryDataManager.Instance.UpdateRoleInfo(response.WorksList[i].WorksId,
+                                response.WorksList[i].AuthorName);
+                            PoemGalleryDataManager.Instance.UpdateFavoriteState(response.WorksList[i].WorksId,
+                                response.WorksList[i].CollectOrNot, response.WorksList[i].BeCollectedCount);
+                            PoemGalleryDataManager.Instance.UpdateVoteiteState(response.WorksList[i].WorksId,
+                                response.WorksList[i].LikeOrNot, response.WorksList[i].BelikedCount);
                         }
                         }
                         else
                         else
                         {
                         {
@@ -86,13 +101,15 @@ namespace GFGGame
                             data.ThemeId = response.WorksList[i].ThemeId;
                             data.ThemeId = response.WorksList[i].ThemeId;
                             data.PictureTempUrl = response.WorksList[i].PictureTempUrl;
                             data.PictureTempUrl = response.WorksList[i].PictureTempUrl;
                             PoemGalleryDataManager.Instance.UpdateGalleryData(data);
                             PoemGalleryDataManager.Instance.UpdateGalleryData(data);
-
                         }
                         }
+
                         list.Add(data.WorkId);
                         list.Add(data.WorkId);
                     }
                     }
+
                     return true;
                     return true;
                 }
                 }
             }
             }
+
             return false;
             return false;
         }
         }
 
 
@@ -110,16 +127,19 @@ namespace GFGGame
                     list.Clear();
                     list.Clear();
                     for (int i = 0; i < response.RankList.Count; i++)
                     for (int i = 0; i < response.RankList.Count; i++)
                     {
                     {
-                        PoemGalleryData data = PoemGalleryDataManager.Instance.GetGalleryDataById(response.RankList[i].WorksId);
+                        PoemGalleryData data =
+                            PoemGalleryDataManager.Instance.GetGalleryDataById(response.RankList[i].WorksId);
                         if (data != null)
                         if (data != null)
                         {
                         {
-                            PoemGalleryDataManager.Instance.UpdateRoleInfo(response.RankList[i].WorksId, response.RankList[i].AuthorName, i + 1);
-                            PoemGalleryDataManager.Instance.UpdateFavoriteState(response.RankList[i].WorksId, response.RankList[i].CollectOrNot, response.RankList[i].BeCollectedCount);
-                            PoemGalleryDataManager.Instance.UpdateVoteiteState(response.RankList[i].WorksId, response.RankList[i].LikeOrNot, response.RankList[i].BelikedCount);
+                            PoemGalleryDataManager.Instance.UpdateRoleInfo(response.RankList[i].WorksId,
+                                response.RankList[i].AuthorName, i + 1);
+                            PoemGalleryDataManager.Instance.UpdateFavoriteState(response.RankList[i].WorksId,
+                                response.RankList[i].CollectOrNot, response.RankList[i].BeCollectedCount);
+                            PoemGalleryDataManager.Instance.UpdateVoteiteState(response.RankList[i].WorksId,
+                                response.RankList[i].LikeOrNot, response.RankList[i].BelikedCount);
                         }
                         }
                         else
                         else
                         {
                         {
-
                             data = new PoemGalleryData();
                             data = new PoemGalleryData();
                             data.WorkId = response.RankList[i].WorksId;
                             data.WorkId = response.RankList[i].WorksId;
                             data.Rank = i + 1;
                             data.Rank = i + 1;
@@ -135,23 +155,24 @@ namespace GFGGame
                             data.PictureTempUrl = response.RankList[i].PictureTempUrl;
                             data.PictureTempUrl = response.RankList[i].PictureTempUrl;
                             PoemGalleryDataManager.Instance.UpdateGalleryData(data);
                             PoemGalleryDataManager.Instance.UpdateGalleryData(data);
                         }
                         }
-                        list.Add(data.WorkId);
 
 
+                        list.Add(data.WorkId);
                     }
                     }
+
                     return true;
                     return true;
                 }
                 }
             }
             }
+
             return false;
             return false;
         }
         }
 
 
 
 
-
-
         //请求投稿画廊作品
         //请求投稿画廊作品
         public static async ETTask<object[]> ReqUpLoadGalleryWorks()
         public static async ETTask<object[]> ReqUpLoadGalleryWorks()
         {
         {
             S2C_RequestUpLoadGalleryWorks response = null;
             S2C_RequestUpLoadGalleryWorks response = null;
-            response = (S2C_RequestUpLoadGalleryWorks)await MessageHelper.SendToServer(new C2S_RequestUpLoadGalleryWorks());
+            response =
+                (S2C_RequestUpLoadGalleryWorks)await MessageHelper.SendToServer(new C2S_RequestUpLoadGalleryWorks());
             if (response != null)
             if (response != null)
             {
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 if (response.Error == ErrorCode.ERR_Success)
@@ -159,6 +180,7 @@ namespace GFGGame
                     return new object[] { response.TempPictureUrl, response.WorksId };
                     return new object[] { response.TempPictureUrl, response.WorksId };
                 }
                 }
             }
             }
+
             ViewManager.Hide<ModalStatusView>();
             ViewManager.Hide<ModalStatusView>();
             return null;
             return null;
         }
         }
@@ -167,7 +189,8 @@ namespace GFGGame
         public static async ETTask<bool> ReqNoticeGalleryWorksUploaded(long worksId, Texture2D tex)
         public static async ETTask<bool> ReqNoticeGalleryWorksUploaded(long worksId, Texture2D tex)
         {
         {
             S2C_NoticeGalleryWorksUploaded response = null;
             S2C_NoticeGalleryWorksUploaded response = null;
-            response = (S2C_NoticeGalleryWorksUploaded)await MessageHelper.SendToServer(new C2S_NoticeGalleryWorksUploaded() { WorksId = worksId });
+            response = (S2C_NoticeGalleryWorksUploaded)await MessageHelper.SendToServer(
+                new C2S_NoticeGalleryWorksUploaded() { WorksId = worksId });
             ViewManager.Hide<ModalStatusView>();
             ViewManager.Hide<ModalStatusView>();
             if (response != null)
             if (response != null)
             {
             {
@@ -197,7 +220,8 @@ namespace GFGGame
         public static async ETTask<bool> ReqDeleteMyWorks(long worksId)
         public static async ETTask<bool> ReqDeleteMyWorks(long worksId)
         {
         {
             S2C_DeleteMyWorks response = null;
             S2C_DeleteMyWorks response = null;
-            response = (S2C_DeleteMyWorks)await MessageHelper.SendToServer(new C2S_DeleteMyWorks() { WorksId = worksId });
+            response = (S2C_DeleteMyWorks)await MessageHelper.SendToServer(
+                new C2S_DeleteMyWorks() { WorksId = worksId });
             if (response != null)
             if (response != null)
             {
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 if (response.Error == ErrorCode.ERR_Success)
@@ -208,6 +232,7 @@ namespace GFGGame
                     return true;
                     return true;
                 }
                 }
             }
             }
+
             return false;
             return false;
         }
         }
 
 
@@ -215,15 +240,18 @@ namespace GFGGame
         public static async ETTask<bool> ReqCollecteGalleryWorks(long worksId)
         public static async ETTask<bool> ReqCollecteGalleryWorks(long worksId)
         {
         {
             S2C_CollecteGalleryWorks response = null;
             S2C_CollecteGalleryWorks response = null;
-            response = (S2C_CollecteGalleryWorks)await MessageHelper.SendToServer(new C2S_CollecteGalleryWorks() { WorksId = worksId });
+            response = (S2C_CollecteGalleryWorks)await MessageHelper.SendToServer(new C2S_CollecteGalleryWorks()
+                { WorksId = worksId });
             if (response != null)
             if (response != null)
             {
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 if (response.Error == ErrorCode.ERR_Success)
                 {
                 {
-                    PoemGalleryDataManager.Instance.UpdateFavoriteState(response.WorksId, true, response.BeCollectedCount);
+                    PoemGalleryDataManager.Instance.UpdateFavoriteState(response.WorksId, true,
+                        response.BeCollectedCount);
                     return true;
                     return true;
                 }
                 }
             }
             }
+
             return false;
             return false;
         }
         }
 
 
@@ -231,15 +259,18 @@ namespace GFGGame
         public static async ETTask<bool> ReqCancelCollecteGalleryWorks(long worksId)
         public static async ETTask<bool> ReqCancelCollecteGalleryWorks(long worksId)
         {
         {
             S2C_CancelCollecteGalleryWorks response = null;
             S2C_CancelCollecteGalleryWorks response = null;
-            response = (S2C_CancelCollecteGalleryWorks)await MessageHelper.SendToServer(new C2S_CancelCollecteGalleryWorks() { WorksId = worksId });
+            response = (S2C_CancelCollecteGalleryWorks)await MessageHelper.SendToServer(
+                new C2S_CancelCollecteGalleryWorks() { WorksId = worksId });
             if (response != null)
             if (response != null)
             {
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 if (response.Error == ErrorCode.ERR_Success)
                 {
                 {
-                    PoemGalleryDataManager.Instance.UpdateFavoriteState(response.WorksId, false, response.BeCollectedCount);
+                    PoemGalleryDataManager.Instance.UpdateFavoriteState(response.WorksId, false,
+                        response.BeCollectedCount);
                     return true;
                     return true;
                 }
                 }
             }
             }
+
             return false;
             return false;
         }
         }
 
 
@@ -247,7 +278,8 @@ namespace GFGGame
         public static async ETTask<bool> ReqVoteGalleryWorks(long worksId)
         public static async ETTask<bool> ReqVoteGalleryWorks(long worksId)
         {
         {
             S2C_LikeGalleryWorks response = null;
             S2C_LikeGalleryWorks response = null;
-            response = (S2C_LikeGalleryWorks)await MessageHelper.SendToServer(new C2S_LikeGalleryWorks() { WorksId = worksId });
+            response = (S2C_LikeGalleryWorks)await MessageHelper.SendToServer(new C2S_LikeGalleryWorks()
+                { WorksId = worksId });
             if (response != null)
             if (response != null)
             {
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 if (response.Error == ErrorCode.ERR_Success)
@@ -257,6 +289,7 @@ namespace GFGGame
                     return true;
                     return true;
                 }
                 }
             }
             }
+
             return false;
             return false;
         }
         }
 
 
@@ -274,8 +307,8 @@ namespace GFGGame
                     return true;
                     return true;
                 }
                 }
             }
             }
+
             return false;
             return false;
         }
         }
     }
     }
-}
-
+}

+ 1 - 1
GameClient/Assets/Game/HotUpdate/UGUI/UGUIManager.cs

@@ -97,7 +97,7 @@ namespace GFGGame
                 //初始化游戏配置
                 //初始化游戏配置
                 GameConfig.InitData(data);
                 GameConfig.InitData(data);
                 Debug.Log($"初始化游戏配置");
                 Debug.Log($"初始化游戏配置");
-                
+
                 LauncherView.Instance.Close();
                 LauncherView.Instance.Close();
                 QDJHGameManagerInit.Instance.InitSDK();
                 QDJHGameManagerInit.Instance.InitSDK();
                 QDJGameManager.Instance.Init();
                 QDJGameManager.Instance.Init();

+ 26 - 42
GameClient/Assets/Game/HotUpdate/Views/CommonGame/RewardView.cs

@@ -14,13 +14,9 @@ namespace GFGGame
         private List<ItemData> _listItemDatas;
         private List<ItemData> _listItemDatas;
 
 
         private Action onSuccess = null;
         private Action onSuccess = null;
-
-        private List<EffectUI> _effects = new List<EffectUI>();
-
+        
         private const int maxHeight = 1030;
         private const int maxHeight = 1030;
-
-        private EffectUI _effectUI1;
-        private EffectUI _effectUI2;
+        
         private int counTime = 0;  //定时器计数
         private int counTime = 0;  //定时器计数
 
 
         public override void Dispose()
         public override void Dispose()
@@ -92,47 +88,35 @@ namespace GFGGame
         private void OnTimerUpdate(object param)
         private void OnTimerUpdate(object param)
         {
         {
             counTime += 1;
             counTime += 1;
-            if (counTime == 1)
-            {
-                _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_holderTitle, "ui_hd", "GXHD_Text");
-                _effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_holderBgCom, "ui_hd", "TC_Quad_ALL");
-            }
-            else if (counTime == 2)
-            {
-                _ui.m_comList.m_listReward.numItems = _listItemDatas.Count;
+            _ui.m_downTipsText.visible = true;
+            _ui.m_comList.m_listReward.numItems = _listItemDatas.Count;
 
 
-                _ui.m_comList.m_listReward.ResizeToFit();
-                if (_ui.m_comList.m_listReward.height > maxHeight)
-                {
-                    _ui.m_comList.m_listReward.height = maxHeight;
-                }
-            }
-            else if (counTime == 3)
+            _ui.m_comList.m_listReward.ResizeToFit();
+            if (_ui.m_comList.m_listReward.height > maxHeight)
             {
             {
-                _ui.m_downTipsText.visible = true;
-                Timers.inst.Remove(OnTimerUpdate);
+                _ui.m_comList.m_listReward.height = maxHeight;
             }
             }
         }
         }
 
 
         protected override void OnHide()
         protected override void OnHide()
         {
         {
-            EffectUIPool.Recycle(_effectUI1);
-            _effectUI1 = null;
-            EffectUIPool.Recycle(_effectUI2);
-            _effectUI2 = null;
+            // EffectUIPool.Recycle(_effectUI1);
+            // _effectUI1 = null;
+            // EffectUIPool.Recycle(_effectUI2);
+            // _effectUI2 = null;
             
             
             Timers.inst.Remove(OnTimerUpdate);
             Timers.inst.Remove(OnTimerUpdate);
             Timers.inst.Remove(OnTimerClick);
             Timers.inst.Remove(OnTimerClick);
             _ui.m_mask.touchable = true;
             _ui.m_mask.touchable = true;
-            for (int i = 0; i < _effects.Count; i++)
-            {
-                if (_effects[i] != null)
-                {
-                    EffectUIPool.Recycle(_effects[i]);
-                    _effects[i] = null;
-                }
-            }
-            _effects.Clear();
+            // for (int i = 0; i < _effects.Count; i++)
+            // {
+            //     if (_effects[i] != null)
+            //     {
+            //         EffectUIPool.Recycle(_effects[i]);
+            //         _effects[i] = null;
+            //     }
+            // }
+            // _effects.Clear();
 
 
             if (onSuccess != null)
             if (onSuccess != null)
             {
             {
@@ -193,12 +177,12 @@ namespace GFGGame
 
 
             item.m_imgOnceBonus.visible = _listItemDatas[index].isOnceBonus;
             item.m_imgOnceBonus.visible = _listItemDatas[index].isOnceBonus;
             //特效("ui_ck", "ui_ck_zl");
             //特效("ui_ck", "ui_ck_zl");
-            int childIndex = _ui.m_comList.m_listReward.ItemIndexToChildIndex(index);
-            if (_effects.Count <= childIndex)
-            {
-                EffectUI _effectUI = EffectUIPool.CreateEffectUI(item.m_holderReware, "ui_hd", "GXHD_WuPin",120);
-                _effects.Add(_effectUI);
-            }
+            //int childIndex = _ui.m_comList.m_listReward.ItemIndexToChildIndex(index);
+            // if (_effects.Count <= childIndex)
+            // {
+            //     EffectUI _effectUI = EffectUIPool.CreateEffectUI(item.m_holderReware, "ui_hd", "GXHD_WuPin",120);
+            //     _effects.Add(_effectUI);
+            // }
 
 
             if (item.target.data == null)
             if (item.target.data == null)
             {
             {

+ 590 - 395
GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxBonusShowView.cs

@@ -5,6 +5,7 @@ using System.Collections;
 using cfg.GfgCfg;
 using cfg.GfgCfg;
 using ET;
 using ET;
 using System;
 using System;
+using UnityEngine;
 
 
 namespace GFGGame
 namespace GFGGame
 {
 {
@@ -40,114 +41,156 @@ namespace GFGGame
 
 
         public override void Dispose()
         public override void Dispose()
         {
         {
-            EffectUIPool.Recycle(_effectUI1);
-            _effectUI1 = null;
-            EffectUIPool.Recycle(_effectUI2);
-            _effectUI2 = null;
-            EffectUIPool.Recycle(_effectUI3);
-            _effectUI3 = null;
+            try
+            {
+                EffectUIPool.Recycle(_effectUI1);
+                _effectUI1 = null;
+                EffectUIPool.Recycle(_effectUI2);
+                _effectUI2 = null;
+                EffectUIPool.Recycle(_effectUI3);
+                _effectUI3 = null;
 
 
-            ClearAllEffects();
+                ClearAllEffects();
 
 
-            if (_ui != null)
+                if (_ui != null)
+                {
+                    _ui.Dispose();
+                    _ui = null;
+                }
+
+                base.Dispose();
+            }
+            catch (Exception e)
             {
             {
-                _ui.Dispose();
-                _ui = null;
+                Debug.LogError(e);
             }
             }
-
-            base.Dispose();
         }
         }
 
 
         private void ClearAllEffects()
         private void ClearAllEffects()
         {
         {
-            for (int key = 0; key < _effListTen.Count; key++)
+            try
             {
             {
-                if (_effListTen.ContainsKey(key))
+                for (int key = 0; key < _effListTen.Count; key++)
                 {
                 {
-                    for (int key1 = 0; key1 < _effListTen[key].Count; key1++)
+                    if (_effListTen.ContainsKey(key))
                     {
                     {
-                        if (_effListTen[key].ContainsKey(key1))
+                        for (int key1 = 0; key1 < _effListTen[key].Count; key1++)
                         {
                         {
-                            EffectUIPool.Recycle(_effListTen[key][key1]);
-                            _effListTen[key][key1] = null;
+                            if (_effListTen[key].ContainsKey(key1))
+                            {
+                                EffectUIPool.Recycle(_effListTen[key][key1]);
+                                _effListTen[key][key1] = null;
+                            }
                         }
                         }
                     }
                     }
                 }
                 }
-            }
 
 
-            _effListTen.Clear();
+                _effListTen.Clear();
 
 
-            for (int key = 0; key < _effList.Count; key++)
-            {
-                if (_effList.ContainsKey(key))
+                for (int key = 0; key < _effList.Count; key++)
                 {
                 {
-                    EffectUIPool.Recycle(_effList[key]);
-                    _effList[key] = null;
+                    if (_effList.ContainsKey(key))
+                    {
+                        EffectUIPool.Recycle(_effList[key]);
+                        _effList[key] = null;
+                    }
                 }
                 }
-            }
 
 
-            _effList.Clear();
+                _effList.Clear();
 
 
-            foreach (var v in _effectUIDic)
+                foreach (var v in _effectUIDic)
+                {
+                    EffectUIPool.Recycle(v.Value);
+                }
+
+                _effectUIDic.Clear();
+            }
+            catch (Exception e)
             {
             {
-                EffectUIPool.Recycle(v.Value);
+                Debug.LogError(e);
             }
             }
-
-            _effectUIDic.Clear();
         }
         }
 
 
         protected override void OnInit()
         protected override void OnInit()
         {
         {
-            base.OnInit();
-            packageName = UI_LuckBoxBonusShowUI.PACKAGE_NAME;
-            _ui = UI_LuckBoxBonusShowUI.Create();
-            this.viewCom = _ui.target;
-            isfullScreen = true;
-
-            _ui.m_loaBg.onClick.Add(OnClickLoaBg);
-            _ui.m_BtnPass.onClick.Add(OnClickBtnPass);
+            try
+            {
+                base.OnInit();
+                packageName = UI_LuckBoxBonusShowUI.PACKAGE_NAME;
+                _ui = UI_LuckBoxBonusShowUI.Create();
+                this.viewCom = _ui.target;
+                isfullScreen = true;
+
+                _ui.m_loaBg.onClick.Add(OnClickLoaBg);
+                _ui.m_BtnPass.onClick.Add(OnClickBtnPass);
+            }
+            catch (Exception e)
+            {
+                Debug.LogError(e);
+            }
         }
         }
 
 
         protected override void AddEventListener()
         protected override void AddEventListener()
         {
         {
-            base.AddEventListener();
-            EventAgent.AddEventListener(ConstMessage.LUCKY_BOX_REWARD_SHOW, ReferNextShow);
-            EventAgent.AddEventListener(ConstMessage.LUCKY_BOX_ANIMATION_WAIT, SetAnimationWait);
-            EventAgent.AddEventListener(ConstMessage.LUCKY_BOX_SHOW_VIEW_CLOSE, OthershowViewClose);
+            try
+            {
+                base.AddEventListener();
+                EventAgent.AddEventListener(ConstMessage.LUCKY_BOX_REWARD_SHOW, ReferNextShow);
+                EventAgent.AddEventListener(ConstMessage.LUCKY_BOX_ANIMATION_WAIT, SetAnimationWait);
+                EventAgent.AddEventListener(ConstMessage.LUCKY_BOX_SHOW_VIEW_CLOSE, OthershowViewClose);
+            }
+            catch (Exception e)
+            {
+                Debug.LogError(e);
+            }
         }
         }
 
 
         protected override void RemoveEventListener()
         protected override void RemoveEventListener()
         {
         {
-            base.RemoveEventListener();
-            EventAgent.RemoveEventListener(ConstMessage.LUCKY_BOX_REWARD_SHOW, ReferNextShow);
-            EventAgent.RemoveEventListener(ConstMessage.LUCKY_BOX_ANIMATION_WAIT, SetAnimationWait);
-            EventAgent.RemoveEventListener(ConstMessage.LUCKY_BOX_SHOW_VIEW_CLOSE, OthershowViewClose);
+            try
+            {
+                base.RemoveEventListener();
+                EventAgent.RemoveEventListener(ConstMessage.LUCKY_BOX_REWARD_SHOW, ReferNextShow);
+                EventAgent.RemoveEventListener(ConstMessage.LUCKY_BOX_ANIMATION_WAIT, SetAnimationWait);
+                EventAgent.RemoveEventListener(ConstMessage.LUCKY_BOX_SHOW_VIEW_CLOSE, OthershowViewClose);
+            }
+            catch (Exception e)
+            {
+                Debug.LogError(e);
+            }
         }
         }
 
 
         protected override void OnShown()
         protected override void OnShown()
         {
         {
-            base.OnShown();
-
-            _allEffectsLoaded = false;
-            _touchLoaBg = false;
-            _rewardList.Clear();
-            _rewardList.AddRange(this.viewData as List<ItemData>);
-            _itemIdList.Clear();
-            _itemObjList.Clear();
-            _recordOpenIndex.Clear();
-            _recordTurnIndex.Clear();
-            _itemHasNew.Clear();
-            _ui.m_BtnPass.visible = false;
-            _ui.m_touchFlipOpen.touchable = false;
-
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zx_bg");
-
-            // 异步加载所有特效
-            Timers.inst.StartCoroutine(LoadAllEffects(() =>
-            {
-                _allEffectsLoaded = true;
-                SetupViewAfterEffectsLoaded();
-            }));
+            try
+            {
+                base.OnShown();
+
+                _allEffectsLoaded = false;
+                _touchLoaBg = false;
+                _rewardList.Clear();
+                _rewardList.AddRange(this.viewData as List<ItemData>);
+                _itemIdList.Clear();
+                _itemObjList.Clear();
+                _recordOpenIndex.Clear();
+                _recordTurnIndex.Clear();
+                _itemHasNew.Clear();
+                _ui.m_BtnPass.visible = false;
+                _ui.m_touchFlipOpen.touchable = false;
+
+                _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zx_bg");
+
+                // 异步加载所有特效
+                Timers.inst.StartCoroutine(LoadAllEffects(() =>
+                {
+                    _allEffectsLoaded = true;
+                    SetupViewAfterEffectsLoaded();
+                }));
+            }
+            catch (Exception e)
+            {
+                Debug.LogError(e);
+            }
         }
         }
 
 
         private IEnumerator LoadAllEffects(Action onComplete)
         private IEnumerator LoadAllEffects(Action onComplete)
@@ -169,493 +212,645 @@ namespace GFGGame
 
 
         private void SetupViewAfterEffectsLoaded()
         private void SetupViewAfterEffectsLoaded()
         {
         {
-            if (!_allEffectsLoaded) return;
-
-            if (_rewardList.Count == 1)
+            try
             {
             {
-                _ui.m_c1.selectedIndex = 0;
-                UpdateItem(_ui.m_itemOne.target, 0, 1);
-            }
-            else
-            {
-                _ui.m_c1.selectedIndex = 1;
+                if (!_allEffectsLoaded) return;
+
+                if (_rewardList.Count == 1)
+                {
+                    _ui.m_c1.selectedIndex = 0;
+                    UpdateItem(_ui.m_itemOne.target, 0, 1);
+                }
+                else
+                {
+                    _ui.m_c1.selectedIndex = 1;
+                    for (int i = 0; i < _rewardList.Count; i++)
+                    {
+                        UpdateItem(_ui.target.GetChild("item" + i).asCom, i, 10);
+                    }
+                }
+
+                // 修改,因为加了抽奖动画,在进入后就直接筛选掉所有不是新的
                 for (int i = 0; i < _rewardList.Count; i++)
                 for (int i = 0; i < _rewardList.Count; i++)
                 {
                 {
-                    UpdateItem(_ui.target.GetChild("item" + i).asCom, i, 10);
+                    UI_LuckyBoxBonusShowItem item = UI_LuckyBoxBonusShowItem.Proxy(_itemObjList[i]);
+                    if (!item.m_comIcon.m_imgNew.visible)
+                    {
+                        _recordTurnIndex.Add(i);
+                        _recordOpenIndex.Add(i);
+                    }
+
+                    UI_LuckyBoxBonusShowItem.ProxyEnd();
                 }
                 }
-            }
 
 
-            // 修改,因为加了抽奖动画,在进入后就直接筛选掉所有不是新的
-            for (int i = 0; i < _rewardList.Count; i++)
-            {
-                UI_LuckyBoxBonusShowItem item = UI_LuckyBoxBonusShowItem.Proxy(_itemObjList[i]);
-                if (!item.m_comIcon.m_imgNew.visible)
+                if (GetSuitItemController.isAuto)
                 {
                 {
-                    _recordTurnIndex.Add(i);
-                    _recordOpenIndex.Add(i);
+                    OnClickBtnPass();
                 }
                 }
 
 
-                UI_LuckyBoxBonusShowItem.ProxyEnd();
+                Timers.inst.Add(0.5f, 1, UpDataTimeTouchLoaBg);
             }
             }
-
-            if (GetSuitItemController.isAuto)
+            catch (Exception e)
             {
             {
-                OnClickBtnPass();
+                Debug.LogError(e);
             }
             }
-
-            Timers.inst.Add(0.5f, 1, UpDataTimeTouchLoaBg);
         }
         }
 
 
         protected override void OnHide()
         protected override void OnHide()
         {
         {
-            _rewardList.Clear();
-            base.OnHide();
+            try
+            {
+                _rewardList.Clear();
+                base.OnHide();
 
 
-            Timers.inst.Remove(UpDataTime);
-            Timers.inst.Remove(UpClickDataTime);
-            Timers.inst.Remove(touchFlipOpen);
-            Timers.inst.Remove(UpDataTimeTouchLoaBg);
+                Timers.inst.Remove(UpDataTime);
+                Timers.inst.Remove(UpClickDataTime);
+                Timers.inst.Remove(touchFlipOpen);
+                Timers.inst.Remove(UpDataTimeTouchLoaBg);
 
 
-            GetSuitItemController.isAuto = false;
-            _touchLoaBg = true;
+                GetSuitItemController.isAuto = false;
+                _touchLoaBg = true;
 
 
-            EventAgent.DispatchEvent(ConstMessage.LUCKY_BOX_BONUS_VIEW_CLOSE);
+                EventAgent.DispatchEvent(ConstMessage.LUCKY_BOX_BONUS_VIEW_CLOSE);
+            }
+            catch (Exception e)
+            {
+                Debug.LogError(e);
+            }
         }
         }
 
 
         private void UpdateItem(GComponent com, int index, int countType)
         private void UpdateItem(GComponent com, int index, int countType)
         {
         {
-            if (!_allEffectsLoaded) return;
+            try
+            {
+                if (!_allEffectsLoaded) return;
 
 
-            UI_LuckyBoxBonusShowItem item = UI_LuckyBoxBonusShowItem.Proxy(com);
-            ItemData itemData = _rewardList[index];
-            ItemCfg itemCfg = CommonDataManager.Tables.TblItemCfg.GetOrDefault(itemData.id);
-            item.m_comIcon.m_c1.selectedIndex = itemCfg.Rarity;
-            item.m_comIcon.m_txtName.text = itemCfg.Name;
-            item.m_comIcon.m_icon.url = ResPathUtil.GetIconPath(itemCfg);
-            item.m_comIcon.m_FlipOpenType.selectedIndex = 0;
-            item.m_comIcon.m_t1.Play();
+                UI_LuckyBoxBonusShowItem item = UI_LuckyBoxBonusShowItem.Proxy(com);
+                ItemData itemData = _rewardList[index];
+                ItemCfg itemCfg = CommonDataManager.Tables.TblItemCfg.GetOrDefault(itemData.id);
+                item.m_comIcon.m_c1.selectedIndex = itemCfg.Rarity;
+                item.m_comIcon.m_txtName.text = itemCfg.Name;
+                item.m_comIcon.m_icon.url = ResPathUtil.GetIconPath(itemCfg);
+                item.m_comIcon.m_FlipOpenType.selectedIndex = 0;
+                item.m_comIcon.m_t1.Play();
 
 
-            // 圆盘出现时等待玩家点击的特效
-            switch (itemCfg.Rarity)
-            {
-                case 3:
-                    _effectUIDic.Add("CK_Loop_Wait_Chen" + index,
-                        EffectUIPool.CreateEffectUI(item.m_waitClick_eff, "ui_LuckyBox", "CK_Loop_Wait_Chen"));
-                    break;
-                case 4:
-                    _effectUIDic.Add("CK_Loop_Wait_GS" + index,
-                        EffectUIPool.CreateEffectUI(item.m_waitClick_eff, "ui_LuckyBox", "CK_Loop_Wait_GS"));
-                    break;
-                case 5:
-                    _effectUIDic.Add("CK_Loop_Wait_Jin" + index,
-                        EffectUIPool.CreateEffectUI(item.m_waitClick_eff, "ui_LuckyBox", "CK_Loop_Wait_Jin"));
-                    break;
-            }
+                // 圆盘出现时等待玩家点击的特效
+                switch (itemCfg.Rarity)
+                {
+                    case 3:
+                        if (!_effectUIDic.ContainsKey("CK_Loop_Wait_Chen" + index))
+                        {
+                            _effectUIDic.Add("CK_Loop_Wait_Chen" + index,
+                                EffectUIPool.CreateEffectUI(item.m_waitClick_eff, "ui_LuckyBox", "CK_Loop_Wait_Chen"));
+                        }
 
 
-            int count = 0;
-            bool isFirst = false;
-            for (int i = 0; i < _rewardList.Count; i++)
-            {
-                if (_rewardList[i].id == itemData.id) count++;
-                if (count == 1 && i == index) isFirst = true;
-            }
+                        break;
+                    case 4:
+                        if (!_effectUIDic.ContainsKey("CK_Loop_Wait_GS" + index))
+                        {
+                            _effectUIDic.Add("CK_Loop_Wait_GS" + index,
+                                EffectUIPool.CreateEffectUI(item.m_waitClick_eff, "ui_LuckyBox", "CK_Loop_Wait_GS"));
+                        }
 
 
-            item.m_comIcon.m_imgNew.visible = count == ItemDataManager.GetItemNum(itemData.id) && isFirst;
-            if (_itemHasNew.ContainsKey(index))
-                _itemHasNew[index] = item.m_comIcon.m_imgNew.visible;
-            else
-                _itemHasNew.Add(index, item.m_comIcon.m_imgNew.visible);
+                        break;
+                    case 5:
+                        if (!_effectUIDic.ContainsKey("CK_Loop_Wait_Jin" + index))
+                        {
+                            _effectUIDic.Add("CK_Loop_Wait_Jin" + index,
+                                EffectUIPool.CreateEffectUI(item.m_waitClick_eff, "ui_LuckyBox", "CK_Loop_Wait_Jin"));
+                        }
 
 
-            item.m_t0.Play();
-            if (item.target.data == null)
-            {
-                item.target.onClick.Add(ShowItemTips);
-            }
+                        break;
+                }
+
+                int count = 0;
+                bool isFirst = false;
+                for (int i = 0; i < _rewardList.Count; i++)
+                {
+                    if (_rewardList[i].id == itemData.id) count++;
+                    if (count == 1 && i == index) isFirst = true;
+                }
+
+                item.m_comIcon.m_imgNew.visible = count == ItemDataManager.GetItemNum(itemData.id) && isFirst;
+                if (_itemHasNew.ContainsKey(index))
+                    _itemHasNew[index] = item.m_comIcon.m_imgNew.visible;
+                else
+                    _itemHasNew.Add(index, item.m_comIcon.m_imgNew.visible);
+
+                item.m_t0.Play();
+                if (item.target.data == null)
+                {
+                    item.target.onClick.Add(ShowItemTips);
+                }
 
 
-            item.target.data = index;
+                item.target.data = index;
 
 
-            _itemIdList.Add(index, itemCfg.Id);
-            _itemObjList.Add(index, com);
+                _itemIdList.Add(index, itemCfg.Id);
+                _itemObjList.Add(index, com);
 
 
-            UI_LuckyBoxBonusShowItem.ProxyEnd();
+                UI_LuckyBoxBonusShowItem.ProxyEnd();
+            }
+            catch (Exception e)
+            {
+                Debug.LogError(e);
+            }
         }
         }
 
 
         private void ShowItemTips(EventContext context)
         private void ShowItemTips(EventContext context)
         {
         {
-            if (!_allEffectsLoaded || !_touchLoaBg) return;
+            try
+            {
+                if (!_allEffectsLoaded || !_touchLoaBg) return;
 
 
-            _touchLoaBg = false;
-            Timers.inst.Add(0.5f, 1, UpDataTimeTouchLoaBg);
+                _touchLoaBg = false;
+                Timers.inst.Add(0.5f, 1, UpDataTimeTouchLoaBg);
 
 
-            GObject obj = context.sender as GObject;
-            int index = (int)obj.data;
-            _chooseIndex = index;
-            GoodsItemTipsController.ShowItemTips(_itemIdList[index]);
+                GObject obj = context.sender as GObject;
+                int index = (int)obj.data;
+                _chooseIndex = index;
+                GoodsItemTipsController.ShowItemTips(_itemIdList[index]);
+            }
+            catch (Exception e)
+            {
+                Debug.LogError(e);
+            }
         }
         }
 
 
         private void HandClickItem(int index)
         private void HandClickItem(int index)
         {
         {
-            if (!_allEffectsLoaded) return;
+            try
+            {
+                if (!_allEffectsLoaded) return;
 
 
-            _ui.m_touchFlipOpen.touchable = true;
-            _handClick = true;
-            ClickItem(index);
-            //翻牌动画
-            Timers.inst.Add(1f, 1, UpClickDataTime, index);
+                _ui.m_touchFlipOpen.touchable = true;
+                _handClick = true;
+                ClickItem(index);
+                //翻牌动画
+                Timers.inst.Add(1f, 1, UpClickDataTime, index);
+            }
+            catch (Exception e)
+            {
+                Debug.LogError(e);
+            }
         }
         }
 
 
         private void UpClickDataTime(object param = null)
         private void UpClickDataTime(object param = null)
         {
         {
-            if (!_allEffectsLoaded) return;
+            try
+            {
+                if (!_allEffectsLoaded) return;
 
 
-            int index = (int)param;
-            Timers.inst.Remove(UpClickDataTime);
-            if (_recordTurnIndex.Contains(index) && _recordOpenIndex.Contains(index))
+                int index = (int)param;
+                Timers.inst.Remove(UpClickDataTime);
+                if (_recordTurnIndex.Contains(index) && _recordOpenIndex.Contains(index))
+                {
+                    HideOtherShowWindow();
+                    _ui.m_touchFlipOpen.touchable = false;
+                }
+                else
+                    ClickItem(index);
+            }
+            catch (Exception e)
             {
             {
-                HideOtherShowWindow();
-                _ui.m_touchFlipOpen.touchable = false;
+                Debug.LogError(e);
             }
             }
-            else
-                ClickItem(index);
         }
         }
 
 
         void ClickItem(int index)
         void ClickItem(int index)
         {
         {
-            if (!_allEffectsLoaded) return;
+            try
+            {
+                if (!_allEffectsLoaded) return;
 
 
-            if (_recordOpenIndex.Count >= _rewardList.Count)
-                _ui.m_BtnPass.visible = false;
+                if (_recordOpenIndex.Count >= _rewardList.Count)
+                    _ui.m_BtnPass.visible = false;
 
 
-            if (!_recordOpenIndex.Contains(index))
-            {
-                TurnItem(index);
+                if (!_recordOpenIndex.Contains(index))
+                {
+                    TurnItem(index);
+                }
+                else
+                {
+                    if (!_recordTurnIndex.Contains(index))
+                        ShowTurnItem(index);
+                    else
+                        GoodsItemTipsController.ShowItemTips(_itemIdList[index]);
+                }
             }
             }
-            else
+            catch (Exception e)
             {
             {
-                if (!_recordTurnIndex.Contains(index))
-                    ShowTurnItem(index);
-                else
-                    GoodsItemTipsController.ShowItemTips(_itemIdList[index]);
+                Debug.LogError(e);
             }
             }
         }
         }
 
 
         private void UpDataTimeTouchLoaBg(object param = null)
         private void UpDataTimeTouchLoaBg(object param = null)
         {
         {
-            _touchLoaBg = true;
+            try
+            {
+                _touchLoaBg = true;
+            }
+            catch (Exception e)
+            {
+                Debug.LogError(e);
+            }
         }
         }
 
 
         private void OnClickLoaBg(EventContext context)
         private void OnClickLoaBg(EventContext context)
         {
         {
-            if (!_allEffectsLoaded || !_touchLoaBg) return;
+            try
+            {
+                if (!_allEffectsLoaded || !_touchLoaBg) return;
 
 
-            _touchLoaBg = false;
-            Timers.inst.Add(0.5f, 1, UpDataTimeTouchLoaBg);
+                _touchLoaBg = false;
+                Timers.inst.Add(0.5f, 1, UpDataTimeTouchLoaBg);
 
 
-            if (_recordOpenIndex.Count >= _rewardList.Count)
-            {
-                _chooseIndex = -1;
-                this.Hide();
-            }
-            else
-            {
-                for (int index = 0; index < _rewardList.Count; index++)
+                if (_recordOpenIndex.Count >= _rewardList.Count)
                 {
                 {
-                    if (!_recordOpenIndex.Contains(index))
+                    _chooseIndex = -1;
+                    this.Hide();
+                }
+                else
+                {
+                    for (int index = 0; index < _rewardList.Count; index++)
                     {
                     {
-                        _chooseIndex = index;
-                        HandClickItem(index);
-                        break;
+                        if (!_recordOpenIndex.Contains(index))
+                        {
+                            _chooseIndex = index;
+                            HandClickItem(index);
+                            break;
+                        }
                     }
                     }
                 }
                 }
             }
             }
+            catch (Exception e)
+            {
+                Debug.LogError(e);
+            }
         }
         }
 
 
         private void OnClickBtnPass()
         private void OnClickBtnPass()
         {
         {
-            if (!_allEffectsLoaded) return;
-
-            for (int index = 0; index < _rewardList.Count; index++)
+            try
             {
             {
-                if (!_recordOpenIndex.Contains(index))
+                if (!_allEffectsLoaded) return;
+
+                for (int index = 0; index < _rewardList.Count; index++)
                 {
                 {
-                    int count = 0;
-                    bool isFirst = false;
-                    for (int i = 0; i < _rewardList.Count; i++)
+                    if (!_recordOpenIndex.Contains(index))
                     {
                     {
-                        if (_rewardList[i].id == _rewardList[index].id) count++;
-                        if (count == 1 && i == index) isFirst = true;
-                    }
+                        int count = 0;
+                        bool isFirst = false;
+                        for (int i = 0; i < _rewardList.Count; i++)
+                        {
+                            if (_rewardList[i].id == _rewardList[index].id) count++;
+                            if (count == 1 && i == index) isFirst = true;
+                        }
 
 
-                    bool open = count == ItemDataManager.GetItemNum(_rewardList[index].id) && isFirst;
+                        bool open = count == ItemDataManager.GetItemNum(_rewardList[index].id) && isFirst;
 
 
-                    if (!open)
-                    {
-                        _chooseIndex = -1;
-                        ClickItem(index);
+                        if (!open)
+                        {
+                            _chooseIndex = -1;
+                            ClickItem(index);
+                        }
                     }
                     }
                 }
                 }
-            }
 
 
-            ClickPass();
+                ClickPass();
+            }
+            catch (Exception e)
+            {
+                Debug.LogError(e);
+            }
         }
         }
 
 
         private void ClickPass()
         private void ClickPass()
         {
         {
-            if (!_allEffectsLoaded) return;
+            try
+            {
+                if (!_allEffectsLoaded) return;
 
 
-            GetSuitItemController.isAuto = true;
-            _ui.m_touchFlipOpen.touchable = true;
-            _ui.m_BtnPass.visible = false;
+                GetSuitItemController.isAuto = true;
+                _ui.m_touchFlipOpen.touchable = true;
+                _ui.m_BtnPass.visible = false;
 
 
-            for (int i = 0; i < _rewardList.Count; i++)
+                for (int i = 0; i < _rewardList.Count; i++)
+                {
+                    TurnItem(i);
+                }
+
+                //展示获得物品
+                Timers.inst.Add(LuckyBoxDataManager.ANIMATION_TIME, 0, UpDataTime);
+            }
+            catch (Exception e)
             {
             {
-                TurnItem(i);
+                Debug.LogError(e);
             }
             }
-
-            //展示获得物品
-            Timers.inst.Add(LuckyBoxDataManager.ANIMATION_TIME, 0, UpDataTime);
         }
         }
 
 
         private void UpDataTime(object param = null)
         private void UpDataTime(object param = null)
         {
         {
-            if (!_allEffectsLoaded) return;
-
-            _ui.m_touchFlipOpen.touchable = true;
-            if (_recordTurnIndex.Count >= _rewardList.Count)
+            try
             {
             {
-                Timers.inst.Remove(UpDataTime);
-                HideOtherShowWindow();
-                _ui.m_touchFlipOpen.touchable = false;
-                GetSuitItemController.isAuto = false;
-            }
+                if (!_allEffectsLoaded) return;
 
 
-            for (int i = 0; i < _rewardList.Count; i++)
-            {
-                if (!_recordTurnIndex.Contains(i))
+                _ui.m_touchFlipOpen.touchable = true;
+                if (_recordTurnIndex.Count >= _rewardList.Count)
                 {
                 {
-                    ShowTurnItem(i);
-                    break;
+                    Timers.inst.Remove(UpDataTime);
+                    HideOtherShowWindow();
+                    _ui.m_touchFlipOpen.touchable = false;
+                    GetSuitItemController.isAuto = false;
                 }
                 }
+
+                for (int i = 0; i < _rewardList.Count; i++)
+                {
+                    if (!_recordTurnIndex.Contains(i))
+                    {
+                        ShowTurnItem(i);
+                        break;
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                Debug.LogError(e);
             }
             }
         }
         }
 
 
         private void ShowTurnItem(int index)
         private void ShowTurnItem(int index)
         {
         {
-            if (!_allEffectsLoaded || !_AnimationWait) return;
-
-            UI_LuckyBoxBonusShowItem item = UI_LuckyBoxBonusShowItem.Proxy(_itemObjList[index]);
-            if (!item.m_comIcon.m_imgNew.visible)
+            try
             {
             {
-                _recordTurnIndex.Add(index);
-                _ui.m_touchFlipOpen.touchable = false;
-                UI_LuckyBoxBonusShowItem.ProxyEnd();
-                return;
-            }
+                if (!_allEffectsLoaded || !_AnimationWait) return;
 
 
-            _countShow += 1;
-            //判断是否有套装需要展示
-            int suitId = SuitCfgArray.Instance.GetSuitIdOfItem(_itemIdList[index]);
-            ItemCfg itemCfg = CommonDataManager.Tables.TblItemCfg.GetOrDefault(_itemIdList[index]);
-
-            if (suitId > 0 && itemCfg.ItemType != ConstItemType.CARD)
-            {
-                if (_countShow == 1)
+                UI_LuckyBoxBonusShowItem item = UI_LuckyBoxBonusShowItem.Proxy(_itemObjList[index]);
+                if (!item.m_comIcon.m_imgNew.visible)
                 {
                 {
-                    ViewManager.Hide<SuitItemView>();
-                    ViewManager.Hide<LuckyBoxNewCardView>();
-                    ViewManager.Hide<GetSuitItemVIew>();
-                    _rewardItemList.Clear();
-                    _rewardItemList.Add(_rewardList[index]);
-                    ViewManager.Show<LuckyBoxNewDressView>(_rewardItemList);
+                    _recordTurnIndex.Add(index);
+                    _ui.m_touchFlipOpen.touchable = false;
+                    UI_LuckyBoxBonusShowItem.ProxyEnd();
+                    return;
                 }
                 }
-                else
-                {
-                    ViewManager.Hide<LuckyBoxNewDressView>();
-                    ViewManager.Hide<LuckyBoxNewCardView>();
-                    int count = 0;
-                    int totalCount = 0;
-                    DressUpMenuSuitDataManager.GetSuitProgressBySuitId(suitId, out count, out totalCount);
 
 
-                    if (_countShow == 2) //展示进度条界面
+                _countShow += 1;
+                //判断是否有套装需要展示
+                int suitId = SuitCfgArray.Instance.GetSuitIdOfItem(_itemIdList[index]);
+                ItemCfg itemCfg = CommonDataManager.Tables.TblItemCfg.GetOrDefault(_itemIdList[index]);
+
+                if (suitId > 0 && itemCfg.ItemType != ConstItemType.CARD)
+                {
+                    if (_countShow == 1)
                     {
                     {
-                        int countSuitId = 0;
-                        for (int i = index + 1; i < _rewardList.Count; i++)
+                        ViewManager.Hide<SuitItemView>();
+                        ViewManager.Hide<LuckyBoxNewCardView>();
+                        ViewManager.Hide<GetSuitItemVIew>();
+                        _rewardItemList.Clear();
+                        _rewardItemList.Add(_rewardList[index]);
+                        ViewManager.Show<LuckyBoxNewDressView>(_rewardItemList);
+                    }
+                    else
+                    {
+                        ViewManager.Hide<LuckyBoxNewDressView>();
+                        ViewManager.Hide<LuckyBoxNewCardView>();
+                        int count = 0;
+                        int totalCount = 0;
+                        DressUpMenuSuitDataManager.GetSuitProgressBySuitId(suitId, out count, out totalCount);
+
+                        if (_countShow == 2) //展示进度条界面
                         {
                         {
-                            _itemHasNew.TryGetValue(i, out bool isNew);
-                            var itemRewardCfg = CommonDataManager.Tables.TblItemCfg.GetOrDefault(_rewardList[i].id);
-                            if (isNew && itemRewardCfg.ItemType == ConstItemType.DRESS_UP &&
-                                itemRewardCfg.SuitId == suitId)
+                            int countSuitId = 0;
+                            for (int i = index + 1; i < _rewardList.Count; i++)
                             {
                             {
-                                countSuitId++;
+                                _itemHasNew.TryGetValue(i, out bool isNew);
+                                var itemRewardCfg = CommonDataManager.Tables.TblItemCfg.GetOrDefault(_rewardList[i].id);
+                                if (isNew && itemRewardCfg.ItemType == ConstItemType.DRESS_UP &&
+                                    itemRewardCfg.SuitId == suitId)
+                                {
+                                    countSuitId++;
+                                }
                             }
                             }
-                        }
 
 
-                        count = count - countSuitId;
-                        ViewManager.Show<SuitItemView>(new object[] { suitId, countSuitId });
-                    }
-                    else if (_countShow == 3) //展示集齐套装界面
-                    {
-                        ViewManager.Hide<SuitItemView>();
-                        ViewManager.Show<GetSuitItemVIew>(suitId);
-                        _AnimationWait = false;
-                    }
+                            count = count - countSuitId;
+                            ViewManager.Show<SuitItemView>(new object[] { suitId, countSuitId });
+                        }
+                        else if (_countShow == 3) //展示集齐套装界面
+                        {
+                            ViewManager.Hide<SuitItemView>();
+                            ViewManager.Show<GetSuitItemVIew>(suitId);
+                            _AnimationWait = false;
+                        }
 
 
-                    //判断是否需要显示集齐套装界面(需要的时候晚3个定时器时间)
-                    if (count <= 0 || totalCount <= 0 || count < totalCount || (count >= totalCount && _countShow > 5))
-                    {
-                        _recordTurnIndex.Add(index);
-                        _countShow = 0;
-                        if (_handClick)
+                        //判断是否需要显示集齐套装界面(需要的时候晚3个定时器时间)
+                        if (count <= 0 || totalCount <= 0 || count < totalCount ||
+                            (count >= totalCount && _countShow > 5))
                         {
                         {
-                            _handClick = false;
-                            _ui.m_touchFlipOpen.touchable = false;
+                            _recordTurnIndex.Add(index);
+                            _countShow = 0;
+                            if (_handClick)
+                            {
+                                _handClick = false;
+                                _ui.m_touchFlipOpen.touchable = false;
+                            }
                         }
                         }
                     }
                     }
                 }
                 }
+                else
+                {
+                    //词牌和不是套装进这里
+                    ViewManager.Hide<SuitItemView>();
+                    ViewManager.Hide<LuckyBoxNewCardView>();
+                    ViewManager.Hide<GetSuitItemVIew>();
+                    _rewardItemList.Clear();
+                    _rewardItemList.Add(_rewardList[index]);
+                    ViewManager.Show<LuckyBoxNewDressView>(_rewardItemList);
+                    _recordTurnIndex.Add(index);
+                    _countShow = 0;
+                    Timers.inst.Add(1.5f, 1, touchFlipOpen); //防止点击太快
+                }
+
+                UI_LuckyBoxBonusShowItem.ProxyEnd();
             }
             }
-            else
+            catch (Exception e)
             {
             {
-                //词牌和不是套装进这里
-                ViewManager.Hide<SuitItemView>();
-                ViewManager.Hide<LuckyBoxNewCardView>();
-                ViewManager.Hide<GetSuitItemVIew>();
-                _rewardItemList.Clear();
-                _rewardItemList.Add(_rewardList[index]);
-                ViewManager.Show<LuckyBoxNewDressView>(_rewardItemList);
-                _recordTurnIndex.Add(index);
-                _countShow = 0;
-                Timers.inst.Add(1.5f, 1, touchFlipOpen); //防止点击太快
+                Debug.LogError(e);
             }
             }
-
-            UI_LuckyBoxBonusShowItem.ProxyEnd();
         }
         }
 
 
         private void TurnItem(int index)
         private void TurnItem(int index)
         {
         {
-            if (!_allEffectsLoaded || _recordOpenIndex.Contains(index)) return;
-
-            // 删除 "等待翻开" 的特效
-            if (_effectUIDic.ContainsKey("CK_Loop_Wait_Chen" + index))
+            try
             {
             {
-                EffectUIPool.Recycle(_effectUIDic["CK_Loop_Wait_Chen" + index]);
-                _effectUIDic.Remove("CK_Loop_Wait_Chen" + index);
-            }
+                if (!_allEffectsLoaded || _recordOpenIndex.Contains(index)) return;
 
 
-            if (_effectUIDic.ContainsKey("CK_Loop_Wait_GS" + index))
-            {
-                EffectUIPool.Recycle(_effectUIDic["CK_Loop_Wait_GS" + index]);
-                _effectUIDic.Remove("CK_Loop_Wait_GS" + index);
-            }
+                // 删除 "等待翻开" 的特效
+                if (_effectUIDic.ContainsKey("CK_Loop_Wait_Chen" + index))
+                {
+                    EffectUIPool.Recycle(_effectUIDic["CK_Loop_Wait_Chen" + index]);
+                    _effectUIDic.Remove("CK_Loop_Wait_Chen" + index);
+                }
 
 
-            if (_effectUIDic.ContainsKey("CK_Loop_Wait_Jin" + index))
-            {
-                EffectUIPool.Recycle(_effectUIDic["CK_Loop_Wait_Jin" + index]);
-                _effectUIDic.Remove("CK_Loop_Wait_Jin" + index);
-            }
+                if (_effectUIDic.ContainsKey("CK_Loop_Wait_GS" + index))
+                {
+                    EffectUIPool.Recycle(_effectUIDic["CK_Loop_Wait_GS" + index]);
+                    _effectUIDic.Remove("CK_Loop_Wait_GS" + index);
+                }
 
 
-            UI_LuckyBoxBonusShowItem item = UI_LuckyBoxBonusShowItem.Proxy(_itemObjList[index]);
-            if (!item.m_comIcon.m_imgNew.visible && !_recordTurnIndex.Contains(index))
-            {
-                _recordTurnIndex.Add(index);
-            }
+                if (_effectUIDic.ContainsKey("CK_Loop_Wait_Jin" + index))
+                {
+                    EffectUIPool.Recycle(_effectUIDic["CK_Loop_Wait_Jin" + index]);
+                    _effectUIDic.Remove("CK_Loop_Wait_Jin" + index);
+                }
 
 
-            ItemCfg itemCfg = CommonDataManager.Tables.TblItemCfg.GetOrDefault(_itemIdList[index]);
+                UI_LuckyBoxBonusShowItem item = UI_LuckyBoxBonusShowItem.Proxy(_itemObjList[index]);
+                if (!item.m_comIcon.m_imgNew.visible && !_recordTurnIndex.Contains(index))
+                {
+                    _recordTurnIndex.Add(index);
+                }
 
 
-            // 点击特效
-            if (!_effectUIDic.ContainsKey("CK_Cirle_DJ" + index))
-            {
-                _effectUIDic.Add("CK_Cirle_DJ" + index,
-                    EffectUIPool.CreateEffectUI(item.m_comIcon.m_click_eff, "ui_LuckyBox", "CK_Cirle_DJ"));
-            }
-            else
-            {
-                _effectUIDic["CK_Cirle_DJ" + index] =
-                    EffectUIPool.CreateEffectUI(item.m_comIcon.m_click_eff, "ui_LuckyBox", "CK_Cirle_DJ");
-            }
+                ItemCfg itemCfg = CommonDataManager.Tables.TblItemCfg.GetOrDefault(_itemIdList[index]);
+
+                // 点击特效
+                if (!_effectUIDic.ContainsKey("CK_Cirle_DJ" + index))
+                {
+                    _effectUIDic.Add("CK_Cirle_DJ" + index,
+                        EffectUIPool.CreateEffectUI(item.m_comIcon.m_click_eff, "ui_LuckyBox", "CK_Cirle_DJ"));
+                }
+                else
+                {
+                    _effectUIDic["CK_Cirle_DJ" + index] =
+                        EffectUIPool.CreateEffectUI(item.m_comIcon.m_click_eff, "ui_LuckyBox", "CK_Cirle_DJ");
+                }
+
+                // 翻开特效
+                switch (itemCfg.Rarity)
+                {
+                    case 1:
+                        _effectUIDic.Add("CK_OpenAfter_LanHui_UI" + index,
+                            EffectUIPool.CreateEffectUI(item.m_comIcon.m_ui_eff, "ui_LuckyBox",
+                                "CK_OpenAfter_HuiLan_UI"));
+                        _effectUIDic.Add("CK_OpenAfter_LanHui_TX" + index,
+                            EffectUIPool.CreateEffectUI(item.m_comIcon.m_flip_eff, "ui_LuckyBox",
+                                "CK_OpenAfter_LanHui_TX"));
+                        break;
+                    case 2:
+                        _effectUIDic.Add("CK_OpenAfter_LanHui_UI" + index,
+                            EffectUIPool.CreateEffectUI(item.m_comIcon.m_ui_eff, "ui_LuckyBox",
+                                "CK_OpenAfter_LanHui_UI"));
+                        _effectUIDic.Add("CK_OpenAfter_LanHui_TX" + index,
+                            EffectUIPool.CreateEffectUI(item.m_comIcon.m_flip_eff, "ui_LuckyBox",
+                                "CK_OpenAfter_LanHui_TX"));
+                        break;
+                    case 3:
+                        _effectUIDic.Add("CK_OpenAfter_Chen_UI" + index,
+                            EffectUIPool.CreateEffectUI(item.m_comIcon.m_ui_eff, "ui_LuckyBox",
+                                "CK_OpenAfter_Chen_UI"));
+                        _effectUIDic.Add("CK_OpenAfter_Chen_TX" + index,
+                            EffectUIPool.CreateEffectUI(item.m_comIcon.m_flip_eff, "ui_LuckyBox",
+                                "CK_OpenAfter_Chen_TX"));
+                        break;
+                    case 4:
+                        _effectUIDic.Add("CK_OpenAfter_GS_UI" + index,
+                            EffectUIPool.CreateEffectUI(item.m_comIcon.m_ui_eff, "ui_LuckyBox", "CK_OpenAfter_GS_UI"));
+                        _effectUIDic.Add("CK_OpenAfter_GS_TX" + index,
+                            EffectUIPool.CreateEffectUI(item.m_comIcon.m_flip_eff, "ui_LuckyBox",
+                                "CK_OpenAfter_GS_TX"));
+                        break;
+                    case 5:
+                        _effectUIDic.Add("CK_OpenAfter_Jin_UI" + index,
+                            EffectUIPool.CreateEffectUI(item.m_comIcon.m_ui_eff, "ui_LuckyBox", "CK_OpenAfter_Jin_UI"));
+                        _effectUIDic.Add("CK_OpenAfter_Jin_TX" + index,
+                            EffectUIPool.CreateEffectUI(item.m_comIcon.m_flip_eff, "ui_LuckyBox",
+                                "CK_OpenAfter_Jin_TX"));
+                        break;
+                }
 
 
-            // 翻开特效
-            switch (itemCfg.Rarity)
+                _recordOpenIndex.Add(index);
+                UI_LuckyBoxBonusShowItem.ProxyEnd();
+            }
+            catch (Exception e)
             {
             {
-                case 1:
-                    _effectUIDic.Add("CK_OpenAfter_LanHui_UI" + index,
-                        EffectUIPool.CreateEffectUI(item.m_comIcon.m_ui_eff, "ui_LuckyBox", "CK_OpenAfter_HuiLan_UI"));
-                    _effectUIDic.Add("CK_OpenAfter_LanHui_TX" + index,
-                        EffectUIPool.CreateEffectUI(item.m_comIcon.m_flip_eff, "ui_LuckyBox",
-                            "CK_OpenAfter_LanHui_TX"));
-                    break;
-                case 2:
-                    _effectUIDic.Add("CK_OpenAfter_LanHui_UI" + index,
-                        EffectUIPool.CreateEffectUI(item.m_comIcon.m_ui_eff, "ui_LuckyBox", "CK_OpenAfter_LanHui_UI"));
-                    _effectUIDic.Add("CK_OpenAfter_LanHui_TX" + index,
-                        EffectUIPool.CreateEffectUI(item.m_comIcon.m_flip_eff, "ui_LuckyBox",
-                            "CK_OpenAfter_LanHui_TX"));
-                    break;
-                case 3:
-                    _effectUIDic.Add("CK_OpenAfter_Chen_UI" + index,
-                        EffectUIPool.CreateEffectUI(item.m_comIcon.m_ui_eff, "ui_LuckyBox", "CK_OpenAfter_Chen_UI"));
-                    _effectUIDic.Add("CK_OpenAfter_Chen_TX" + index,
-                        EffectUIPool.CreateEffectUI(item.m_comIcon.m_flip_eff, "ui_LuckyBox", "CK_OpenAfter_Chen_TX"));
-                    break;
-                case 4:
-                    _effectUIDic.Add("CK_OpenAfter_GS_UI" + index,
-                        EffectUIPool.CreateEffectUI(item.m_comIcon.m_ui_eff, "ui_LuckyBox", "CK_OpenAfter_GS_UI"));
-                    _effectUIDic.Add("CK_OpenAfter_GS_TX" + index,
-                        EffectUIPool.CreateEffectUI(item.m_comIcon.m_flip_eff, "ui_LuckyBox", "CK_OpenAfter_GS_TX"));
-                    break;
-                case 5:
-                    _effectUIDic.Add("CK_OpenAfter_Jin_UI" + index,
-                        EffectUIPool.CreateEffectUI(item.m_comIcon.m_ui_eff, "ui_LuckyBox", "CK_OpenAfter_Jin_UI"));
-                    _effectUIDic.Add("CK_OpenAfter_Jin_TX" + index,
-                        EffectUIPool.CreateEffectUI(item.m_comIcon.m_flip_eff, "ui_LuckyBox", "CK_OpenAfter_Jin_TX"));
-                    break;
+                Debug.LogError(e);
             }
             }
-
-            _recordOpenIndex.Add(index);
-            UI_LuckyBoxBonusShowItem.ProxyEnd();
         }
         }
 
 
         private void touchFlipOpen(object param)
         private void touchFlipOpen(object param)
         {
         {
-            Timers.inst.Remove(touchFlipOpen);
-            _ui.m_touchFlipOpen.touchable = false;
+            try
+            {
+                Timers.inst.Remove(touchFlipOpen);
+                _ui.m_touchFlipOpen.touchable = false;
+            }
+            catch (Exception e)
+            {
+                Debug.LogError(e);
+            }
         }
         }
 
 
         protected void OthershowViewClose()
         protected void OthershowViewClose()
         {
         {
-            _ui.m_touchFlipOpen.touchable = false;
+            try
+            {
+                _ui.m_touchFlipOpen.touchable = false;
+            }
+            catch (Exception e)
+            {
+                Debug.LogError(e);
+            }
         }
         }
 
 
         protected void ReferNextShow()
         protected void ReferNextShow()
         {
         {
-            if (!_allEffectsLoaded || GetSuitItemController.isAuto) return;
+            try
+            {
+                if (!_allEffectsLoaded || GetSuitItemController.isAuto) return;
 
 
-            int suitId = 0;
-            if (_itemIdList.ContainsKey(_chooseIndex))
-                suitId = SuitCfgArray.Instance.GetSuitIdOfItem(_itemIdList[_chooseIndex]);
+                int suitId = 0;
+                if (_itemIdList.ContainsKey(_chooseIndex))
+                    suitId = SuitCfgArray.Instance.GetSuitIdOfItem(_itemIdList[_chooseIndex]);
 
 
-            if (_chooseIndex != -1 && suitId > 0)
-                ClickItem(_chooseIndex);
-            else
-            {
-                if (_handClick)
+                if (_chooseIndex != -1 && suitId > 0)
+                    ClickItem(_chooseIndex);
+                else
                 {
                 {
-                    _handClick = false;
-                    _ui.m_touchFlipOpen.touchable = false;
+                    if (_handClick)
+                    {
+                        _handClick = false;
+                        _ui.m_touchFlipOpen.touchable = false;
+                    }
                 }
                 }
             }
             }
+            catch (Exception e)
+            {
+                Debug.LogError(e);
+            }
         }
         }
 
 
         protected void SetAnimationWait()
         protected void SetAnimationWait()
         {
         {
-            _AnimationWait = true;
+            try
+            {
+                _AnimationWait = true;
+            }
+            catch (Exception e)
+            {
+                Debug.LogError(e);
+            }
         }
         }
 
 
         private void HideOtherShowWindow()
         private void HideOtherShowWindow()
         {
         {
-            ViewManager.Hide<SuitItemView>();
-            ViewManager.Hide<GetSuitItemVIew>();
-            ViewManager.Hide<LuckyBoxNewDressView>();
-            ViewManager.Hide<LuckyBoxNewCardView>();
+            try
+            {
+                ViewManager.Hide<SuitItemView>();
+                ViewManager.Hide<GetSuitItemVIew>();
+                ViewManager.Hide<LuckyBoxNewDressView>();
+                ViewManager.Hide<LuckyBoxNewCardView>();
+            }
+            catch (Exception e)
+            {
+                Debug.LogError(e);
+            }
         }
         }
     }
     }
 }
 }

+ 88 - 65
GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxNewDressView.cs

@@ -1,4 +1,5 @@
-using System.Collections;
+using System;
+using System.Collections;
 using UnityEngine;
 using UnityEngine;
 using UI.LuckyBox;
 using UI.LuckyBox;
 using System.Collections.Generic;
 using System.Collections.Generic;
@@ -48,35 +49,42 @@ namespace GFGGame
 
 
         protected override void OnInit()
         protected override void OnInit()
         {
         {
-            base.OnInit();
-            packageName = UI_LuckyBoxNewDressUI.PACKAGE_NAME;
-            _ui = UI_LuckyBoxNewDressUI.Create();
-            if (_ui == null)
+            try
             {
             {
-                Debug.LogError("Failed to create UI_LuckyBoxNewDressUI!");
-                return;
-            }
+                base.OnInit();
+                packageName = UI_LuckyBoxNewDressUI.PACKAGE_NAME;
+                _ui = UI_LuckyBoxNewDressUI.Create();
+                if (_ui == null)
+                {
+                    Debug.LogError("Failed to create UI_LuckyBoxNewDressUI!");
+                    return;
+                }
 
 
-            this.viewCom = _ui.target;
-            isfullScreen = true;
-            this.modal = true;
+                this.viewCom = _ui.target;
+                isfullScreen = true;
+                this.modal = true;
 
 
-            if (_ui.m_loaBg != null)
-            {
-                _ui.m_loaBg.onTouchBegin.Add(OnClickBg);
-            }
+                if (_ui.m_loaBg != null)
+                {
+                    _ui.m_loaBg.onTouchBegin.Add(OnClickBg);
+                }
 
 
-            if (_ui.m_btnPass != null)
-            {
-                _ui.m_btnPass.onClick.Add(Hide);
-            }
+                if (_ui.m_btnPass != null)
+                {
+                    _ui.m_btnPass.onClick.Add(Hide);
+                }
+
+                if (_ui.m_loaBg != null)
+                {
+                    _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zx_bg");
+                }
 
 
-            if (_ui.m_loaBg != null)
+                UpdateEffect();
+            }
+            catch (Exception e)
             {
             {
-                _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zx_bg");
+                Debug.LogError(e);
             }
             }
-
-            UpdateEffect();
         }
         }
 
 
         private void UpdateEffect()
         private void UpdateEffect()
@@ -89,40 +97,48 @@ namespace GFGGame
 
 
         protected override void OnShown()
         protected override void OnShown()
         {
         {
-            base.OnShown();
-
-            // 确保UI已经创建
-            if (_ui == null || _ui.m_t_open == null)
+            try
             {
             {
-                Debug.LogError("UI components not initialized properly!");
-                return;
-            }
+                base.OnShown();
 
 
-            _ui.m_loaBg.touchable = false;
-            _rewardParamList.Clear();
-            _rewardList.Clear();
-            _rewardParamList.AddRange(this.viewData as List<ItemData>);
-            _rewardList = this.viewData as List<ItemData>;
-
-            _newRewardList.Clear();
-            _oldRewardList.Clear();
-            for (int i = 0; i < _rewardList.Count; i++)
-            {
-                long hasCount = ItemDataManager.GetItemNum(_rewardList[i].id);
-                int thisCount = GetThisCount(_rewardList[i].id, _rewardList);
-                bool isAddToNew = IsAddToNewRewardList(_rewardList[i].id);
-                if (thisCount == hasCount && !isAddToNew)
+                // 确保UI已经创建
+                if (_ui == null || _ui.m_t_open == null)
                 {
                 {
-                    _newRewardList.Add(_rewardList[i]);
+                    Debug.LogError("UI components not initialized properly!");
+                    return;
                 }
                 }
-                else
+
+                _ui.m_loaBg.touchable = false;
+                _rewardParamList.Clear();
+                _rewardList.Clear();
+                _rewardParamList.AddRange(this.viewData as List<ItemData>);
+                _rewardList = this.viewData as List<ItemData>;
+
+                _newRewardList.Clear();
+                _oldRewardList.Clear();
+                for (int i = 0; i < _rewardList.Count; i++)
                 {
                 {
-                    _oldRewardList.Add(_rewardList[i]);
+                    long hasCount = ItemDataManager.GetItemNum(_rewardList[i].id);
+                    int thisCount = GetThisCount(_rewardList[i].id, _rewardList);
+                    bool isAddToNew = IsAddToNewRewardList(_rewardList[i].id);
+                    if (thisCount == Convert.ToInt32(hasCount) && !isAddToNew)
+                    {
+                        _newRewardList.Add(_rewardList[i]);
+                    }
+                    else
+                    {
+                        _oldRewardList.Add(_rewardList[i]);
+                    }
                 }
                 }
-            }
 
 
-            UpdateView();
-            Timers.inst.Add(0.5f, 1, OnTimerClick);
+                UpdateView();
+                OnTimerClick(1);
+            }
+            catch (Exception e)
+            {
+                Debug.LogError(e);
+            }
+            //Timers.inst.Add((float)0.5, 1, OnTimerClick);
         }
         }
 
 
         private void UpdateView()
         private void UpdateView()
@@ -163,30 +179,37 @@ namespace GFGGame
             switch (itemCfg.Rarity)
             switch (itemCfg.Rarity)
             {
             {
                 case ConstDressRarity.Rarity_TIANYI:
                 case ConstDressRarity.Rarity_TIANYI:
-                    _effectUI5 = EffectUIPool.CreateEffectUI(_ui.m_comCard.m_holder, "ui_LuckyBox", "CK_Yellow_01");
-                    _ui.m_comCard.m_holder.visible = true;
+                    _effectUI5 = EffectUIPool.CreateEffectUI(_ui.m_comCard.m_holder, "ui_LuckyBox", "CK_Yellow_01", 100,
+                        () => { _ui.m_comCard.m_holder.visible = true; });
+
                     _effectUI6 =
                     _effectUI6 =
-                        EffectUIPool.CreateEffectUI(_ui.m_comCard.m_holder1, "ui_LuckyBox", "CK_Yellow_01_top");
-                    _ui.m_comCard.m_holder1.visible = true;
+                        EffectUIPool.CreateEffectUI(_ui.m_comCard.m_holder1, "ui_LuckyBox", "CK_Yellow_01_top", 100,
+                            () => { _ui.m_comCard.m_holder1.visible = true; });
+
                     break;
                     break;
                 case ConstDressRarity.Rarity_GUOSE:
                 case ConstDressRarity.Rarity_GUOSE:
-                    _effectUI5 = EffectUIPool.CreateEffectUI(_ui.m_comCard.m_holder, "ui_LuckyBox", "CK_GS_012");
-                    _ui.m_comCard.m_holder.visible = true;
+                    _effectUI5 = EffectUIPool.CreateEffectUI(_ui.m_comCard.m_holder, "ui_LuckyBox", "CK_GS_012", 100,
+                        () => { _ui.m_comCard.m_holder.visible = true; });
+
                     break;
                     break;
                 case ConstDressRarity.Rarity_DIANCANG:
                 case ConstDressRarity.Rarity_DIANCANG:
-                    _effectUI5 = EffectUIPool.CreateEffectUI(_ui.m_comCard.m_holder, "ui_LuckyBox", "CK_Purple_02");
-                    _ui.m_comCard.m_holder.visible = true;
+                    _effectUI5 = EffectUIPool.CreateEffectUI(_ui.m_comCard.m_holder, "ui_LuckyBox", "CK_Purple_02", 100,
+                        () => { _ui.m_comCard.m_holder.visible = true; });
+
                     _effectUI6 =
                     _effectUI6 =
-                        EffectUIPool.CreateEffectUI(_ui.m_comCard.m_holder1, "ui_LuckyBox", "CK_Purple_02_top");
-                    _ui.m_comCard.m_holder1.visible = true;
+                        EffectUIPool.CreateEffectUI(_ui.m_comCard.m_holder1, "ui_LuckyBox", "CK_Purple_02_top", 100,
+                            () => { _ui.m_comCard.m_holder1.visible = true; });
+
                     break;
                     break;
                 case ConstDressRarity.Rarity_ZHENXI:
                 case ConstDressRarity.Rarity_ZHENXI:
-                    _effectUI5 = EffectUIPool.CreateEffectUI(_ui.m_comCard.m_holder, "ui_LuckyBox", "CK_Bule_03");
-                    _ui.m_comCard.m_holder.visible = true;
+                    _effectUI5 = EffectUIPool.CreateEffectUI(_ui.m_comCard.m_holder, "ui_LuckyBox", "CK_Bule_03", 100,
+                        () => { _ui.m_comCard.m_holder.visible = true; });
+
                     break;
                     break;
                 case ConstDressRarity.Rarity_FANPIN:
                 case ConstDressRarity.Rarity_FANPIN:
-                    _effectUI5 = EffectUIPool.CreateEffectUI(_ui.m_comCard.m_holder, "ui_LuckyBox", "CK_grey_04");
-                    _ui.m_comCard.m_holder.visible = true;
+                    _effectUI5 = EffectUIPool.CreateEffectUI(_ui.m_comCard.m_holder, "ui_LuckyBox", "CK_grey_04", 100,
+                        () => { _ui.m_comCard.m_holder.visible = true; });
+
                     break;
                     break;
             }
             }
 
 
@@ -287,7 +310,7 @@ namespace GFGGame
             _ui.m_t_close.Stop(true, false);
             _ui.m_t_close.Stop(true, false);
             _ui.m_t_open.Stop(true, false);
             _ui.m_t_open.Stop(true, false);
             _rewardList.Clear();
             _rewardList.Clear();
-            Timers.inst.Remove(OnTimerClick);
+            // Timers.inst.Remove(OnTimerClick);
             _ui.m_loaBg.touchable = true;
             _ui.m_loaBg.touchable = true;
 
 
             base.OnHide();
             base.OnHide();

+ 20 - 1
GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -178,10 +178,29 @@ namespace GFGGame
             firstIn = true;
             firstIn = true;
             //这个是东8时区的0时间戳
             //这个是东8时区的0时间戳
             unixStartTime = new DateTime(1970, 1, 1, 8, 0, 0);
             unixStartTime = new DateTime(1970, 1, 1, 8, 0, 0);
-            
+
             //测试任务,背包预加载处理方案
             //测试任务,背包预加载处理方案
+            ViewManager.PreloadViews<FirstChargeBonusView>();
+            ViewManager.PreloadViews<FriendView>();
+            ViewManager.PreloadViews<FieldGuideView>();
             ViewManager.PreloadViews<TaskView>();
             ViewManager.PreloadViews<TaskView>();
             ViewManager.PreloadViews<BagView>();
             ViewManager.PreloadViews<BagView>();
+            ViewManager.PreloadViews<LeagueJoinView>();
+            ViewManager.PreloadViews<StoreChargeView>();
+            ViewManager.PreloadViews<StoreChargeView>();
+            ViewManager.PreloadViews<StoreView>();
+            ViewManager.PreloadViews<PoemGalleryView>();
+            ViewManager.PreloadViews<PoemPhotoView>();
+            ViewManager.PreloadViews<GuideView>();
+            ViewManager.PreloadViews<RoleInfoView>();
+            ViewManager.PreloadViews<DailyWelfareView>();
+            ViewManager.PreloadViews<DailySignView>();
+            ViewManager.PreloadViews<ActivityDay7View>();
+            ViewManager.PreloadViews<InstanceZonesView>();
+            ViewManager.PreloadViews<DressUpView>();
+            ViewManager.PreloadViews<XiuFangView>();
+            ViewManager.PreloadViews<CardDetailView>();
+            ViewManager.PreloadViews<StoryChapterView>();
         }
         }
 
 
         protected override void AddEventListener()
         protected override void AddEventListener()

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/ViewManager.cs

@@ -583,7 +583,7 @@ namespace GFGGame
                 KeyValuePair<string, IUIView> kv = _viewDic.ElementAt(index);
                 KeyValuePair<string, IUIView> kv = _viewDic.ElementAt(index);
                 if (kv.Value.isShowing == true) continue;
                 if (kv.Value.isShowing == true) continue;
                 // if (kv.Value.packageName == ResPathUtil.GetUIPackagePath("CommonGame") || kv.Value.packageName == ResPathUtil.GetUIPackagePath("Common") || kv.Value.packageName == ResPathUtil.GetUIPackagePath("Main")) return;//这几个包不释放
                 // if (kv.Value.packageName == ResPathUtil.GetUIPackagePath("CommonGame") || kv.Value.packageName == ResPathUtil.GetUIPackagePath("Common") || kv.Value.packageName == ResPathUtil.GetUIPackagePath("Main")) return;//这几个包不释放
-                if (_viewDic.Keys.Count <= 10) return; //打开界面小于10个就不销毁了
+                if (_viewDic.Keys.Count <= 50) return; //打开界面小于10个就不销毁了
                 long currentTime = TimeHelper.ClientNowSeconds();
                 long currentTime = TimeHelper.ClientNowSeconds();
                 long closeTime = kv.Value.closeTime;
                 long closeTime = kv.Value.closeTime;
                 if (closeTime > 0 && currentTime - closeTime >= TimeUtil.SECOND_PER_MUNITE * 1)
                 if (closeTime > 0 && currentTime - closeTime >= TimeUtil.SECOND_PER_MUNITE * 1)

+ 0 - 1
GameClient/Assets/Game/Launcher/Game.Launcher.asmdef

@@ -3,7 +3,6 @@
     "rootNamespace": "",
     "rootNamespace": "",
     "references": [
     "references": [
         "GUID:7a41fac89c3ce014e99efb3723e6a98e",
         "GUID:7a41fac89c3ce014e99efb3723e6a98e",
-        "GUID:13ba8ce62aa80c74598530029cb2d649",
         "GUID:e34a5702dd353724aa315fb8011f08c3",
         "GUID:e34a5702dd353724aa315fb8011f08c3",
         "GUID:b0a84d582f6a6fa4185f67ce934d99c2",
         "GUID:b0a84d582f6a6fa4185f67ce934d99c2",
         "GUID:f22fac247a56d2d41b687bb0d900e54e"
         "GUID:f22fac247a56d2d41b687bb0d900e54e"

BIN
GameClient/Assets/Plugins/Android/arm64-v8a/libLive2DCubismCore.so


+ 39 - 0
GameClient/Assets/Plugins/Android/arm64-v8a/libLive2DCubismCore.so.meta

@@ -11,12 +11,25 @@ PluginImporter:
   isExplicitlyReferenced: 0
   isExplicitlyReferenced: 0
   validateReferences: 1
   validateReferences: 1
   platformData:
   platformData:
+  - first:
+      : Any
+    second:
+      enabled: 0
+      settings:
+        Exclude Android: 0
+        Exclude Editor: 1
+        Exclude Linux64: 1
+        Exclude OSXUniversal: 1
+        Exclude Win: 1
+        Exclude Win64: 1
   - first:
   - first:
       Android: Android
       Android: Android
     second:
     second:
       enabled: 1
       enabled: 1
       settings:
       settings:
+        AndroidSharedLibraryType: Executable
         CPU: ARM64
         CPU: ARM64
+        Is16KbAligned: true
   - first:
   - first:
       Any: 
       Any: 
     second:
     second:
@@ -27,7 +40,33 @@ PluginImporter:
     second:
     second:
       enabled: 0
       enabled: 0
       settings:
       settings:
+        CPU: AnyCPU
         DefaultValueInitialized: true
         DefaultValueInitialized: true
+        OS: AnyOS
+  - first:
+      Standalone: Linux64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: OSXUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

BIN
GameClient/Assets/Plugins/Android/x86/libLive2DCubismCore.so


+ 40 - 1
GameClient/Assets/Plugins/Android/x86/libLive2DCubismCore.so.meta

@@ -11,12 +11,25 @@ PluginImporter:
   isExplicitlyReferenced: 0
   isExplicitlyReferenced: 0
   validateReferences: 1
   validateReferences: 1
   platformData:
   platformData:
+  - first:
+      : Any
+    second:
+      enabled: 0
+      settings:
+        Exclude Android: 0
+        Exclude Editor: 1
+        Exclude Linux64: 1
+        Exclude OSXUniversal: 1
+        Exclude Win: 1
+        Exclude Win64: 1
   - first:
   - first:
       Android: Android
       Android: Android
     second:
     second:
       enabled: 1
       enabled: 1
       settings:
       settings:
-        CPU: x86
+        AndroidSharedLibraryType: Executable
+        CPU: X86
+        Is16KbAligned: false
   - first:
   - first:
       Any: 
       Any: 
     second:
     second:
@@ -27,7 +40,33 @@ PluginImporter:
     second:
     second:
       enabled: 0
       enabled: 0
       settings:
       settings:
+        CPU: AnyCPU
         DefaultValueInitialized: true
         DefaultValueInitialized: true
+        OS: AnyOS
+  - first:
+      Standalone: Linux64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: OSXUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: None
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

BIN
GameClient/Assets/Plugins/Experimental/Emscripten/Live2DCubismCore.bc


+ 8 - 0
GameClient/Assets/Plugins/Experimental/Emscripten/latest.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ae51c6ddfa0cf3c44a2abf0c86cd075c
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
GameClient/Assets/Plugins/Experimental/Emscripten/latest/Live2DCubismCore.bc


+ 1 - 1
GameClient/Assets/Plugins/Experimental/Emscripten/Live2DCubismCore.bc.meta → GameClient/Assets/Plugins/Experimental/Emscripten/latest/Live2DCubismCore.bc.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
 fileFormatVersion: 2
-guid: 0a5dd0e1f63870b46ba3e4272c6ced6e
+guid: 978bb9775c91d4f4d8773519cdd18d00
 PluginImporter:
 PluginImporter:
   externalObjects: {}
   externalObjects: {}
   serializedVersion: 2
   serializedVersion: 2

BIN
GameClient/Assets/Plugins/Experimental/UWP/arm/Live2DCubismCore.dll


+ 2 - 5
GameClient/Assets/Plugins/Experimental/UWP/arm/Live2DCubismCore.dll.meta

@@ -5,14 +5,11 @@ PluginImporter:
   serializedVersion: 2
   serializedVersion: 2
   iconMap: {}
   iconMap: {}
   executionOrder: {}
   executionOrder: {}
-  defineConstraints: []
   isPreloaded: 0
   isPreloaded: 0
   isOverridable: 0
   isOverridable: 0
-  isExplicitlyReferenced: 0
-  validateReferences: 1
   platformData:
   platformData:
   - first:
   - first:
-      : Any
+      '': Any
     second:
     second:
       enabled: 0
       enabled: 0
       settings:
       settings:
@@ -69,7 +66,7 @@ PluginImporter:
     second:
     second:
       enabled: 0
       enabled: 0
       settings:
       settings:
-        CPU: AnyCPU
+        CPU: x86_64
   - first:
   - first:
       Standalone: LinuxUniversal
       Standalone: LinuxUniversal
     second:
     second:

BIN
GameClient/Assets/Plugins/Experimental/UWP/arm64/Live2DCubismCore.dll


+ 2 - 5
GameClient/Assets/Plugins/Experimental/UWP/arm64/Live2DCubismCore.dll.meta

@@ -5,14 +5,11 @@ PluginImporter:
   serializedVersion: 2
   serializedVersion: 2
   iconMap: {}
   iconMap: {}
   executionOrder: {}
   executionOrder: {}
-  defineConstraints: []
   isPreloaded: 0
   isPreloaded: 0
   isOverridable: 0
   isOverridable: 0
-  isExplicitlyReferenced: 0
-  validateReferences: 1
   platformData:
   platformData:
   - first:
   - first:
-      : Any
+      '': Any
     second:
     second:
       enabled: 0
       enabled: 0
       settings:
       settings:
@@ -69,7 +66,7 @@ PluginImporter:
     second:
     second:
       enabled: 0
       enabled: 0
       settings:
       settings:
-        CPU: AnyCPU
+        CPU: x86_64
   - first:
   - first:
       Standalone: LinuxUniversal
       Standalone: LinuxUniversal
     second:
     second:

BIN
GameClient/Assets/Plugins/Experimental/UWP/x64/Live2DCubismCore.dll


BIN
GameClient/Assets/Plugins/Experimental/UWP/x86/Live2DCubismCore.dll


BIN
GameClient/Assets/Plugins/Linux/x86_64/libLive2DCubismCore.so


+ 91 - 5
GameClient/Assets/Plugins/Linux/x86_64/libLive2DCubismCore.so.meta

@@ -5,23 +5,109 @@ PluginImporter:
   serializedVersion: 2
   serializedVersion: 2
   iconMap: {}
   iconMap: {}
   executionOrder: {}
   executionOrder: {}
-  defineConstraints: []
   isPreloaded: 0
   isPreloaded: 0
   isOverridable: 0
   isOverridable: 0
-  isExplicitlyReferenced: 0
-  validateReferences: 1
   platformData:
   platformData:
+  - first:
+      '': Any
+    second:
+      enabled: 0
+      settings:
+        Exclude Android: 1
+        Exclude Editor: 0
+        Exclude Linux: 1
+        Exclude Linux64: 0
+        Exclude LinuxUniversal: 0
+        Exclude OSXUniversal: 1
+        Exclude WebGL: 1
+        Exclude Win: 0
+        Exclude Win64: 0
+        Exclude WindowsStoreApps: 1
+        Exclude iOS: 1
+  - first:
+      Android: Android
+    second:
+      enabled: 0
+      settings:
+        CPU: ARMv7
   - first:
   - first:
       Any: 
       Any: 
     second:
     second:
-      enabled: 1
+      enabled: 0
       settings: {}
       settings: {}
   - first:
   - first:
       Editor: Editor
       Editor: Editor
     second:
     second:
-      enabled: 0
+      enabled: 1
       settings:
       settings:
+        CPU: x86_64
         DefaultValueInitialized: true
         DefaultValueInitialized: true
+        OS: Linux
+  - first:
+      Facebook: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Facebook: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: Linux
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Linux64
+    second:
+      enabled: 1
+      settings:
+        CPU: x86_64
+  - first:
+      Standalone: LinuxUniversal
+    second:
+      enabled: 1
+      settings:
+        CPU: x86_64
+  - first:
+      Standalone: OSXUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Win
+    second:
+      enabled: 1
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: Win64
+    second:
+      enabled: 1
+      settings:
+        CPU: AnyCPU
+  - first:
+      Windows Store Apps: WindowsStoreApps
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+        DontProcess: False
+        PlaceholderPath: 
+        SDK: AnySDK
+        ScriptingBackend: AnyScriptingBackend
+  - first:
+      iPhone: iOS
+    second:
+      enabled: 0
+      settings:
+        CompileFlags: 
+        FrameworkDependencies: 
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

BIN
GameClient/Assets/Plugins/MacOS/Live2DCubismCore.bundle


+ 9 - 4
GameClient/Assets/Plugins/MacOS/Live2DCubismCore.bundle.meta

@@ -5,11 +5,14 @@ PluginImporter:
   serializedVersion: 2
   serializedVersion: 2
   iconMap: {}
   iconMap: {}
   executionOrder: {}
   executionOrder: {}
+  defineConstraints: []
   isPreloaded: 0
   isPreloaded: 0
   isOverridable: 0
   isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
   platformData:
   platformData:
   - first:
   - first:
-      '': Any
+      : Any
     second:
     second:
       enabled: 0
       enabled: 0
       settings:
       settings:
@@ -40,7 +43,7 @@ PluginImporter:
     second:
     second:
       enabled: 1
       enabled: 1
       settings:
       settings:
-        CPU: x86_64
+        CPU: AnyCPU
         DefaultValueInitialized: true
         DefaultValueInitialized: true
         OS: OSX
         OS: OSX
   - first:
   - first:
@@ -66,7 +69,7 @@ PluginImporter:
     second:
     second:
       enabled: 0
       enabled: 0
       settings:
       settings:
-        CPU: x86_64
+        CPU: AnyCPU
   - first:
   - first:
       Standalone: OSXUniversal
       Standalone: OSXUniversal
     second:
     second:
@@ -91,7 +94,7 @@ PluginImporter:
       enabled: 0
       enabled: 0
       settings:
       settings:
         CPU: AnyCPU
         CPU: AnyCPU
-        DontProcess: False
+        DontProcess: false
         PlaceholderPath: 
         PlaceholderPath: 
         SDK: AnySDK
         SDK: AnySDK
         ScriptingBackend: AnyScriptingBackend
         ScriptingBackend: AnyScriptingBackend
@@ -100,6 +103,8 @@ PluginImporter:
     second:
     second:
       enabled: 0
       enabled: 0
       settings:
       settings:
+        AddToEmbeddedBinaries: false
+        CPU: AnyCPU
         CompileFlags: 
         CompileFlags: 
         FrameworkDependencies: 
         FrameworkDependencies: 
   userData: 
   userData: 

BIN
GameClient/Assets/Plugins/Windows/x86/Live2DCubismCore.dll


+ 2 - 5
GameClient/Assets/Plugins/Windows/x86/Live2DCubismCore.dll.meta

@@ -5,14 +5,11 @@ PluginImporter:
   serializedVersion: 2
   serializedVersion: 2
   iconMap: {}
   iconMap: {}
   executionOrder: {}
   executionOrder: {}
-  defineConstraints: []
   isPreloaded: 0
   isPreloaded: 0
   isOverridable: 0
   isOverridable: 0
-  isExplicitlyReferenced: 0
-  validateReferences: 1
   platformData:
   platformData:
   - first:
   - first:
-      : Any
+      '': Any
     second:
     second:
       enabled: 0
       enabled: 0
       settings:
       settings:
@@ -69,7 +66,7 @@ PluginImporter:
     second:
     second:
       enabled: 1
       enabled: 1
       settings:
       settings:
-        CPU: AnyCPU
+        CPU: x86_64
   - first:
   - first:
       Standalone: LinuxUniversal
       Standalone: LinuxUniversal
     second:
     second:

BIN
GameClient/Assets/Plugins/Windows/x86_64/Live2DCubismCore.dll


BIN
GameClient/Assets/Plugins/iOS/Debug-iphoneos/libLive2DCubismCore.a


+ 85 - 5
GameClient/Assets/Plugins/iOS/Debug-iphoneos/libLive2DCubismCore.a.meta

@@ -5,12 +5,31 @@ PluginImporter:
   serializedVersion: 2
   serializedVersion: 2
   iconMap: {}
   iconMap: {}
   executionOrder: {}
   executionOrder: {}
-  defineConstraints: []
   isPreloaded: 0
   isPreloaded: 0
   isOverridable: 0
   isOverridable: 0
-  isExplicitlyReferenced: 0
-  validateReferences: 1
   platformData:
   platformData:
+  - first:
+      '': Any
+    second:
+      enabled: 0
+      settings:
+        Exclude Android: 1
+        Exclude Editor: 1
+        Exclude Linux: 1
+        Exclude Linux64: 1
+        Exclude LinuxUniversal: 1
+        Exclude OSXUniversal: 1
+        Exclude WebGL: 1
+        Exclude Win: 1
+        Exclude Win64: 1
+        Exclude WindowsStoreApps: 1
+        Exclude iOS: 1
+  - first:
+      Android: Android
+    second:
+      enabled: 0
+      settings:
+        CPU: ARMv7
   - first:
   - first:
       Any: 
       Any: 
     second:
     second:
@@ -21,13 +40,74 @@ PluginImporter:
     second:
     second:
       enabled: 0
       enabled: 0
       settings:
       settings:
+        CPU: AnyCPU
         DefaultValueInitialized: true
         DefaultValueInitialized: true
+        OS: AnyOS
+  - first:
+      Facebook: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Facebook: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: Linux
+    second:
+      enabled: 0
+      settings:
+        CPU: x86
+  - first:
+      Standalone: Linux64
+    second:
+      enabled: 0
+      settings:
+        CPU: x86_64
+  - first:
+      Standalone: LinuxUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: OSXUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Windows Store Apps: WindowsStoreApps
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+        DontProcess: False
+        PlaceholderPath: 
+        SDK: AnySDK
+        ScriptingBackend: AnyScriptingBackend
   - first:
   - first:
       iPhone: iOS
       iPhone: iOS
     second:
     second:
-      enabled: 1
+      enabled: 0
       settings:
       settings:
-        AddToEmbeddedBinaries: false
+        CompileFlags: 
+        FrameworkDependencies: 
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

BIN
GameClient/Assets/Plugins/iOS/Debug-iphonesimulator/libLive2DCubismCore.a


+ 85 - 5
GameClient/Assets/Plugins/iOS/Debug-iphonesimulator/libLive2DCubismCore.a.meta

@@ -5,12 +5,31 @@ PluginImporter:
   serializedVersion: 2
   serializedVersion: 2
   iconMap: {}
   iconMap: {}
   executionOrder: {}
   executionOrder: {}
-  defineConstraints: []
   isPreloaded: 0
   isPreloaded: 0
   isOverridable: 0
   isOverridable: 0
-  isExplicitlyReferenced: 0
-  validateReferences: 1
   platformData:
   platformData:
+  - first:
+      '': Any
+    second:
+      enabled: 0
+      settings:
+        Exclude Android: 1
+        Exclude Editor: 1
+        Exclude Linux: 1
+        Exclude Linux64: 1
+        Exclude LinuxUniversal: 1
+        Exclude OSXUniversal: 1
+        Exclude WebGL: 1
+        Exclude Win: 1
+        Exclude Win64: 1
+        Exclude WindowsStoreApps: 1
+        Exclude iOS: 1
+  - first:
+      Android: Android
+    second:
+      enabled: 0
+      settings:
+        CPU: ARMv7
   - first:
   - first:
       Any: 
       Any: 
     second:
     second:
@@ -21,13 +40,74 @@ PluginImporter:
     second:
     second:
       enabled: 0
       enabled: 0
       settings:
       settings:
+        CPU: AnyCPU
         DefaultValueInitialized: true
         DefaultValueInitialized: true
+        OS: AnyOS
+  - first:
+      Facebook: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Facebook: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: Linux
+    second:
+      enabled: 0
+      settings:
+        CPU: x86
+  - first:
+      Standalone: Linux64
+    second:
+      enabled: 0
+      settings:
+        CPU: x86_64
+  - first:
+      Standalone: LinuxUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: OSXUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Windows Store Apps: WindowsStoreApps
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+        DontProcess: False
+        PlaceholderPath: 
+        SDK: AnySDK
+        ScriptingBackend: AnyScriptingBackend
   - first:
   - first:
       iPhone: iOS
       iPhone: iOS
     second:
     second:
-      enabled: 1
+      enabled: 0
       settings:
       settings:
-        AddToEmbeddedBinaries: false
+        CompileFlags: 
+        FrameworkDependencies: 
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

BIN
GameClient/Assets/Plugins/iOS/Release-iphoneos/libLive2DCubismCore.a


+ 84 - 4
GameClient/Assets/Plugins/iOS/Release-iphoneos/libLive2DCubismCore.a.meta

@@ -5,12 +5,31 @@ PluginImporter:
   serializedVersion: 2
   serializedVersion: 2
   iconMap: {}
   iconMap: {}
   executionOrder: {}
   executionOrder: {}
-  defineConstraints: []
   isPreloaded: 0
   isPreloaded: 0
   isOverridable: 0
   isOverridable: 0
-  isExplicitlyReferenced: 0
-  validateReferences: 1
   platformData:
   platformData:
+  - first:
+      '': Any
+    second:
+      enabled: 0
+      settings:
+        Exclude Android: 1
+        Exclude Editor: 1
+        Exclude Linux: 1
+        Exclude Linux64: 1
+        Exclude LinuxUniversal: 1
+        Exclude OSXUniversal: 1
+        Exclude WebGL: 1
+        Exclude Win: 1
+        Exclude Win64: 1
+        Exclude WindowsStoreApps: 1
+        Exclude iOS: 0
+  - first:
+      Android: Android
+    second:
+      enabled: 0
+      settings:
+        CPU: ARMv7
   - first:
   - first:
       Any: 
       Any: 
     second:
     second:
@@ -21,13 +40,74 @@ PluginImporter:
     second:
     second:
       enabled: 0
       enabled: 0
       settings:
       settings:
+        CPU: AnyCPU
         DefaultValueInitialized: true
         DefaultValueInitialized: true
+        OS: AnyOS
+  - first:
+      Facebook: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Facebook: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: Linux
+    second:
+      enabled: 0
+      settings:
+        CPU: x86
+  - first:
+      Standalone: Linux64
+    second:
+      enabled: 0
+      settings:
+        CPU: x86_64
+  - first:
+      Standalone: LinuxUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: OSXUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Windows Store Apps: WindowsStoreApps
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+        DontProcess: False
+        PlaceholderPath: 
+        SDK: AnySDK
+        ScriptingBackend: AnyScriptingBackend
   - first:
   - first:
       iPhone: iOS
       iPhone: iOS
     second:
     second:
       enabled: 1
       enabled: 1
       settings:
       settings:
-        AddToEmbeddedBinaries: false
+        CompileFlags: 
+        FrameworkDependencies: 
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

BIN
GameClient/Assets/Plugins/iOS/Release-iphonesimulator/libLive2DCubismCore.a


+ 85 - 5
GameClient/Assets/Plugins/iOS/Release-iphonesimulator/libLive2DCubismCore.a.meta

@@ -5,12 +5,31 @@ PluginImporter:
   serializedVersion: 2
   serializedVersion: 2
   iconMap: {}
   iconMap: {}
   executionOrder: {}
   executionOrder: {}
-  defineConstraints: []
   isPreloaded: 0
   isPreloaded: 0
   isOverridable: 0
   isOverridable: 0
-  isExplicitlyReferenced: 0
-  validateReferences: 1
   platformData:
   platformData:
+  - first:
+      '': Any
+    second:
+      enabled: 0
+      settings:
+        Exclude Android: 1
+        Exclude Editor: 1
+        Exclude Linux: 1
+        Exclude Linux64: 1
+        Exclude LinuxUniversal: 1
+        Exclude OSXUniversal: 1
+        Exclude WebGL: 1
+        Exclude Win: 1
+        Exclude Win64: 1
+        Exclude WindowsStoreApps: 1
+        Exclude iOS: 1
+  - first:
+      Android: Android
+    second:
+      enabled: 0
+      settings:
+        CPU: ARMv7
   - first:
   - first:
       Any: 
       Any: 
     second:
     second:
@@ -21,13 +40,74 @@ PluginImporter:
     second:
     second:
       enabled: 0
       enabled: 0
       settings:
       settings:
+        CPU: AnyCPU
         DefaultValueInitialized: true
         DefaultValueInitialized: true
+        OS: AnyOS
+  - first:
+      Facebook: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Facebook: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: Linux
+    second:
+      enabled: 0
+      settings:
+        CPU: x86
+  - first:
+      Standalone: Linux64
+    second:
+      enabled: 0
+      settings:
+        CPU: x86_64
+  - first:
+      Standalone: LinuxUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: OSXUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Windows Store Apps: WindowsStoreApps
+    second:
+      enabled: 0
+      settings:
+        CPU: X86
+        DontProcess: False
+        PlaceholderPath: 
+        SDK: AnySDK
+        ScriptingBackend: AnyScriptingBackend
   - first:
   - first:
       iPhone: iOS
       iPhone: iOS
     second:
     second:
-      enabled: 1
+      enabled: 0
       settings:
       settings:
-        AddToEmbeddedBinaries: false
+        CompileFlags: 
+        FrameworkDependencies: 
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

+ 37 - 3
GameClient/Assets/ResIn/Fight/bg_fhl.png.meta

@@ -3,7 +3,7 @@ guid: 254c216408839284cabe7fc079489830
 TextureImporter:
 TextureImporter:
   internalIDToNameTable: []
   internalIDToNameTable: []
   externalObjects: {}
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 12
   mipmaps:
   mipmaps:
     mipMapMode: 0
     mipMapMode: 0
     enableMipMap: 0
     enableMipMap: 0
@@ -20,10 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     externalNormalMap: 0
     heightScale: 0.25
     heightScale: 0.25
     normalMapFilter: 0
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
   vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   generateCubemap: 6
   cubemapConvolution: 0
   cubemapConvolution: 0
@@ -62,6 +64,8 @@ TextureImporter:
   textureFormatSet: 0
   textureFormatSet: 0
   ignorePngGamma: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   platformSettings:
   - serializedVersion: 3
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     buildTarget: DefaultTexturePlatform
@@ -73,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -85,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -97,6 +103,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -109,6 +116,33 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
@@ -124,9 +158,9 @@ TextureImporter:
     edges: []
     edges: []
     weights: []
     weights: []
     secondaryTextures: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

+ 37 - 3
GameClient/Assets/ResIn/Fight/fightBg.png.meta

@@ -3,7 +3,7 @@ guid: 03cdae2317655b24e9b791c43f151e7a
 TextureImporter:
 TextureImporter:
   internalIDToNameTable: []
   internalIDToNameTable: []
   externalObjects: {}
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 12
   mipmaps:
   mipmaps:
     mipMapMode: 0
     mipMapMode: 0
     enableMipMap: 0
     enableMipMap: 0
@@ -20,10 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     externalNormalMap: 0
     heightScale: 0.25
     heightScale: 0.25
     normalMapFilter: 0
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
   vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   generateCubemap: 6
   cubemapConvolution: 0
   cubemapConvolution: 0
@@ -62,6 +64,8 @@ TextureImporter:
   textureFormatSet: 0
   textureFormatSet: 0
   ignorePngGamma: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   platformSettings:
   - serializedVersion: 3
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     buildTarget: DefaultTexturePlatform
@@ -73,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -85,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -97,6 +103,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -109,6 +116,33 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
@@ -124,9 +158,9 @@ TextureImporter:
     edges: []
     edges: []
     weights: []
     weights: []
     secondaryTextures: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

+ 37 - 3
GameClient/Assets/ResIn/Fight/jingzhongh_bg.png.meta

@@ -3,7 +3,7 @@ guid: fe80edd5adcb4884e90062e6406f0f4a
 TextureImporter:
 TextureImporter:
   internalIDToNameTable: []
   internalIDToNameTable: []
   externalObjects: {}
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 12
   mipmaps:
   mipmaps:
     mipMapMode: 0
     mipMapMode: 0
     enableMipMap: 0
     enableMipMap: 0
@@ -20,10 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     externalNormalMap: 0
     heightScale: 0.25
     heightScale: 0.25
     normalMapFilter: 0
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
   vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   generateCubemap: 6
   cubemapConvolution: 0
   cubemapConvolution: 0
@@ -62,6 +64,8 @@ TextureImporter:
   textureFormatSet: 0
   textureFormatSet: 0
   ignorePngGamma: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   platformSettings:
   - serializedVersion: 3
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     buildTarget: DefaultTexturePlatform
@@ -73,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -85,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -97,6 +103,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -109,6 +116,33 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
@@ -124,9 +158,9 @@ TextureImporter:
     edges: []
     edges: []
     weights: []
     weights: []
     secondaryTextures: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

+ 37 - 3
GameClient/Assets/ResIn/Fight/zd_bj_bja_1.png.meta

@@ -3,7 +3,7 @@ guid: d5e3578f9df618f42a579b7e10d9feec
 TextureImporter:
 TextureImporter:
   internalIDToNameTable: []
   internalIDToNameTable: []
   externalObjects: {}
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 12
   mipmaps:
   mipmaps:
     mipMapMode: 0
     mipMapMode: 0
     enableMipMap: 0
     enableMipMap: 0
@@ -20,10 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     externalNormalMap: 0
     heightScale: 0.25
     heightScale: 0.25
     normalMapFilter: 0
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
   vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   generateCubemap: 6
   cubemapConvolution: 0
   cubemapConvolution: 0
@@ -62,6 +64,8 @@ TextureImporter:
   textureFormatSet: 0
   textureFormatSet: 0
   ignorePngGamma: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   platformSettings:
   - serializedVersion: 3
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     buildTarget: DefaultTexturePlatform
@@ -73,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -85,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -97,6 +103,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -109,6 +116,33 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
@@ -124,9 +158,9 @@ TextureImporter:
     edges: []
     edges: []
     weights: []
     weights: []
     secondaryTextures: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

+ 37 - 3
GameClient/Assets/ResIn/Fight/zd_bj_bja_2.png.meta

@@ -3,7 +3,7 @@ guid: f6ef83aeaa759b748bc6116cca3c711f
 TextureImporter:
 TextureImporter:
   internalIDToNameTable: []
   internalIDToNameTable: []
   externalObjects: {}
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 12
   mipmaps:
   mipmaps:
     mipMapMode: 0
     mipMapMode: 0
     enableMipMap: 0
     enableMipMap: 0
@@ -20,10 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     externalNormalMap: 0
     heightScale: 0.25
     heightScale: 0.25
     normalMapFilter: 0
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
   vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   generateCubemap: 6
   cubemapConvolution: 0
   cubemapConvolution: 0
@@ -62,6 +64,8 @@ TextureImporter:
   textureFormatSet: 0
   textureFormatSet: 0
   ignorePngGamma: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   platformSettings:
   - serializedVersion: 3
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     buildTarget: DefaultTexturePlatform
@@ -73,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -85,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -97,6 +103,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -109,6 +116,33 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
@@ -124,9 +158,9 @@ TextureImporter:
     edges: []
     edges: []
     weights: []
     weights: []
     secondaryTextures: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

+ 37 - 3
GameClient/Assets/ResIn/Fight/zd_bj_qg_1 1.png.meta

@@ -3,7 +3,7 @@ guid: 96bf5742305636a40a8a77df61630508
 TextureImporter:
 TextureImporter:
   internalIDToNameTable: []
   internalIDToNameTable: []
   externalObjects: {}
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 12
   mipmaps:
   mipmaps:
     mipMapMode: 0
     mipMapMode: 0
     enableMipMap: 0
     enableMipMap: 0
@@ -20,10 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     externalNormalMap: 0
     heightScale: 0.25
     heightScale: 0.25
     normalMapFilter: 0
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
   vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   generateCubemap: 6
   cubemapConvolution: 0
   cubemapConvolution: 0
@@ -62,6 +64,8 @@ TextureImporter:
   textureFormatSet: 0
   textureFormatSet: 0
   ignorePngGamma: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   platformSettings:
   - serializedVersion: 3
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     buildTarget: DefaultTexturePlatform
@@ -73,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -85,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -97,6 +103,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -109,6 +116,33 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
@@ -124,9 +158,9 @@ TextureImporter:
     edges: []
     edges: []
     weights: []
     weights: []
     secondaryTextures: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

+ 37 - 3
GameClient/Assets/ResIn/Fight/zd_bj_qgqg_1.png.meta

@@ -3,7 +3,7 @@ guid: d54fd5ac44f2b4f4bb2cb4c7033d0ddd
 TextureImporter:
 TextureImporter:
   internalIDToNameTable: []
   internalIDToNameTable: []
   externalObjects: {}
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 12
   mipmaps:
   mipmaps:
     mipMapMode: 0
     mipMapMode: 0
     enableMipMap: 0
     enableMipMap: 0
@@ -20,10 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     externalNormalMap: 0
     heightScale: 0.25
     heightScale: 0.25
     normalMapFilter: 0
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
   vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   generateCubemap: 6
   cubemapConvolution: 0
   cubemapConvolution: 0
@@ -62,6 +64,8 @@ TextureImporter:
   textureFormatSet: 0
   textureFormatSet: 0
   ignorePngGamma: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   platformSettings:
   - serializedVersion: 3
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     buildTarget: DefaultTexturePlatform
@@ -73,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -85,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -97,6 +103,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -109,6 +116,33 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
@@ -124,9 +158,9 @@ TextureImporter:
     edges: []
     edges: []
     weights: []
     weights: []
     secondaryTextures: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

+ 37 - 3
GameClient/Assets/ResIn/Fight/zd_bj_qgqg_2.png.meta

@@ -3,7 +3,7 @@ guid: 8c9de3878d54f0e439f1c5fc0495459e
 TextureImporter:
 TextureImporter:
   internalIDToNameTable: []
   internalIDToNameTable: []
   externalObjects: {}
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 12
   mipmaps:
   mipmaps:
     mipMapMode: 0
     mipMapMode: 0
     enableMipMap: 0
     enableMipMap: 0
@@ -20,10 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     externalNormalMap: 0
     heightScale: 0.25
     heightScale: 0.25
     normalMapFilter: 0
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
   vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   generateCubemap: 6
   cubemapConvolution: 0
   cubemapConvolution: 0
@@ -62,6 +64,8 @@ TextureImporter:
   textureFormatSet: 0
   textureFormatSet: 0
   ignorePngGamma: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   platformSettings:
   - serializedVersion: 3
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     buildTarget: DefaultTexturePlatform
@@ -73,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -85,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -97,6 +103,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -109,6 +116,33 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
@@ -124,9 +158,9 @@ TextureImporter:
     edges: []
     edges: []
     weights: []
     weights: []
     secondaryTextures: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

+ 37 - 3
GameClient/Assets/ResIn/Fight/zd_drpf_dzuo.png.meta

@@ -3,7 +3,7 @@ guid: 9c9614ef9ef12bd41ad4c4db23f6f38a
 TextureImporter:
 TextureImporter:
   internalIDToNameTable: []
   internalIDToNameTable: []
   externalObjects: {}
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 12
   mipmaps:
   mipmaps:
     mipMapMode: 0
     mipMapMode: 0
     enableMipMap: 0
     enableMipMap: 0
@@ -20,10 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     externalNormalMap: 0
     heightScale: 0.25
     heightScale: 0.25
     normalMapFilter: 0
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
   vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   generateCubemap: 6
   cubemapConvolution: 0
   cubemapConvolution: 0
@@ -62,6 +64,8 @@ TextureImporter:
   textureFormatSet: 0
   textureFormatSet: 0
   ignorePngGamma: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   platformSettings:
   - serializedVersion: 3
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     buildTarget: DefaultTexturePlatform
@@ -73,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -85,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -97,6 +103,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -109,6 +116,33 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
@@ -124,9 +158,9 @@ TextureImporter:
     edges: []
     edges: []
     weights: []
     weights: []
     secondaryTextures: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

+ 37 - 3
GameClient/Assets/ResIn/Fight/zd_jsjm_bjtu.png.meta

@@ -3,7 +3,7 @@ guid: 6fe07358b7102e94bb4bddc5e7aad403
 TextureImporter:
 TextureImporter:
   internalIDToNameTable: []
   internalIDToNameTable: []
   externalObjects: {}
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 12
   mipmaps:
   mipmaps:
     mipMapMode: 0
     mipMapMode: 0
     enableMipMap: 0
     enableMipMap: 0
@@ -20,10 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     externalNormalMap: 0
     heightScale: 0.25
     heightScale: 0.25
     normalMapFilter: 0
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
   vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   generateCubemap: 6
   cubemapConvolution: 0
   cubemapConvolution: 0
@@ -62,6 +64,8 @@ TextureImporter:
   textureFormatSet: 0
   textureFormatSet: 0
   ignorePngGamma: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   platformSettings:
   - serializedVersion: 3
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     buildTarget: DefaultTexturePlatform
@@ -73,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -85,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -97,6 +103,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -109,6 +116,33 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
@@ -124,9 +158,9 @@ TextureImporter:
     edges: []
     edges: []
     weights: []
     weights: []
     secondaryTextures: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

+ 37 - 3
GameClient/Assets/ResIn/LoginRes/LoginSkin1/bg_02.png.meta

@@ -3,7 +3,7 @@ guid: 8af5f6d316f9212448412831d24aeb36
 TextureImporter:
 TextureImporter:
   internalIDToNameTable: []
   internalIDToNameTable: []
   externalObjects: {}
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 12
   mipmaps:
   mipmaps:
     mipMapMode: 0
     mipMapMode: 0
     enableMipMap: 0
     enableMipMap: 0
@@ -20,10 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     externalNormalMap: 0
     heightScale: 0.25
     heightScale: 0.25
     normalMapFilter: 0
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
   vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   generateCubemap: 6
   cubemapConvolution: 0
   cubemapConvolution: 0
@@ -62,6 +64,8 @@ TextureImporter:
   textureFormatSet: 0
   textureFormatSet: 0
   ignorePngGamma: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   platformSettings:
   - serializedVersion: 3
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     buildTarget: DefaultTexturePlatform
@@ -73,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -85,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -97,6 +103,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -109,6 +116,33 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
@@ -124,9 +158,9 @@ TextureImporter:
     edges: []
     edges: []
     weights: []
     weights: []
     secondaryTextures: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

+ 37 - 3
GameClient/Assets/ResIn/LoginRes/LoginSkin1/bg_t.png.meta

@@ -3,7 +3,7 @@ guid: f6233d8fa06ec8f47be121cb17376b7c
 TextureImporter:
 TextureImporter:
   internalIDToNameTable: []
   internalIDToNameTable: []
   externalObjects: {}
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 12
   mipmaps:
   mipmaps:
     mipMapMode: 0
     mipMapMode: 0
     enableMipMap: 0
     enableMipMap: 0
@@ -20,10 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     externalNormalMap: 0
     heightScale: 0.25
     heightScale: 0.25
     normalMapFilter: 0
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
   vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   generateCubemap: 6
   cubemapConvolution: 0
   cubemapConvolution: 0
@@ -62,6 +64,8 @@ TextureImporter:
   textureFormatSet: 0
   textureFormatSet: 0
   ignorePngGamma: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   platformSettings:
   - serializedVersion: 3
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     buildTarget: DefaultTexturePlatform
@@ -73,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -85,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -97,6 +103,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -109,6 +116,33 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
@@ -124,9 +158,9 @@ TextureImporter:
     edges: []
     edges: []
     weights: []
     weights: []
     secondaryTextures: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

+ 37 - 3
GameClient/Assets/ResIn/LoginRes/LoginSkin1/bg_top.png.meta

@@ -3,7 +3,7 @@ guid: a44462a703cec4140b51f676ea3dcd19
 TextureImporter:
 TextureImporter:
   internalIDToNameTable: []
   internalIDToNameTable: []
   externalObjects: {}
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 12
   mipmaps:
   mipmaps:
     mipMapMode: 0
     mipMapMode: 0
     enableMipMap: 0
     enableMipMap: 0
@@ -20,10 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     externalNormalMap: 0
     heightScale: 0.25
     heightScale: 0.25
     normalMapFilter: 0
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
   vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   generateCubemap: 6
   cubemapConvolution: 0
   cubemapConvolution: 0
@@ -62,6 +64,8 @@ TextureImporter:
   textureFormatSet: 0
   textureFormatSet: 0
   ignorePngGamma: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   platformSettings:
   - serializedVersion: 3
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     buildTarget: DefaultTexturePlatform
@@ -73,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -85,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -97,6 +103,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -109,6 +116,33 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
@@ -124,9 +158,9 @@ TextureImporter:
     edges: []
     edges: []
     weights: []
     weights: []
     secondaryTextures: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

+ 37 - 3
GameClient/Assets/ResIn/UI/Activity/Activity_atlas0!a.png.meta

@@ -3,7 +3,7 @@ guid: 2bd9a0f4485bffc49b9c57c256d4c08d
 TextureImporter:
 TextureImporter:
   internalIDToNameTable: []
   internalIDToNameTable: []
   externalObjects: {}
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 12
   mipmaps:
   mipmaps:
     mipMapMode: 0
     mipMapMode: 0
     enableMipMap: 0
     enableMipMap: 0
@@ -20,10 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     externalNormalMap: 0
     heightScale: 0.25
     heightScale: 0.25
     normalMapFilter: 0
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
   vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   generateCubemap: 6
   cubemapConvolution: 0
   cubemapConvolution: 0
@@ -62,6 +64,8 @@ TextureImporter:
   textureFormatSet: 0
   textureFormatSet: 0
   ignorePngGamma: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   platformSettings:
   - serializedVersion: 3
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     buildTarget: DefaultTexturePlatform
@@ -73,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -85,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -97,6 +103,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -109,6 +116,33 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
@@ -124,9 +158,9 @@ TextureImporter:
     edges: []
     edges: []
     weights: []
     weights: []
     secondaryTextures: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

+ 37 - 3
GameClient/Assets/ResIn/UI/Activity/Activity_atlas0.png.meta

@@ -3,7 +3,7 @@ guid: 2a9656f0914538847980b774702b008c
 TextureImporter:
 TextureImporter:
   internalIDToNameTable: []
   internalIDToNameTable: []
   externalObjects: {}
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 12
   mipmaps:
   mipmaps:
     mipMapMode: 0
     mipMapMode: 0
     enableMipMap: 0
     enableMipMap: 0
@@ -20,10 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     externalNormalMap: 0
     heightScale: 0.25
     heightScale: 0.25
     normalMapFilter: 0
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
   vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   generateCubemap: 6
   cubemapConvolution: 0
   cubemapConvolution: 0
@@ -62,6 +64,8 @@ TextureImporter:
   textureFormatSet: 0
   textureFormatSet: 0
   ignorePngGamma: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   platformSettings:
   - serializedVersion: 3
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     buildTarget: DefaultTexturePlatform
@@ -73,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -85,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -97,6 +103,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -109,6 +116,33 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
@@ -124,9 +158,9 @@ TextureImporter:
     edges: []
     edges: []
     weights: []
     weights: []
     secondaryTextures: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

+ 37 - 3
GameClient/Assets/ResIn/UI/Activity/Activity_atlas0_1!a.png.meta

@@ -3,7 +3,7 @@ guid: 8fbb33de14f3ab2439ddd884ea6a7d02
 TextureImporter:
 TextureImporter:
   internalIDToNameTable: []
   internalIDToNameTable: []
   externalObjects: {}
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 12
   mipmaps:
   mipmaps:
     mipMapMode: 0
     mipMapMode: 0
     enableMipMap: 0
     enableMipMap: 0
@@ -20,10 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     externalNormalMap: 0
     heightScale: 0.25
     heightScale: 0.25
     normalMapFilter: 0
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
   vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   generateCubemap: 6
   cubemapConvolution: 0
   cubemapConvolution: 0
@@ -62,6 +64,8 @@ TextureImporter:
   textureFormatSet: 0
   textureFormatSet: 0
   ignorePngGamma: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   platformSettings:
   - serializedVersion: 3
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     buildTarget: DefaultTexturePlatform
@@ -73,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -85,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -97,6 +103,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -109,6 +116,33 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
@@ -124,9 +158,9 @@ TextureImporter:
     edges: []
     edges: []
     weights: []
     weights: []
     secondaryTextures: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

+ 37 - 3
GameClient/Assets/ResIn/UI/Activity/Activity_atlas0_1.png.meta

@@ -3,7 +3,7 @@ guid: 896fb7937882f404fb57bc311346bfcc
 TextureImporter:
 TextureImporter:
   internalIDToNameTable: []
   internalIDToNameTable: []
   externalObjects: {}
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 12
   mipmaps:
   mipmaps:
     mipMapMode: 0
     mipMapMode: 0
     enableMipMap: 0
     enableMipMap: 0
@@ -20,10 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     externalNormalMap: 0
     heightScale: 0.25
     heightScale: 0.25
     normalMapFilter: 0
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
   vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   generateCubemap: 6
   cubemapConvolution: 0
   cubemapConvolution: 0
@@ -62,6 +64,8 @@ TextureImporter:
   textureFormatSet: 0
   textureFormatSet: 0
   ignorePngGamma: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   platformSettings:
   - serializedVersion: 3
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     buildTarget: DefaultTexturePlatform
@@ -73,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -85,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -97,6 +103,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -109,6 +116,33 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
@@ -124,9 +158,9 @@ TextureImporter:
     edges: []
     edges: []
     weights: []
     weights: []
     secondaryTextures: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

+ 37 - 3
GameClient/Assets/ResIn/UI/ActivityAFuGift/ActivityAFuGift_atlas0!a.png.meta

@@ -3,7 +3,7 @@ guid: 6ff94d81478e06d488b83f8685be09ff
 TextureImporter:
 TextureImporter:
   internalIDToNameTable: []
   internalIDToNameTable: []
   externalObjects: {}
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 12
   mipmaps:
   mipmaps:
     mipMapMode: 0
     mipMapMode: 0
     enableMipMap: 0
     enableMipMap: 0
@@ -20,10 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     externalNormalMap: 0
     heightScale: 0.25
     heightScale: 0.25
     normalMapFilter: 0
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
   vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   generateCubemap: 6
   cubemapConvolution: 0
   cubemapConvolution: 0
@@ -62,6 +64,8 @@ TextureImporter:
   textureFormatSet: 0
   textureFormatSet: 0
   ignorePngGamma: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   platformSettings:
   - serializedVersion: 3
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     buildTarget: DefaultTexturePlatform
@@ -73,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -85,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -97,6 +103,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -109,6 +116,33 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
@@ -124,9 +158,9 @@ TextureImporter:
     edges: []
     edges: []
     weights: []
     weights: []
     secondaryTextures: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

+ 37 - 3
GameClient/Assets/ResIn/UI/ActivityAFuGift/ActivityAFuGift_atlas0.png.meta

@@ -3,7 +3,7 @@ guid: 2825f61b975608d4e9170914b5b7707a
 TextureImporter:
 TextureImporter:
   internalIDToNameTable: []
   internalIDToNameTable: []
   externalObjects: {}
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 12
   mipmaps:
   mipmaps:
     mipMapMode: 0
     mipMapMode: 0
     enableMipMap: 0
     enableMipMap: 0
@@ -20,10 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     externalNormalMap: 0
     heightScale: 0.25
     heightScale: 0.25
     normalMapFilter: 0
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
   vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   generateCubemap: 6
   cubemapConvolution: 0
   cubemapConvolution: 0
@@ -62,6 +64,8 @@ TextureImporter:
   textureFormatSet: 0
   textureFormatSet: 0
   ignorePngGamma: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   platformSettings:
   - serializedVersion: 3
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     buildTarget: DefaultTexturePlatform
@@ -73,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -85,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -97,6 +103,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -109,6 +116,33 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
@@ -124,9 +158,9 @@ TextureImporter:
     edges: []
     edges: []
     weights: []
     weights: []
     secondaryTextures: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

+ 37 - 3
GameClient/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0!a.png.meta

@@ -3,7 +3,7 @@ guid: 814beaa44572dc54ca02eecaf5cf4376
 TextureImporter:
 TextureImporter:
   internalIDToNameTable: []
   internalIDToNameTable: []
   externalObjects: {}
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 12
   mipmaps:
   mipmaps:
     mipMapMode: 0
     mipMapMode: 0
     enableMipMap: 0
     enableMipMap: 0
@@ -20,10 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     externalNormalMap: 0
     heightScale: 0.25
     heightScale: 0.25
     normalMapFilter: 0
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
   vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   generateCubemap: 6
   cubemapConvolution: 0
   cubemapConvolution: 0
@@ -62,6 +64,8 @@ TextureImporter:
   textureFormatSet: 0
   textureFormatSet: 0
   ignorePngGamma: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   platformSettings:
   - serializedVersion: 3
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     buildTarget: DefaultTexturePlatform
@@ -73,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -85,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -97,6 +103,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -109,6 +116,33 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
@@ -124,9 +158,9 @@ TextureImporter:
     edges: []
     edges: []
     weights: []
     weights: []
     secondaryTextures: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

+ 37 - 3
GameClient/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0.png.meta

@@ -3,7 +3,7 @@ guid: d2cb548b95026574785e83626fdf2299
 TextureImporter:
 TextureImporter:
   internalIDToNameTable: []
   internalIDToNameTable: []
   externalObjects: {}
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 12
   mipmaps:
   mipmaps:
     mipMapMode: 0
     mipMapMode: 0
     enableMipMap: 0
     enableMipMap: 0
@@ -20,10 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     externalNormalMap: 0
     heightScale: 0.25
     heightScale: 0.25
     normalMapFilter: 0
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
   vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   generateCubemap: 6
   cubemapConvolution: 0
   cubemapConvolution: 0
@@ -62,6 +64,8 @@ TextureImporter:
   textureFormatSet: 0
   textureFormatSet: 0
   ignorePngGamma: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   platformSettings:
   - serializedVersion: 3
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     buildTarget: DefaultTexturePlatform
@@ -73,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -85,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -97,6 +103,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -109,6 +116,33 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
@@ -124,9 +158,9 @@ TextureImporter:
     edges: []
     edges: []
     weights: []
     weights: []
     secondaryTextures: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

+ 37 - 3
GameClient/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0_1!a.png.meta

@@ -3,7 +3,7 @@ guid: 37cf30c6d3bbda8418f24027a9640a42
 TextureImporter:
 TextureImporter:
   internalIDToNameTable: []
   internalIDToNameTable: []
   externalObjects: {}
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 12
   mipmaps:
   mipmaps:
     mipMapMode: 0
     mipMapMode: 0
     enableMipMap: 0
     enableMipMap: 0
@@ -20,10 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     externalNormalMap: 0
     heightScale: 0.25
     heightScale: 0.25
     normalMapFilter: 0
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
   vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   generateCubemap: 6
   cubemapConvolution: 0
   cubemapConvolution: 0
@@ -62,6 +64,8 @@ TextureImporter:
   textureFormatSet: 0
   textureFormatSet: 0
   ignorePngGamma: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   platformSettings:
   - serializedVersion: 3
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     buildTarget: DefaultTexturePlatform
@@ -73,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -85,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -97,6 +103,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -109,6 +116,33 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
@@ -124,9 +158,9 @@ TextureImporter:
     edges: []
     edges: []
     weights: []
     weights: []
     secondaryTextures: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

+ 37 - 3
GameClient/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0_1.png.meta

@@ -3,7 +3,7 @@ guid: abf38dde5bf83d148a30c56a530498b5
 TextureImporter:
 TextureImporter:
   internalIDToNameTable: []
   internalIDToNameTable: []
   externalObjects: {}
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 12
   mipmaps:
   mipmaps:
     mipMapMode: 0
     mipMapMode: 0
     enableMipMap: 0
     enableMipMap: 0
@@ -20,10 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     externalNormalMap: 0
     heightScale: 0.25
     heightScale: 0.25
     normalMapFilter: 0
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
   vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   generateCubemap: 6
   cubemapConvolution: 0
   cubemapConvolution: 0
@@ -62,6 +64,8 @@ TextureImporter:
   textureFormatSet: 0
   textureFormatSet: 0
   ignorePngGamma: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   platformSettings:
   - serializedVersion: 3
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     buildTarget: DefaultTexturePlatform
@@ -73,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -85,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -97,6 +103,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -109,6 +116,33 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
@@ -124,9 +158,9 @@ TextureImporter:
     edges: []
     edges: []
     weights: []
     weights: []
     secondaryTextures: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

+ 49 - 3
GameClient/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0_2!a.png.meta

@@ -3,7 +3,7 @@ guid: beffb798d25e5044fa3cecce83b411b7
 TextureImporter:
 TextureImporter:
   internalIDToNameTable: []
   internalIDToNameTable: []
   externalObjects: {}
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 12
   mipmaps:
   mipmaps:
     mipMapMode: 0
     mipMapMode: 0
     enableMipMap: 0
     enableMipMap: 0
@@ -20,10 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     externalNormalMap: 0
     heightScale: 0.25
     heightScale: 0.25
     normalMapFilter: 0
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
   vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   generateCubemap: 6
   cubemapConvolution: 0
   cubemapConvolution: 0
@@ -62,6 +64,8 @@ TextureImporter:
   textureFormatSet: 0
   textureFormatSet: 0
   ignorePngGamma: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   platformSettings:
   - serializedVersion: 3
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     buildTarget: DefaultTexturePlatform
@@ -73,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -85,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -97,6 +103,46 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
@@ -112,9 +158,9 @@ TextureImporter:
     edges: []
     edges: []
     weights: []
     weights: []
     secondaryTextures: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

+ 49 - 3
GameClient/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0_2.png.meta

@@ -3,7 +3,7 @@ guid: e356af68b295d2646b03a29c244a1bb6
 TextureImporter:
 TextureImporter:
   internalIDToNameTable: []
   internalIDToNameTable: []
   externalObjects: {}
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 12
   mipmaps:
   mipmaps:
     mipMapMode: 0
     mipMapMode: 0
     enableMipMap: 0
     enableMipMap: 0
@@ -20,10 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     externalNormalMap: 0
     heightScale: 0.25
     heightScale: 0.25
     normalMapFilter: 0
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
   vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   generateCubemap: 6
   cubemapConvolution: 0
   cubemapConvolution: 0
@@ -62,6 +64,8 @@ TextureImporter:
   textureFormatSet: 0
   textureFormatSet: 0
   ignorePngGamma: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   platformSettings:
   - serializedVersion: 3
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     buildTarget: DefaultTexturePlatform
@@ -73,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -85,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -97,6 +103,46 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
@@ -112,9 +158,9 @@ TextureImporter:
     edges: []
     edges: []
     weights: []
     weights: []
     secondaryTextures: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

+ 49 - 3
GameClient/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0_3!a.png.meta

@@ -3,7 +3,7 @@ guid: ccc433881cb904548bb2875c70a44080
 TextureImporter:
 TextureImporter:
   internalIDToNameTable: []
   internalIDToNameTable: []
   externalObjects: {}
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 12
   mipmaps:
   mipmaps:
     mipMapMode: 0
     mipMapMode: 0
     enableMipMap: 0
     enableMipMap: 0
@@ -20,10 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     externalNormalMap: 0
     heightScale: 0.25
     heightScale: 0.25
     normalMapFilter: 0
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
   vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   generateCubemap: 6
   cubemapConvolution: 0
   cubemapConvolution: 0
@@ -62,6 +64,8 @@ TextureImporter:
   textureFormatSet: 0
   textureFormatSet: 0
   ignorePngGamma: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   platformSettings:
   - serializedVersion: 3
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     buildTarget: DefaultTexturePlatform
@@ -73,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -85,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -97,6 +103,46 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
@@ -112,9 +158,9 @@ TextureImporter:
     edges: []
     edges: []
     weights: []
     weights: []
     secondaryTextures: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

+ 49 - 3
GameClient/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0_3.png.meta

@@ -3,7 +3,7 @@ guid: 86c6ff00f1ed8b641bb744bfc7388279
 TextureImporter:
 TextureImporter:
   internalIDToNameTable: []
   internalIDToNameTable: []
   externalObjects: {}
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 12
   mipmaps:
   mipmaps:
     mipMapMode: 0
     mipMapMode: 0
     enableMipMap: 0
     enableMipMap: 0
@@ -20,10 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     externalNormalMap: 0
     heightScale: 0.25
     heightScale: 0.25
     normalMapFilter: 0
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
   vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   generateCubemap: 6
   cubemapConvolution: 0
   cubemapConvolution: 0
@@ -62,6 +64,8 @@ TextureImporter:
   textureFormatSet: 0
   textureFormatSet: 0
   ignorePngGamma: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   platformSettings:
   - serializedVersion: 3
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     buildTarget: DefaultTexturePlatform
@@ -73,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -85,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -97,6 +103,46 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
@@ -112,9 +158,9 @@ TextureImporter:
     edges: []
     edges: []
     weights: []
     weights: []
     secondaryTextures: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

+ 37 - 3
GameClient/Assets/ResIn/UI/ActivityDay7/ActivityDay7_atlas0!a.png.meta

@@ -3,7 +3,7 @@ guid: 1d19a171fa1c345889ee033d2cb86f34
 TextureImporter:
 TextureImporter:
   internalIDToNameTable: []
   internalIDToNameTable: []
   externalObjects: {}
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 12
   mipmaps:
   mipmaps:
     mipMapMode: 0
     mipMapMode: 0
     enableMipMap: 0
     enableMipMap: 0
@@ -20,10 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     externalNormalMap: 0
     heightScale: 0.25
     heightScale: 0.25
     normalMapFilter: 0
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
   vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   generateCubemap: 6
   cubemapConvolution: 0
   cubemapConvolution: 0
@@ -62,6 +64,8 @@ TextureImporter:
   textureFormatSet: 0
   textureFormatSet: 0
   ignorePngGamma: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   platformSettings:
   - serializedVersion: 3
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     buildTarget: DefaultTexturePlatform
@@ -73,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -85,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -97,6 +103,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -109,6 +116,33 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
@@ -124,9 +158,9 @@ TextureImporter:
     edges: []
     edges: []
     weights: []
     weights: []
     secondaryTextures: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

+ 37 - 3
GameClient/Assets/ResIn/UI/ActivityDay7/ActivityDay7_atlas0.png.meta

@@ -3,7 +3,7 @@ guid: dd4354c8a423e4af4abb677e3fb58cd5
 TextureImporter:
 TextureImporter:
   internalIDToNameTable: []
   internalIDToNameTable: []
   externalObjects: {}
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 12
   mipmaps:
   mipmaps:
     mipMapMode: 0
     mipMapMode: 0
     enableMipMap: 0
     enableMipMap: 0
@@ -20,10 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     externalNormalMap: 0
     heightScale: 0.25
     heightScale: 0.25
     normalMapFilter: 0
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
   vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   generateCubemap: 6
   cubemapConvolution: 0
   cubemapConvolution: 0
@@ -62,6 +64,8 @@ TextureImporter:
   textureFormatSet: 0
   textureFormatSet: 0
   ignorePngGamma: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   platformSettings:
   - serializedVersion: 3
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     buildTarget: DefaultTexturePlatform
@@ -73,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -85,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -97,6 +103,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -109,6 +116,33 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
@@ -124,9 +158,9 @@ TextureImporter:
     edges: []
     edges: []
     weights: []
     weights: []
     secondaryTextures: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

+ 37 - 3
GameClient/Assets/ResIn/UI/ActivityGetYuanXiao/ActivityGetYuanXiao_atlas0!a.png.meta

@@ -3,7 +3,7 @@ guid: e9a5602c188271243ac21faee1fdf3c0
 TextureImporter:
 TextureImporter:
   internalIDToNameTable: []
   internalIDToNameTable: []
   externalObjects: {}
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 12
   mipmaps:
   mipmaps:
     mipMapMode: 0
     mipMapMode: 0
     enableMipMap: 0
     enableMipMap: 0
@@ -20,10 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     externalNormalMap: 0
     heightScale: 0.25
     heightScale: 0.25
     normalMapFilter: 0
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
   vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   generateCubemap: 6
   cubemapConvolution: 0
   cubemapConvolution: 0
@@ -62,6 +64,8 @@ TextureImporter:
   textureFormatSet: 0
   textureFormatSet: 0
   ignorePngGamma: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   platformSettings:
   - serializedVersion: 3
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     buildTarget: DefaultTexturePlatform
@@ -73,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -85,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -97,6 +103,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -109,6 +116,33 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
@@ -124,9 +158,9 @@ TextureImporter:
     edges: []
     edges: []
     weights: []
     weights: []
     secondaryTextures: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

+ 37 - 3
GameClient/Assets/ResIn/UI/ActivityGetYuanXiao/ActivityGetYuanXiao_atlas0.png.meta

@@ -3,7 +3,7 @@ guid: 675e049f41b956e4cab5901caf9bd1c2
 TextureImporter:
 TextureImporter:
   internalIDToNameTable: []
   internalIDToNameTable: []
   externalObjects: {}
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 12
   mipmaps:
   mipmaps:
     mipMapMode: 0
     mipMapMode: 0
     enableMipMap: 0
     enableMipMap: 0
@@ -20,10 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     externalNormalMap: 0
     heightScale: 0.25
     heightScale: 0.25
     normalMapFilter: 0
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
   vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   generateCubemap: 6
   cubemapConvolution: 0
   cubemapConvolution: 0
@@ -62,6 +64,8 @@ TextureImporter:
   textureFormatSet: 0
   textureFormatSet: 0
   ignorePngGamma: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   platformSettings:
   - serializedVersion: 3
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     buildTarget: DefaultTexturePlatform
@@ -73,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -85,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -97,6 +103,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -109,6 +116,33 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
@@ -124,9 +158,9 @@ TextureImporter:
     edges: []
     edges: []
     weights: []
     weights: []
     secondaryTextures: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

+ 37 - 3
GameClient/Assets/ResIn/UI/ActivityGetYuanXiao/ActivityGetYuanXiao_atlas0_1!a.png.meta

@@ -3,7 +3,7 @@ guid: 6e9752c4ad758bb438e73c3b0fbf9a77
 TextureImporter:
 TextureImporter:
   internalIDToNameTable: []
   internalIDToNameTable: []
   externalObjects: {}
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 12
   mipmaps:
   mipmaps:
     mipMapMode: 0
     mipMapMode: 0
     enableMipMap: 0
     enableMipMap: 0
@@ -20,10 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     externalNormalMap: 0
     heightScale: 0.25
     heightScale: 0.25
     normalMapFilter: 0
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
   vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   generateCubemap: 6
   cubemapConvolution: 0
   cubemapConvolution: 0
@@ -62,6 +64,8 @@ TextureImporter:
   textureFormatSet: 0
   textureFormatSet: 0
   ignorePngGamma: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   platformSettings:
   - serializedVersion: 3
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     buildTarget: DefaultTexturePlatform
@@ -73,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -85,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -97,6 +103,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -109,6 +116,33 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
@@ -124,9 +158,9 @@ TextureImporter:
     edges: []
     edges: []
     weights: []
     weights: []
     secondaryTextures: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

+ 37 - 3
GameClient/Assets/ResIn/UI/ActivityGetYuanXiao/ActivityGetYuanXiao_atlas0_1.png.meta

@@ -3,7 +3,7 @@ guid: a9d35173f0aa83945b2c365290280380
 TextureImporter:
 TextureImporter:
   internalIDToNameTable: []
   internalIDToNameTable: []
   externalObjects: {}
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 12
   mipmaps:
   mipmaps:
     mipMapMode: 0
     mipMapMode: 0
     enableMipMap: 0
     enableMipMap: 0
@@ -20,10 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     externalNormalMap: 0
     heightScale: 0.25
     heightScale: 0.25
     normalMapFilter: 0
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
   vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   generateCubemap: 6
   cubemapConvolution: 0
   cubemapConvolution: 0
@@ -62,6 +64,8 @@ TextureImporter:
   textureFormatSet: 0
   textureFormatSet: 0
   ignorePngGamma: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   platformSettings:
   - serializedVersion: 3
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     buildTarget: DefaultTexturePlatform
@@ -73,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -85,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -97,6 +103,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -109,6 +116,33 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
@@ -124,9 +158,9 @@ TextureImporter:
     edges: []
     edges: []
     weights: []
     weights: []
     secondaryTextures: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

+ 49 - 3
GameClient/Assets/ResIn/UI/ActivityGetYuanXiao/ActivityGetYuanXiao_atlas0_2!a.png.meta

@@ -3,7 +3,7 @@ guid: 9118c63ef9ba2664282e7fb3924e6da9
 TextureImporter:
 TextureImporter:
   internalIDToNameTable: []
   internalIDToNameTable: []
   externalObjects: {}
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 12
   mipmaps:
   mipmaps:
     mipMapMode: 0
     mipMapMode: 0
     enableMipMap: 0
     enableMipMap: 0
@@ -20,10 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     externalNormalMap: 0
     heightScale: 0.25
     heightScale: 0.25
     normalMapFilter: 0
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
   vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   generateCubemap: 6
   cubemapConvolution: 0
   cubemapConvolution: 0
@@ -62,6 +64,8 @@ TextureImporter:
   textureFormatSet: 0
   textureFormatSet: 0
   ignorePngGamma: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   platformSettings:
   - serializedVersion: 3
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     buildTarget: DefaultTexturePlatform
@@ -73,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -85,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -97,6 +103,46 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
@@ -112,9 +158,9 @@ TextureImporter:
     edges: []
     edges: []
     weights: []
     weights: []
     secondaryTextures: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

+ 49 - 3
GameClient/Assets/ResIn/UI/ActivityGetYuanXiao/ActivityGetYuanXiao_atlas0_2.png.meta

@@ -3,7 +3,7 @@ guid: a56b512470aae544fb3ceb132befd5d5
 TextureImporter:
 TextureImporter:
   internalIDToNameTable: []
   internalIDToNameTable: []
   externalObjects: {}
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 12
   mipmaps:
   mipmaps:
     mipMapMode: 0
     mipMapMode: 0
     enableMipMap: 0
     enableMipMap: 0
@@ -20,10 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     externalNormalMap: 0
     heightScale: 0.25
     heightScale: 0.25
     normalMapFilter: 0
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
   vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   generateCubemap: 6
   cubemapConvolution: 0
   cubemapConvolution: 0
@@ -62,6 +64,8 @@ TextureImporter:
   textureFormatSet: 0
   textureFormatSet: 0
   ignorePngGamma: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   platformSettings:
   - serializedVersion: 3
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     buildTarget: DefaultTexturePlatform
@@ -73,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -85,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -97,6 +103,46 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
@@ -112,9 +158,9 @@ TextureImporter:
     edges: []
     edges: []
     weights: []
     weights: []
     secondaryTextures: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

+ 37 - 3
GameClient/Assets/ResIn/UI/ActivityGetYuanXiaoUI/ActivityGetYuanXiao_atlas0!a.png.meta

@@ -3,7 +3,7 @@ guid: 09efcd8d201ef82419732359a01f0129
 TextureImporter:
 TextureImporter:
   internalIDToNameTable: []
   internalIDToNameTable: []
   externalObjects: {}
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 12
   mipmaps:
   mipmaps:
     mipMapMode: 0
     mipMapMode: 0
     enableMipMap: 0
     enableMipMap: 0
@@ -20,10 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     externalNormalMap: 0
     heightScale: 0.25
     heightScale: 0.25
     normalMapFilter: 0
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
   vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   generateCubemap: 6
   cubemapConvolution: 0
   cubemapConvolution: 0
@@ -62,6 +64,8 @@ TextureImporter:
   textureFormatSet: 0
   textureFormatSet: 0
   ignorePngGamma: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   platformSettings:
   - serializedVersion: 3
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     buildTarget: DefaultTexturePlatform
@@ -73,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -85,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -97,6 +103,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -109,6 +116,33 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
@@ -124,9 +158,9 @@ TextureImporter:
     edges: []
     edges: []
     weights: []
     weights: []
     secondaryTextures: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

+ 37 - 3
GameClient/Assets/ResIn/UI/ActivityGetYuanXiaoUI/ActivityGetYuanXiao_atlas0.png.meta

@@ -3,7 +3,7 @@ guid: fe65a24147a454d4590cdd1f82177f0d
 TextureImporter:
 TextureImporter:
   internalIDToNameTable: []
   internalIDToNameTable: []
   externalObjects: {}
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 12
   mipmaps:
   mipmaps:
     mipMapMode: 0
     mipMapMode: 0
     enableMipMap: 0
     enableMipMap: 0
@@ -20,10 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     externalNormalMap: 0
     heightScale: 0.25
     heightScale: 0.25
     normalMapFilter: 0
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
   vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   generateCubemap: 6
   cubemapConvolution: 0
   cubemapConvolution: 0
@@ -62,6 +64,8 @@ TextureImporter:
   textureFormatSet: 0
   textureFormatSet: 0
   ignorePngGamma: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   platformSettings:
   - serializedVersion: 3
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     buildTarget: DefaultTexturePlatform
@@ -73,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -85,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -97,6 +103,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -109,6 +116,33 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
@@ -124,9 +158,9 @@ TextureImporter:
     edges: []
     edges: []
     weights: []
     weights: []
     secondaryTextures: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

+ 37 - 3
GameClient/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0!a.png.meta

@@ -3,7 +3,7 @@ guid: ad64f0ccb811e1049ad4cd8b2be00c5f
 TextureImporter:
 TextureImporter:
   internalIDToNameTable: []
   internalIDToNameTable: []
   externalObjects: {}
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 12
   mipmaps:
   mipmaps:
     mipMapMode: 0
     mipMapMode: 0
     enableMipMap: 0
     enableMipMap: 0
@@ -20,10 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     externalNormalMap: 0
     heightScale: 0.25
     heightScale: 0.25
     normalMapFilter: 0
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
   vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   generateCubemap: 6
   cubemapConvolution: 0
   cubemapConvolution: 0
@@ -62,6 +64,8 @@ TextureImporter:
   textureFormatSet: 0
   textureFormatSet: 0
   ignorePngGamma: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   platformSettings:
   - serializedVersion: 3
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     buildTarget: DefaultTexturePlatform
@@ -73,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -85,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -97,6 +103,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -109,6 +116,33 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
@@ -124,9 +158,9 @@ TextureImporter:
     edges: []
     edges: []
     weights: []
     weights: []
     secondaryTextures: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

+ 37 - 3
GameClient/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0.png.meta

@@ -3,7 +3,7 @@ guid: 07315bd7b945b6946997e6346973ad77
 TextureImporter:
 TextureImporter:
   internalIDToNameTable: []
   internalIDToNameTable: []
   externalObjects: {}
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 12
   mipmaps:
   mipmaps:
     mipMapMode: 0
     mipMapMode: 0
     enableMipMap: 0
     enableMipMap: 0
@@ -20,10 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     externalNormalMap: 0
     heightScale: 0.25
     heightScale: 0.25
     normalMapFilter: 0
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
   vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   generateCubemap: 6
   cubemapConvolution: 0
   cubemapConvolution: 0
@@ -62,6 +64,8 @@ TextureImporter:
   textureFormatSet: 0
   textureFormatSet: 0
   ignorePngGamma: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   platformSettings:
   - serializedVersion: 3
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     buildTarget: DefaultTexturePlatform
@@ -73,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -85,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -97,6 +103,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -109,6 +116,33 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
@@ -124,9 +158,9 @@ TextureImporter:
     edges: []
     edges: []
     weights: []
     weights: []
     secondaryTextures: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

+ 37 - 3
GameClient/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0_1!a.png.meta

@@ -3,7 +3,7 @@ guid: 527f02f57d860a447ae5ed332ac7512c
 TextureImporter:
 TextureImporter:
   internalIDToNameTable: []
   internalIDToNameTable: []
   externalObjects: {}
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 12
   mipmaps:
   mipmaps:
     mipMapMode: 0
     mipMapMode: 0
     enableMipMap: 0
     enableMipMap: 0
@@ -20,10 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     externalNormalMap: 0
     heightScale: 0.25
     heightScale: 0.25
     normalMapFilter: 0
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
   vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   generateCubemap: 6
   cubemapConvolution: 0
   cubemapConvolution: 0
@@ -62,6 +64,8 @@ TextureImporter:
   textureFormatSet: 0
   textureFormatSet: 0
   ignorePngGamma: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   platformSettings:
   - serializedVersion: 3
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     buildTarget: DefaultTexturePlatform
@@ -73,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -85,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -97,6 +103,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -109,6 +116,33 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
@@ -124,9 +158,9 @@ TextureImporter:
     edges: []
     edges: []
     weights: []
     weights: []
     secondaryTextures: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

+ 37 - 3
GameClient/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0_1.png.meta

@@ -3,7 +3,7 @@ guid: b214dcd725a277546b1080d013ed708f
 TextureImporter:
 TextureImporter:
   internalIDToNameTable: []
   internalIDToNameTable: []
   externalObjects: {}
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 12
   mipmaps:
   mipmaps:
     mipMapMode: 0
     mipMapMode: 0
     enableMipMap: 0
     enableMipMap: 0
@@ -20,10 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     externalNormalMap: 0
     heightScale: 0.25
     heightScale: 0.25
     normalMapFilter: 0
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
   vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   generateCubemap: 6
   cubemapConvolution: 0
   cubemapConvolution: 0
@@ -62,6 +64,8 @@ TextureImporter:
   textureFormatSet: 0
   textureFormatSet: 0
   ignorePngGamma: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   platformSettings:
   - serializedVersion: 3
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     buildTarget: DefaultTexturePlatform
@@ -73,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -85,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -97,6 +103,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -109,6 +116,33 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
@@ -124,9 +158,9 @@ TextureImporter:
     edges: []
     edges: []
     weights: []
     weights: []
     secondaryTextures: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

+ 37 - 3
GameClient/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0_2!a.png.meta

@@ -3,7 +3,7 @@ guid: ee4883bc7954b8a43a3a57e89e50b3bd
 TextureImporter:
 TextureImporter:
   internalIDToNameTable: []
   internalIDToNameTable: []
   externalObjects: {}
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 12
   mipmaps:
   mipmaps:
     mipMapMode: 0
     mipMapMode: 0
     enableMipMap: 0
     enableMipMap: 0
@@ -20,10 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     externalNormalMap: 0
     heightScale: 0.25
     heightScale: 0.25
     normalMapFilter: 0
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
   vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   generateCubemap: 6
   cubemapConvolution: 0
   cubemapConvolution: 0
@@ -62,6 +64,8 @@ TextureImporter:
   textureFormatSet: 0
   textureFormatSet: 0
   ignorePngGamma: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   platformSettings:
   - serializedVersion: 3
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     buildTarget: DefaultTexturePlatform
@@ -73,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -85,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -97,6 +103,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -109,6 +116,33 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
@@ -124,9 +158,9 @@ TextureImporter:
     edges: []
     edges: []
     weights: []
     weights: []
     secondaryTextures: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

+ 37 - 3
GameClient/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0_2.png.meta

@@ -3,7 +3,7 @@ guid: 662d0f911a389924d86458873ad30140
 TextureImporter:
 TextureImporter:
   internalIDToNameTable: []
   internalIDToNameTable: []
   externalObjects: {}
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 12
   mipmaps:
   mipmaps:
     mipMapMode: 0
     mipMapMode: 0
     enableMipMap: 0
     enableMipMap: 0
@@ -20,10 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     externalNormalMap: 0
     heightScale: 0.25
     heightScale: 0.25
     normalMapFilter: 0
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
   vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   generateCubemap: 6
   cubemapConvolution: 0
   cubemapConvolution: 0
@@ -62,6 +64,8 @@ TextureImporter:
   textureFormatSet: 0
   textureFormatSet: 0
   ignorePngGamma: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   platformSettings:
   - serializedVersion: 3
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     buildTarget: DefaultTexturePlatform
@@ -73,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -85,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -97,6 +103,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -109,6 +116,33 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
@@ -124,9 +158,9 @@ TextureImporter:
     edges: []
     edges: []
     weights: []
     weights: []
     secondaryTextures: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

+ 37 - 3
GameClient/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0_3!a.png.meta

@@ -3,7 +3,7 @@ guid: e88e89b03b2a66d408935403b655bb2b
 TextureImporter:
 TextureImporter:
   internalIDToNameTable: []
   internalIDToNameTable: []
   externalObjects: {}
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 12
   mipmaps:
   mipmaps:
     mipMapMode: 0
     mipMapMode: 0
     enableMipMap: 0
     enableMipMap: 0
@@ -20,10 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     externalNormalMap: 0
     heightScale: 0.25
     heightScale: 0.25
     normalMapFilter: 0
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
   vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   generateCubemap: 6
   cubemapConvolution: 0
   cubemapConvolution: 0
@@ -62,6 +64,8 @@ TextureImporter:
   textureFormatSet: 0
   textureFormatSet: 0
   ignorePngGamma: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   platformSettings:
   - serializedVersion: 3
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     buildTarget: DefaultTexturePlatform
@@ -73,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -85,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -97,6 +103,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -109,6 +116,33 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
@@ -124,9 +158,9 @@ TextureImporter:
     edges: []
     edges: []
     weights: []
     weights: []
     secondaryTextures: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

+ 37 - 3
GameClient/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0_3.png.meta

@@ -3,7 +3,7 @@ guid: dc1841433e821034580e6b37bed614c8
 TextureImporter:
 TextureImporter:
   internalIDToNameTable: []
   internalIDToNameTable: []
   externalObjects: {}
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 12
   mipmaps:
   mipmaps:
     mipMapMode: 0
     mipMapMode: 0
     enableMipMap: 0
     enableMipMap: 0
@@ -20,10 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     externalNormalMap: 0
     heightScale: 0.25
     heightScale: 0.25
     normalMapFilter: 0
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
   vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   generateCubemap: 6
   cubemapConvolution: 0
   cubemapConvolution: 0
@@ -62,6 +64,8 @@ TextureImporter:
   textureFormatSet: 0
   textureFormatSet: 0
   ignorePngGamma: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   platformSettings:
   - serializedVersion: 3
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     buildTarget: DefaultTexturePlatform
@@ -73,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -85,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -97,6 +103,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -109,6 +116,33 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
@@ -124,9 +158,9 @@ TextureImporter:
     edges: []
     edges: []
     weights: []
     weights: []
     secondaryTextures: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

+ 37 - 3
GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0!a.png.meta

@@ -3,7 +3,7 @@ guid: 6af281eead1622246a786369e687873f
 TextureImporter:
 TextureImporter:
   internalIDToNameTable: []
   internalIDToNameTable: []
   externalObjects: {}
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 12
   mipmaps:
   mipmaps:
     mipMapMode: 0
     mipMapMode: 0
     enableMipMap: 0
     enableMipMap: 0
@@ -20,10 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     externalNormalMap: 0
     heightScale: 0.25
     heightScale: 0.25
     normalMapFilter: 0
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
   vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   generateCubemap: 6
   cubemapConvolution: 0
   cubemapConvolution: 0
@@ -62,6 +64,8 @@ TextureImporter:
   textureFormatSet: 0
   textureFormatSet: 0
   ignorePngGamma: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   platformSettings:
   - serializedVersion: 3
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     buildTarget: DefaultTexturePlatform
@@ -73,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -85,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -97,6 +103,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -109,6 +116,33 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
@@ -124,9 +158,9 @@ TextureImporter:
     edges: []
     edges: []
     weights: []
     weights: []
     secondaryTextures: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

+ 37 - 3
GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0.png.meta

@@ -3,7 +3,7 @@ guid: 0a3e0eed9d6595142b1ae3c7a81e7ad4
 TextureImporter:
 TextureImporter:
   internalIDToNameTable: []
   internalIDToNameTable: []
   externalObjects: {}
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 12
   mipmaps:
   mipmaps:
     mipMapMode: 0
     mipMapMode: 0
     enableMipMap: 0
     enableMipMap: 0
@@ -20,10 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     externalNormalMap: 0
     heightScale: 0.25
     heightScale: 0.25
     normalMapFilter: 0
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
   vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   generateCubemap: 6
   cubemapConvolution: 0
   cubemapConvolution: 0
@@ -62,6 +64,8 @@ TextureImporter:
   textureFormatSet: 0
   textureFormatSet: 0
   ignorePngGamma: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   platformSettings:
   - serializedVersion: 3
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     buildTarget: DefaultTexturePlatform
@@ -73,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -85,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -97,6 +103,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -109,6 +116,33 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
@@ -124,9 +158,9 @@ TextureImporter:
     edges: []
     edges: []
     weights: []
     weights: []
     secondaryTextures: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

+ 37 - 3
GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_1!a.png.meta

@@ -3,7 +3,7 @@ guid: 1dd80d73443ec35419d63dafe6248a5f
 TextureImporter:
 TextureImporter:
   internalIDToNameTable: []
   internalIDToNameTable: []
   externalObjects: {}
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 12
   mipmaps:
   mipmaps:
     mipMapMode: 0
     mipMapMode: 0
     enableMipMap: 0
     enableMipMap: 0
@@ -20,10 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     externalNormalMap: 0
     heightScale: 0.25
     heightScale: 0.25
     normalMapFilter: 0
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
   vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   generateCubemap: 6
   cubemapConvolution: 0
   cubemapConvolution: 0
@@ -62,6 +64,8 @@ TextureImporter:
   textureFormatSet: 0
   textureFormatSet: 0
   ignorePngGamma: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   platformSettings:
   - serializedVersion: 3
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     buildTarget: DefaultTexturePlatform
@@ -73,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -85,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -97,6 +103,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -109,6 +116,33 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
@@ -124,9 +158,9 @@ TextureImporter:
     edges: []
     edges: []
     weights: []
     weights: []
     secondaryTextures: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

+ 37 - 3
GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_1.png.meta

@@ -3,7 +3,7 @@ guid: 12afb7cfda9082b45bece8c8597b4c16
 TextureImporter:
 TextureImporter:
   internalIDToNameTable: []
   internalIDToNameTable: []
   externalObjects: {}
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 12
   mipmaps:
   mipmaps:
     mipMapMode: 0
     mipMapMode: 0
     enableMipMap: 0
     enableMipMap: 0
@@ -20,10 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     externalNormalMap: 0
     heightScale: 0.25
     heightScale: 0.25
     normalMapFilter: 0
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
   vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   generateCubemap: 6
   cubemapConvolution: 0
   cubemapConvolution: 0
@@ -62,6 +64,8 @@ TextureImporter:
   textureFormatSet: 0
   textureFormatSet: 0
   ignorePngGamma: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   platformSettings:
   - serializedVersion: 3
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     buildTarget: DefaultTexturePlatform
@@ -73,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -85,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -97,6 +103,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -109,6 +116,33 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
@@ -124,9 +158,9 @@ TextureImporter:
     edges: []
     edges: []
     weights: []
     weights: []
     secondaryTextures: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

+ 49 - 3
GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_10!a.png.meta

@@ -3,7 +3,7 @@ guid: 353cdf1274fdd2c4ba321d2e1d0db774
 TextureImporter:
 TextureImporter:
   internalIDToNameTable: []
   internalIDToNameTable: []
   externalObjects: {}
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 12
   mipmaps:
   mipmaps:
     mipMapMode: 0
     mipMapMode: 0
     enableMipMap: 0
     enableMipMap: 0
@@ -20,10 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     externalNormalMap: 0
     heightScale: 0.25
     heightScale: 0.25
     normalMapFilter: 0
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
   vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   generateCubemap: 6
   cubemapConvolution: 0
   cubemapConvolution: 0
@@ -62,6 +64,8 @@ TextureImporter:
   textureFormatSet: 0
   textureFormatSet: 0
   ignorePngGamma: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   platformSettings:
   - serializedVersion: 3
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     buildTarget: DefaultTexturePlatform
@@ -73,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -85,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -97,6 +103,46 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
@@ -112,9 +158,9 @@ TextureImporter:
     edges: []
     edges: []
     weights: []
     weights: []
     secondaryTextures: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

+ 49 - 3
GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_10.png.meta

@@ -3,7 +3,7 @@ guid: e5a882b5c2cd86449a6178cc215bd659
 TextureImporter:
 TextureImporter:
   internalIDToNameTable: []
   internalIDToNameTable: []
   externalObjects: {}
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 12
   mipmaps:
   mipmaps:
     mipMapMode: 0
     mipMapMode: 0
     enableMipMap: 0
     enableMipMap: 0
@@ -20,10 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     externalNormalMap: 0
     heightScale: 0.25
     heightScale: 0.25
     normalMapFilter: 0
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
   vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   generateCubemap: 6
   cubemapConvolution: 0
   cubemapConvolution: 0
@@ -62,6 +64,8 @@ TextureImporter:
   textureFormatSet: 0
   textureFormatSet: 0
   ignorePngGamma: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   platformSettings:
   - serializedVersion: 3
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     buildTarget: DefaultTexturePlatform
@@ -73,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -85,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -97,6 +103,46 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
@@ -112,9 +158,9 @@ TextureImporter:
     edges: []
     edges: []
     weights: []
     weights: []
     secondaryTextures: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

+ 37 - 3
GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_2!a.png.meta

@@ -3,7 +3,7 @@ guid: 4ac94aef6762b0844a81844d86852baa
 TextureImporter:
 TextureImporter:
   internalIDToNameTable: []
   internalIDToNameTable: []
   externalObjects: {}
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 12
   mipmaps:
   mipmaps:
     mipMapMode: 0
     mipMapMode: 0
     enableMipMap: 0
     enableMipMap: 0
@@ -20,10 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     externalNormalMap: 0
     heightScale: 0.25
     heightScale: 0.25
     normalMapFilter: 0
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
   vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   generateCubemap: 6
   cubemapConvolution: 0
   cubemapConvolution: 0
@@ -62,6 +64,8 @@ TextureImporter:
   textureFormatSet: 0
   textureFormatSet: 0
   ignorePngGamma: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   platformSettings:
   - serializedVersion: 3
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     buildTarget: DefaultTexturePlatform
@@ -73,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -85,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -97,6 +103,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -109,6 +116,33 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
@@ -124,9 +158,9 @@ TextureImporter:
     edges: []
     edges: []
     weights: []
     weights: []
     secondaryTextures: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

+ 37 - 3
GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_2.png.meta

@@ -3,7 +3,7 @@ guid: 8276b37fc26141e44848cf34c4d54e3b
 TextureImporter:
 TextureImporter:
   internalIDToNameTable: []
   internalIDToNameTable: []
   externalObjects: {}
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 12
   mipmaps:
   mipmaps:
     mipMapMode: 0
     mipMapMode: 0
     enableMipMap: 0
     enableMipMap: 0
@@ -20,10 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     externalNormalMap: 0
     heightScale: 0.25
     heightScale: 0.25
     normalMapFilter: 0
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
   vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   generateCubemap: 6
   cubemapConvolution: 0
   cubemapConvolution: 0
@@ -62,6 +64,8 @@ TextureImporter:
   textureFormatSet: 0
   textureFormatSet: 0
   ignorePngGamma: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   platformSettings:
   - serializedVersion: 3
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     buildTarget: DefaultTexturePlatform
@@ -73,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -85,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -97,6 +103,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -109,6 +116,33 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
@@ -124,9 +158,9 @@ TextureImporter:
     edges: []
     edges: []
     weights: []
     weights: []
     secondaryTextures: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

+ 37 - 3
GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_3!a.png.meta

@@ -3,7 +3,7 @@ guid: e8a4f7f9ea6eac24cb71ef6c45e1cf16
 TextureImporter:
 TextureImporter:
   internalIDToNameTable: []
   internalIDToNameTable: []
   externalObjects: {}
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 12
   mipmaps:
   mipmaps:
     mipMapMode: 0
     mipMapMode: 0
     enableMipMap: 0
     enableMipMap: 0
@@ -20,10 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     externalNormalMap: 0
     heightScale: 0.25
     heightScale: 0.25
     normalMapFilter: 0
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
   vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   generateCubemap: 6
   cubemapConvolution: 0
   cubemapConvolution: 0
@@ -62,6 +64,8 @@ TextureImporter:
   textureFormatSet: 0
   textureFormatSet: 0
   ignorePngGamma: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   platformSettings:
   - serializedVersion: 3
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     buildTarget: DefaultTexturePlatform
@@ -73,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -85,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -97,6 +103,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -109,6 +116,33 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
@@ -124,9 +158,9 @@ TextureImporter:
     edges: []
     edges: []
     weights: []
     weights: []
     secondaryTextures: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

+ 37 - 3
GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_3.png.meta

@@ -3,7 +3,7 @@ guid: 850a7b30f836e6641a4ac5cc71eeb528
 TextureImporter:
 TextureImporter:
   internalIDToNameTable: []
   internalIDToNameTable: []
   externalObjects: {}
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 12
   mipmaps:
   mipmaps:
     mipMapMode: 0
     mipMapMode: 0
     enableMipMap: 0
     enableMipMap: 0
@@ -20,10 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     externalNormalMap: 0
     heightScale: 0.25
     heightScale: 0.25
     normalMapFilter: 0
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
   vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   generateCubemap: 6
   cubemapConvolution: 0
   cubemapConvolution: 0
@@ -62,6 +64,8 @@ TextureImporter:
   textureFormatSet: 0
   textureFormatSet: 0
   ignorePngGamma: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   platformSettings:
   - serializedVersion: 3
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     buildTarget: DefaultTexturePlatform
@@ -73,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -85,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -97,6 +103,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -109,6 +116,33 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
@@ -124,9 +158,9 @@ TextureImporter:
     edges: []
     edges: []
     weights: []
     weights: []
     secondaryTextures: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

+ 37 - 3
GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_4!a.png.meta

@@ -3,7 +3,7 @@ guid: 9b4b18cd60ad0c54fa345c5707c788df
 TextureImporter:
 TextureImporter:
   internalIDToNameTable: []
   internalIDToNameTable: []
   externalObjects: {}
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 12
   mipmaps:
   mipmaps:
     mipMapMode: 0
     mipMapMode: 0
     enableMipMap: 0
     enableMipMap: 0
@@ -20,10 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     externalNormalMap: 0
     heightScale: 0.25
     heightScale: 0.25
     normalMapFilter: 0
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
   vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   generateCubemap: 6
   cubemapConvolution: 0
   cubemapConvolution: 0
@@ -62,6 +64,8 @@ TextureImporter:
   textureFormatSet: 0
   textureFormatSet: 0
   ignorePngGamma: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   platformSettings:
   - serializedVersion: 3
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     buildTarget: DefaultTexturePlatform
@@ -73,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -85,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -97,6 +103,7 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
   - serializedVersion: 3
@@ -109,6 +116,33 @@ TextureImporter:
     crunchedCompression: 0
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     allowsAlphaSplitting: 0
     overridden: 1
     overridden: 1
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
   spriteSheet:
@@ -124,9 +158,9 @@ TextureImporter:
     edges: []
     edges: []
     weights: []
     weights: []
     secondaryTextures: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   userData: 
   assetBundleName: 
   assetBundleName: 
   assetBundleVariant: 
   assetBundleVariant: 

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików