zhangqiang
|
61091dabd2
|
【资源导入】静态立绘 + 头像
|
2021-02-18 18:35:43 +08:00 |
zhangqiang
|
ce17741169
|
【大闹天宫】界面微调
|
2021-02-18 18:31:30 +08:00 |
jiaoyangna
|
9bc63fa91d
|
文字翻译修改
|
2021-02-18 18:27:48 +08:00 |
zhangqiang
|
2b25d19602
|
【资源导入】
|
2021-02-18 17:59:43 +08:00 |
jiaoyangna
|
ea9116aa21
|
切换语言修改提交
|
2021-02-18 17:29:04 +08:00 |
jiaoyangna
|
f15fa6f1f9
|
越南语图片提交
|
2021-02-18 17:21:14 +08:00 |
zhangqiang
|
aa40bb1775
|
【资源提交】 立绘 c_gyps_00020_s1 + 技能特效 Effect_tiannv
|
2021-02-18 17:06:24 +08:00 |
zhangqiang
|
748060a839
|
【魂印合成】 合成选择界面名字位置调高
|
2021-02-18 15:37:11 +08:00 |
zhangqiang
|
62230fe752
|
【魂印】合成去掉魂印文字
|
2021-02-18 15:29:40 +08:00 |
zhangqiang
|
459466ad49
|
【瑶池魔妖】 不显示圣物特殊处理
|
2021-02-18 15:02:12 +08:00 |
jiaoyangna
|
0b5b98a77a
|
【活动需求】勇往直前主题活动(社稷大典)
|
2021-02-18 10:52:02 +08:00 |
zhangqiang
|
55c8fd1ec6
|
【编队】编队界面,点击第三排头像,底部点击没反应
|
2021-02-05 17:24:13 +08:00 |
zhangqiang
|
f34eb0c41a
|
逍遥特效提交
|
2021-02-05 16:46:08 +08:00 |
gaoxin
|
1715f44d48
|
【本地化】删除无用资源
|
2021-02-05 16:45:33 +08:00 |
liujiaqi
|
faa036bac9
|
【资源】牛转钱坤英文资源
|
2021-02-05 16:40:14 +08:00 |
gaoxin
|
6a7ea1b8b5
|
【本地化】ui资源本地化导出
|
2021-02-05 16:06:10 +08:00 |
wangzhenxing
|
32b4e236a0
|
[战斗]=================去除没必要的特性被动修改
|
2021-02-05 17:00:34 +09:00 |
gaoxin
|
78e7305c15
|
【本地化】导出中文
|
2021-02-05 15:58:37 +08:00 |
gaoxin
|
e9ea58aaf3
|
【本地化】界面冲突修正
|
2021-02-05 15:45:23 +08:00 |
gaoxin
|
90bf24b3b0
|
Merge branch 'master_xma_local' into gx/xma_local
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/ActivityGift/CourtesyDressPanel.prefab
# Assets/ManagedResources/Prefabs/UI/DynamicActicity/page14.prefab
# Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab
# Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab
# Assets/ManagedResources/Prefabs/UI/Loading/LoadingPanel.prefab
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
# Assets/ManagedResources/Prefabs/UI/Operating/OperatingPanel.prefab
# Assets/ManagedResources/Prefabs/UI/SevenDayCarnival/SevenDayCarnivalPanelV2.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Modules/Adventure/View/AdventureView.lua
# Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua
# Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BattleUnit.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua
# Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua
# Assets/ManagedResources/~Lua/Modules/Compound/CompoundSelectListPopup.lua
# Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroFirstUpStarListPanel.lua
# Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroUpStarListPanel.lua
# Assets/ManagedResources/~Lua/Modules/DiffMonster/DemonActivatePanel.lua
# Assets/ManagedResources/~Lua/Modules/DiffMonster/DemonUpGradePanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGeOneResultPanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGeTenResultPanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/XianShiShangShi.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/ZhenQiYiBaoPage.lua
# Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHeroListResurgencePopup.lua
# Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Shop.lua
# Assets/ManagedResources/~Lua/Modules/Expert/DiffMonsterBuy.lua
# Assets/ManagedResources/~Lua/Modules/Expert/GiftBuy.lua
# Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua
# Assets/ManagedResources/~Lua/Modules/Fight/FastExploreInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Fight/FightAreaRewardFullPopup.lua
# Assets/ManagedResources/~Lua/Modules/Fight/FightMopUpEndPanel.lua
# Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Fight/View/InvadeMonsterView.lua
# Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureDispatchPanel.lua
# Assets/ManagedResources/~Lua/Modules/FormFightMatch/MapFightBuyExtraPopup.lua
# Assets/ManagedResources/~Lua/Modules/FormFightMatch/MatchDataManager.lua
# Assets/ManagedResources/~Lua/Modules/Formation/ElementPopup.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua
# Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua
# Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_GuildAid.lua
# Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua
# Assets/ManagedResources/~Lua/Modules/Guild/GuildChangePopup.lua
# Assets/ManagedResources/~Lua/Modules/Guild/GuildCreatePopup.lua
# Assets/ManagedResources/~Lua/Modules/Guild/GuildFetePopup.lua
# Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_GetView.lua
# Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_SendView.lua
# Assets/ManagedResources/~Lua/Modules/Guild/Skill/GuildSkillUpLvPopup.lua
# Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptMainPopup.lua
# Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptManager.lua
# Assets/ManagedResources/~Lua/Modules/HandBook/HandBookEquipInfoPanel.lua
# Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/BuffChoosePanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/BuffOptionPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua
# Assets/ManagedResources/~Lua/Modules/Map/MapOptionPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua
# Assets/ManagedResources/~Lua/Modules/Message/LoadingPanel.lua
# Assets/ManagedResources/~Lua/Modules/Message/NotEnoughPopup.lua
# Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua
# Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampPanel.lua
# Assets/ManagedResources/~Lua/Modules/Operating/GiftPackPage.lua
# Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua
# Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua
# Assets/ManagedResources/~Lua/Modules/Operating/WeekMonthGiftPackPage.lua
# Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua
# Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonOneResultPanel.lua
# Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonPanel.lua
# Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonTenResultPanel.lua
# Assets/ManagedResources/~Lua/Modules/Popup/PassGiftPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RoleGetInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/SoulPrintPopUp.lua
# Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EquipSingleSell.lua
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_GuildSkillReset.lua
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_PokemonChipCompound.lua
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveEquipTreasure.lua
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialXingYao.lua
# Assets/ManagedResources/~Lua/Modules/Pray/PrayMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/QuickPurchase/QuickCoinPurchasePart.lua
# Assets/ManagedResources/~Lua/Modules/Ranking/RankingListMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
# Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua
# Assets/ManagedResources/~Lua/Modules/Recruit/ElementDrawCardPanel.lua
# Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanel.lua
# Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua
# Assets/ManagedResources/~Lua/Modules/Recruit/TenRecruitPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeSuccessPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarLayout.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarSuccessPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanInfoPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanUpStarListPanel.lua
# Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/Shop/ShopExchangePopup.lua
# Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua
# Assets/ManagedResources/~Lua/Modules/SoulPrint/RewardSoulPrintSingleShowPopup.lua
# Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPopUpV2.lua
# Assets/ManagedResources/~Lua/Modules/Story/StoryDialoguePanel.lua
# Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua
# Assets/ManagedResources/~Lua/Modules/TreasureOfSomebody/TreasureOfSomebodyScorePageV2.lua
# Assets/ManagedResources/~Lua/Modules/TreasureStore/TreasureStorePopup.lua
# Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopArmorOnePanel.lua
# Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShowTechnologPanel.lua
# Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoYouPanel.lua
# Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoyaoHeroGetPopup.lua
# Assets/ManagedResources/~Lua/View/JumpView.lua
# Assets/ManagedResources/~Lua/View/ShopView.lua
|
2021-02-05 14:30:05 +08:00 |
gaoxin
|
927025f6de
|
【本地化】中文字还原,合并用
|
2021-02-05 12:44:50 +08:00 |
gaoxin
|
5ce8497899
|
【本地化】中文字还原,合并用
|
2021-02-05 12:00:39 +08:00 |
gaoxin
|
2a16ca3b03
|
【本地化】资源修正
|
2021-02-04 19:40:17 +08:00 |
gaoxin
|
361d63b861
|
【本地化】资源修改
|
2021-02-04 17:28:00 +08:00 |
wangzhenxing
|
44a0b80b84
|
【战斗】================不触发特性相关修改
|
2021-02-04 14:24:56 +09:00 |
gaoxin
|
2c5c7a5b78
|
【本地化】限时折扣界面背景全屏显示
|
2021-02-04 11:32:15 +08:00 |
gaoxin
|
91a98b6715
|
【本地化】新翻译资源导出,修复限时召唤界面白片
|
2021-02-04 11:22:59 +08:00 |
gaoxin
|
41f1818609
|
【本地化】修复中文等级提升界面显示了英文的问题
|
2021-02-04 10:32:08 +08:00 |
gaoxin
|
19ea17f6b2
|
【本地化】胜利界面本地化修改
|
2021-02-04 10:25:55 +08:00 |
gaoxin
|
0ff345346b
|
【本地化】修复灵兽信息界面文字显示异常
|
2021-02-04 10:22:38 +08:00 |
gaoxin
|
51bdf1055e
|
【本地化】公会名称,宣言修改界面文字显示重叠问题修复
|
2021-02-04 10:15:48 +08:00 |
zhangqiang
|
8ea6f2fcf8
|
【合成优化】魂印合成优化2
|
2021-02-03 16:09:07 +08:00 |
zhangqiang
|
b80bed1cff
|
【排行榜优化】排行榜信息分页读取
|
2021-02-03 14:45:32 +08:00 |
jiaoyangna
|
505a5eaa66
|
主题活动提交
(cherry picked from commit 74fd7a8839 )
|
2021-02-02 19:09:29 +08:00 |
jiaoyangna
|
74fd7a8839
|
主题活动提交
|
2021-02-02 19:07:35 +08:00 |
jiaoyangna
|
86042e99b5
|
主题活动
(cherry picked from commit c3b8d1b59a )
|
2021-02-02 18:49:34 +08:00 |
jiaoyangna
|
e0cd83e0f3
|
Merge branch 'master_xma_local' into 0功能/本周版本优化内容
# Conflicts:
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Message/LoadingPanel.lua
|
2021-02-02 18:49:05 +08:00 |
jiaoyangna
|
ca1abfc0b5
|
Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容
|
2021-02-02 18:26:54 +08:00 |
jiaoyangna
|
c3b8d1b59a
|
主题活动
|
2021-02-02 18:26:50 +08:00 |
gaoxin
|
0f66637056
|
【本地化】新增图片资源
|
2021-02-02 18:06:19 +08:00 |
gaoxin
|
1380eedea2
|
【本地化】新增翻译资源
|
2021-02-02 16:51:21 +08:00 |
JieLing
|
0fa9f8e47f
|
【tolua】修复高版本android有几率闪退的问题
|
2021-02-02 15:57:26 +08:00 |
wangzhenxing
|
693dffe4a3
|
[战斗]==================126效果修改 生命百分比伤害会被无敌盾挡住
|
2021-02-02 15:38:59 +08:00 |
jiaoyangna
|
9c91d9bfe4
|
图片提交
|
2021-02-02 15:38:50 +08:00 |
wangzhenxing
|
bc1691891d
|
[战斗]==============禁疗显示血量 +0
|
2021-02-02 15:38:40 +08:00 |
jiaoyangna
|
c57ab9ea78
|
Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容
|
2021-02-02 14:26:14 +08:00 |
jiaoyangna
|
65d394db1f
|
图片提交
|
2021-02-02 14:26:11 +08:00 |
wangzhenxing
|
f699634c24
|
[战斗]==================126效果修改 生命百分比伤害会被无敌盾挡住
|
2021-02-02 15:02:25 +09:00 |
gaoxin
|
f2ceeca55d
|
【本地化】服务器发送的错误消息未翻译修复
|
2021-02-01 19:50:38 +08:00 |
gaoxin
|
19d241f44e
|
【本地化】优化显示错误
|
2021-02-01 19:33:03 +08:00 |