Commit Graph

342 Commits (b743ccd296ca9dc0bb5056b51c27960a0d5d76c0)

Author SHA1 Message Date
ZhangBiao 5ae5555011 【森罗幻境】选择英雄按战力发送英雄顺序 2021-04-14 20:00:06 +08:00
ZhangBiao 4ae91eda8e 【森罗幻境】修改数独小游戏的数字图片,将?居中 2021-04-12 17:07:27 +08:00
jiaoyangna 071a91773a 导出 文本提交 2021-04-09 12:26:35 +08:00
jiaoyangna 8291a48e73 Merge branch 'china_dev_merge' into xma_dev_b_merge
# Conflicts:
#	Assets/ManagedResources/Atlas/DyAct_Activity7/ArtFont.meta
#	Assets/ManagedResources/Atlas/FifteenDayGiftAtlas.meta
#	Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/ArtFont.meta
#	Assets/ManagedResources/Atlas/NiuQiChongTianAtlas/ArtFont.meta
#	Assets/ManagedResources/Atlas/SupremeHeroAtlas/ArtFont.meta
#	Assets/ManagedResources/Icon/ChengHao.meta
#	Assets/ManagedResources/Icon/ZuoQi.meta
#	Assets/ManagedResources/Prefabs/UI/View/FetterItem.prefab
#	Assets/ManagedResources/~Lua/Logic/Network.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/Common/MoneyUtil.lua
#	Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua
#	Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/GuildInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanUpStarListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerRide.lua
#	Assets/ManagedResources/~Lua/View/FetterItem.lua
#	Assets/ManagedResources/~Lua/View/ItemView.lua
2021-04-09 12:24:01 +08:00
jiaoyangna 0ab7c3177a 还原文字提交 2021-04-09 12:06:17 +08:00
jiaoyangna 38e64fb774 还原文字提交 2021-04-09 11:39:09 +08:00
ZhangBiao 78c1b12067 【森罗幻境】小游戏转盘,灵兽碎片显示整只灵兽 2021-04-08 19:58:41 +08:00
ZhangBiao bfaa5195b5 Revert "【表删除】报错处理"
This reverts commit b163fc3035.
2021-04-07 11:54:39 +08:00
gaoxin 9033d47109 【本地化】文本导出 2021-04-06 22:33:57 +08:00
ZhangBiao 0387c7cf33 【森罗幻境】根据英雄战力排序 2021-04-06 17:26:59 +08:00
gaoxin b163fc3035 【表删除】报错处理 2021-04-06 15:16:37 +08:00
gaoxin 472829239e 【表删除】AccomplishmentConfig 2021-04-02 14:46:31 +08:00
gaoxin b53717c9ee 【本地化】还原文本 2021-04-01 18:41:50 +08:00
zhangqiang 25e351dba3 【称号坐骑时装】修改 2021-03-30 10:28:03 +08:00
zhangqiang db6f2d0b32 【称号坐骑时装】提交 2021-03-29 17:53:40 +08:00
zhangqiang 51bb90edce 【称号坐骑时装】 协议 无尽副本修改 2021-03-29 12:07:28 +08:00
jiaoyangna d81075da7a 还原lua 2021-03-02 16:53:12 +08:00
jiaoyangna 88e59e0c7c lua 提交 2021-03-02 15:49:02 +08:00
jiaoyangna e4f4649cf9 文本提交 2021-02-20 18:01:57 +08:00
jiaoyangna 602dbc924c 文本还原 2021-02-20 16:43:44 +08:00
gaoxin 78e7305c15 【本地化】导出中文 2021-02-05 15:58:37 +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 bf3a6eb705 【本地化】界面显示问题修复 2021-01-29 13:34:16 +08:00
gaoxin adf591cbec 【本地化】lua代码还原 2021-01-27 18:16:54 +08:00
gaoxin c567dcd426 【本地化】代码本地化提交 2021-01-26 17:08:39 +08:00
gaoxin 81b3ca1ddc 【本地化】 中文字还原,合并代码用 2021-01-26 11:13:09 +08:00
gaoxin 802881378c Merge branch 'master_xma_local' into gx/xma_local
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua
2021-01-26 11:08:54 +08:00
gaoxin 3b83a72215 【本地化】文字还原 2021-01-26 11:05:27 +08:00
zhangqiang f283d579c4 【新战斗力计算】1 2021-01-22 16:53:50 +08:00
jiaoyangna 7666faad78 【ID1007787】
【优化】心魔试炼高级阶段奖励没有展示,添加层数奖励
2021-01-15 10:50:27 +08:00
jiaoyangna 3a7324883e 【优化】心魔试炼高级阶段奖励没有展示,添加层数奖励 2021-01-14 15:24:51 +08:00
jiaoyangna be993c9905 【优化】心魔试炼高级阶段奖励没有展示,添加层数奖励 2021-01-12 19:21:20 +08:00
gaoxin f501e92272 【本地化】代码还原,合并用 2021-01-12 11:00:44 +08:00
gaoxin ae7da93056 【本地化】还原文字 2021-01-12 10:56:26 +08:00
gaoxin 27b3c1ea32 【本地化】还原文本到代码中合并用 2021-01-09 14:20:06 +08:00
ZhangBiao d09bc60b5e 【森罗幻境】红点刷新修改 2021-01-08 19:08:04 +08:00
jiaoyangna a5a93d43a7 【ID1007787】
【优化】心魔试炼高级阶段奖励没有展示,添加层数奖励
2021-01-07 19:24:04 +08:00
ZhangBiao 31c5aa7580 【森罗幻境】红点刷新修改 2021-01-06 17:30:48 +08:00
ZhangBiao 70a85609df 【无尽副本】报错修改
(cherry picked from commit 43cfaf3d1054adca7f6284a0de38c2383678aa6e)
2021-01-04 17:00:24 +08:00
ZhangBiao 74cec8e7b4 【无尽副本】偶现卡死尝试修改 2021-01-04 15:13:21 +08:00
ZhangBiao 2fed5ddb45 【森罗幻境】进入森罗幻境后直接关闭选择神将弹窗,会在离开幻境前闪过一个统计弹窗 修复 2021-01-04 11:04:37 +08:00
ZhangBiao fc8f74cd3a 【森罗幻境】在进入下一层后,下方的神将头像位置会发生变化 修复 2021-01-04 10:41:35 +08:00
zhangqiang 739f390115 Merge branch 'master_xma_local' into 0功能/1月6_版本优化
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua
2020-12-29 17:00:08 +08:00
ZhangBiao 927aa7053b .进入无尽副本上阵阵容之后推出副本,在挑战关卡、神将-编队无法上三星及以下英雄(不显示) 2020-12-29 10:28:10 +08:00
ZhangBiao 574a0da116 【编队】进入无尽副本后 主线编队无法上阵20级以下英雄修复 2020-12-29 10:24:50 +08:00
ZhangBiao c649621d85 【森罗幻境】下方头像顺序,后端把顺序换了 2020-12-28 15:19:46 +08:00
ZhangBiao b6037a00e3 【森罗幻境】奖励红点修改 2020-12-28 11:59:27 +08:00
ZhangBiao 4010991f0d 【森罗幻境】奖励红点修改
(cherry picked from commit b6037a00e3)
(cherry picked from commit c2b399aa43e39dfd58a624ee27531ddbecbd4828)
2020-12-28 12:00:36 +08:00
gaoxin bf6fd2d13d Merge remote-tracking branch 'origin/0活动开发聚集地/新将活动3个' into master_xma_local
# Conflicts:
#	Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/View/UpView.lua
2020-12-26 20:22:23 +08:00
jiaoyangna f0f423bbd4 红点报错 修改 2020-12-26 18:40:28 +08:00
ZhangBiao 8376d74230 【无尽副本】战斗失败自动复位时,自动进行一次一键上阵 2020-12-24 14:13:58 +08:00
ZhangBiao 30f8049ef5 Merge branch '0活动开发聚集地/新将来袭' into 0活动开发聚集地/新将活动3个
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab
#	Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2020-12-23 11:13:48 +08:00
ZhangBiao 1431423c4f 【森罗幻境】移动过程中打开其他界面问题修复 2020-12-18 11:39:01 +08:00
ZhangBiao 4c73219b39 【森罗幻境】诸多bug 修复 2020-12-12 18:00:18 +08:00
ZhangBiao ecb948a613 【神将来袭】真·差战斗 和为小游戏转盘增加log 2020-12-02 15:42:38 +08:00
ZhangBiao bdf45413bc 【森罗幻境】敌将详情 敌将位置调整
(cherry picked from commit 2dd30f9ca3)
2020-11-17 14:56:42 +08:00
ZhangBiao 8df6de20e5 【副本】isInMap字段删除bug修复 2020-11-16 15:24:09 +08:00
jiaoyangna 5d24bbb8a8 森罗环境英雄皮肤提交 2020-11-09 10:32:17 +08:00
jiaoyangna e2fae0cc52 皮肤提交 2020-11-06 09:37:27 +08:00
jiaoyangna 360727419e 【皮肤】修改皮肤显示 2020-11-04 16:51:45 +08:00
jiaoyangna 98c80ed67c 森罗幻境 修改 2020-10-15 21:26:56 +08:00
ZhangBiao 767ac32ee1 回春散手动使用 数量不刷新 修复 2020-10-12 16:08:13 +08:00
ZhangBiao aec2eb929c (cherry picked from commit f087c0258b) 2020-10-12 15:39:57 +08:00
ZhangBiao ff33dd07db 森罗回春散使用bug修改
(cherry picked from commit 62f185c859)
2020-10-12 15:15:02 +08:00
ZhangBiao a47d882155 森罗回春散使用 问题修复
(cherry picked from commit 69fee1514f)
2020-10-12 15:14:27 +08:00
ZhangBiao e3e95e2379 森罗 无尽 流程优化和界面调整 2020-09-02 13:35:29 +08:00
ZhangBiao 91061ae00a 无尽红点刷新修复 2020-09-01 15:32:24 +08:00
ZhangBiao 822f4a2294 森罗界面适配 2020-09-01 14:53:12 +08:00
ZhangBiao 9942bd50bb 回春散使用bug修复 2020-08-31 19:54:14 +08:00
ZhangBiao b5ac787e16 数独小游戏15 1:2屏幕适配错误修复
购买回春散数量不增加修改
2020-08-31 15:45:16 +08:00
ZhangBiao a99aa6ef6e 还是红点检测 2020-08-28 17:29:38 +08:00
ZhangBiao 0c3b0e6326 车迟斗法副本界面红点 2020-08-28 16:35:08 +08:00
ZhangBiao 01fc7cae51 森罗幻境奖励红点 2020-08-28 13:48:09 +08:00
gaoxin e6c8e81c82 修复小游戏反复打开会报错的问题 2020-08-27 23:01:07 +08:00
ZhangBiao 2a2eac8cbb 森罗战斗失败两次弹出失败 2020-08-27 18:31:39 +08:00
ZhangBiao 021a7dc5a7 森罗换层卡死问题修复 2020-08-27 18:15:53 +08:00
ZhangBiao 811418e222 森罗 无尽红点 2020-08-27 13:59:14 +08:00
ZhangBiao 1e4f936810 无尽副本迷雾显示问题修改,无尽副本界面步数显示问题修复 2020-08-27 10:49:44 +08:00
ZhangBiao dc9615b4fc 无尽进图武神将问题、取消对话战斗结束神将数据界面 2020-08-26 16:22:37 +08:00
ZhangBiao 09ed357e08 森罗敌人信息显示界面空白问题修改 2020-08-26 10:18:31 +08:00
zhangqiang 4d19e7ce98 中文表导出提交 2020-08-25 15:46:38 +08:00
ZhangBiao 17465d2f3d 2020-08-20 14:56:29 +08:00
ZhangBiao e9b8083148 2020-08-20 14:43:48 +08:00
ZhangBiao f93c57fd31 副本快结束啦! 2020-08-19 20:57:04 +08:00
ZhangBiao f9ffc1aa39 无尽细节修改 2020-08-19 19:37:59 +08:00
ZhangBiao 32eadd13ef 试炼 2020-08-19 17:18:38 +08:00
ZhangBiao 7e4b73dc27 两个副本,基本成型了 2020-08-18 21:03:55 +08:00
ZhangBiao 8f786147d3 2020-08-18 16:36:24 +08:00
ZhangBiao 448c5d3b17 无尽_新重做前的提交 2020-08-18 15:48:41 +08:00
ZhangBiao c9cb029494 无尽副本基本功能
(cherry picked from commit 21f43fa1a132a469c1d674d12838148699998794)
2020-08-18 10:49:21 +08:00
ZhangBiao b0f0b654ec 无尽副本已经可以进去了
(cherry picked from commit a1737d6e7014963b19c97ccfb2d1c878d88bc295)
2020-08-18 10:48:52 +08:00
ZhangBiao 9f8b553626 试炼副本补日志
(cherry picked from commit 47e547d31f282e772674a8b17617fcd931693492)
2020-08-18 10:46:33 +08:00
ZhangBiao 4ef8870c4d 试炼副本改到了一半
(cherry picked from commit 4e442c7614a669cee38e731edf627b2582b2547b)
2020-08-18 10:45:59 +08:00
jiaoyangna e0359bb37a encoding upate 2020-08-06 17:52:32 +08:00
ZhangBiao 3522da8a3a 森罗去除遮罩 2020-08-06 15:05:33 +08:00
gaoxin fee7d18688 森罗幻境,修复非快速战斗怪物点不删除的问题 2020-08-05 22:47:21 +08:00
ZhangBiao 54783bef35 森罗快速点击服务器报错问题修复 2020-08-05 21:12:50 +08:00
ZhangBiao 456ab0aa92 森罗 进图后2.5秒才能开始移动,避免服务器小差 2020-08-05 19:32:36 +08:00
ZhangBiao ee28c18254 森罗bug修复 2020-08-04 20:22:56 +08:00
ZhangBiao 24381aba57 森罗bug修复 2020-08-04 16:18:48 +08:00
jiaoyangna 9a53f20f60 小游戏提交 2020-08-04 10:39:16 +08:00
ZhangBiao 9b28e7c140 森罗bug修改 2020-08-03 16:59:37 +08:00
jiaoyangna 54aae5181f fix bug 2020-08-03 15:51:48 +08:00
ZhangBiao ee4ecf49c2 森罗环境 炸弹 终于完了 2020-07-29 20:18:19 +08:00
ZhangBiao ddfbb25e2e 森罗bug修复 2020-07-28 16:45:28 +08:00
gaoxin b0002cf781 语言文字替换 2020-07-25 20:42:11 +08:00
jiaoyangna 46f091f09c 头像框修改提交 2020-07-25 20:28:41 +08:00
ZhangBiao 7b795f0daa 森罗bug 2020-07-23 19:05:43 +08:00
ZhangBiao e0d156ad74 森罗英雄全部死亡战斗报错 2020-07-23 17:42:17 +08:00
ZhangBiao d3caa3d4cf 森罗调整 2020-07-21 10:30:25 +08:00
ZhangBiao 9ed616d8be 2020-07-21 09:38:34 +08:00
ZhangBiao 054f1558bc bug修复 2020-07-20 16:42:20 +08:00
ZhangBiao bfe29c5601 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
2020-07-16 20:55:34 +08:00
ZhangBiao 3231f857af 工会祭祀援助红点、十绝阵排行修改 2020-07-16 20:53:17 +08:00
jiaoyangna 3ae65767d0 幸运探宝, 2020-07-16 20:36:54 +08:00
ZhangBiao a27c474098 协议 2020-07-16 17:28:48 +08:00
ZhangBiao cb56ec6b22 森罗小游戏bug修改 2020-07-16 16:59:46 +08:00
ZhangBiao 9d47ce9767 小游戏bug修复 2020-07-16 13:45:07 +08:00
ZhangBiao 9f59d1f574 森罗幻境 小游戏与效果图的差异修改 2020-07-15 13:41:29 +08:00
ZhangBiao 2ab6d17841 森罗小游戏修改 2020-07-14 21:03:44 +08:00
ZhangBiao 416ba72c2f 森罗小游戏bug修改 2020-07-13 16:41:35 +08:00
ZhangBiao 310802e967 language导出 2020-07-10 19:13:29 +08:00
2han9B1a0 10a2181305 小游戏18bugxiugai 2020-07-09 16:14:44 +08:00
2han9B1a0 1796c48583 森罗幻境bug修改 2020-07-02 20:50:49 +08:00
JieLing ab411b3d0d svn逻辑同步 2020-07-02 17:04:46 +08:00
JieLing 461c64b04a svn逻辑同步 2020-07-02 14:53:44 +08:00
JieLing b3c70f66e4 svn逻辑tongbu 2020-07-01 18:14:03 +08:00
JieLing 5154fdbac0 外网0.16.14 内网0.15.25 2020-07-01 09:40:20 +08:00
JieLing d08552ca2f 外网0.16.13 内网0.15.24 2020-06-30 18:59:44 +08:00
JieLing 7382b2db77 版本开发提交 2020-06-28 17:52:29 +08:00
JieLing 8c61581548 外网 0.16.10 内网 0.15.23 2020-06-28 17:48:49 +08:00
JieLing d87ab3767e 内网 0.15.20 2020-06-23 18:36:24 +08:00
JieLing 75a3f83194 内网0.15.16 外网 0.16.7 2020-06-19 20:19:35 +08:00
JieLing e189462ac9 内网测试 0.15.14 2020-06-18 20:39:29 +08:00
JieLing cf5f3e9952 内网测试 0.15.12 2020-06-13 11:47:13 +08:00
JieLing 2db43096de 补充提交 2020-06-12 18:04:22 +08:00
JieLing 90e12f1a4a 外网0.16.5,测试0.15.11 2020-06-08 20:18:49 +08:00
JieLing b499b77bbe 外网0.16.4版本热更 2020-06-08 13:57:30 +08:00
JieLing 59db757cf9 六月三号开发提交 2020-06-03 19:09:01 +08:00
JieLing 4c8d2cf8de 提交 2020-05-09 13:31:21 +08:00