Commit Graph

3179 Commits (c4af6714bc6b7a1629ebf85919cde07a4318762c)

Author SHA1 Message Date
gaoxin 1c25e4e21a Merge branch 'master_xma_local' into master_develop
# Conflicts:
#	Assets/LuaFramework/Scenes/LogoHwRelease_IOS.unity.meta
#	Assets/LuaFramework/Scenes/LogoHwTest_IOS.unity.meta
#	Assets/LuaFramework/Scripts/Framework/App.cs
#	Assets/LuaFramework/Scripts/Manager/NetworkManager.cs
#	Assets/LuaFramework/Scripts/Network/SocketClient.cs
#	Assets/ManagedResources/Atlas/DemonSlayerAtlas.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/YongWangZhiQian/s_yongwangzhiqian_banner.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/YongWangZhiQian/s_yongwangzhiqian_icon1.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/YongWangZhiQian/s_yongwangzhiqian_icon2.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/YongWangZhiQian/s_yongwangzhiqian_shenjiang1.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/YongWangZhiQian/s_yongwangzhiqian_shenjiang2.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/YongWangZhiQian/s_yongwangzhiqian_shenjiang3.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/YongWangZhiQian/s_yongwangzhiqian_zi.png.meta
#	Assets/ManagedResources/Atlas/VipAtlas/ArtFont/t_tequan_xiaoyao.png.meta
#	Assets/ManagedResources/Audio/UI/common/UI_shaizi.mp3
#	Assets/ManagedResources/DynamicAtlas/ArtFont/g_gonghui_banner.png.meta
#	Assets/ManagedResources/DynamicAtlas/ArtFont/r_daren_xubao1.png.meta
#	Assets/ManagedResources/DynamicAtlas/ArtFont/r_daren_xubao3.png.meta
#	Assets/ManagedResources/DynamicAtlas/Skill/l_ls_11.png.meta
#	Assets/ManagedResources/EffectResSkill.meta
#	Assets/ManagedResources/EffectResUI.meta
#	Assets/ManagedResources/EffectResUI/PokemonEgg/Prefab/Effect_Dan_changzhu.prefab
#	Assets/ManagedResources/Prefabs/Effect/HeadFrame/UI_Effect_TouXiang_BaiHu.prefab.meta
#	Assets/ManagedResources/Prefabs/Effect/HeadFrame/UI_Effect_TouXiang_Lanlong.prefab.meta
#	Assets/ManagedResources/Prefabs/Effect/HeadFrame/UI_Effect_TouXiang_QingLong.prefab.meta
#	Assets/ManagedResources/Prefabs/UI/Arena/ArenaMainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/DemonSlayer.meta
#	Assets/ManagedResources/Prefabs/UI/DemonSlayer/DemonSlayerPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralRankRewardPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSingleResultPanel.prefab.meta
#	Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSummonPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab
#	Assets/ManagedResources/Prefabs/UI/SecretBox/SecretBoxBuyOnePanel.prefab
#	Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoMapPanel.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Common/functions.lua
#	Assets/ManagedResources/~Lua/Data/SoundData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Logic/Network.lua
#	Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua.meta
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/AllActivityManager.lua.meta
#	Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Skill.lua.meta
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/MonsterSkill/MCondition.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleData.lua.meta
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/Skill.lua.meta
#	Assets/ManagedResources/~Lua/Modules/Battle/Test/BattleSetView.lua.meta
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/RoleView.lua.meta
#	Assets/ManagedResources/~Lua/Modules/Common/MoneyUtil.lua
#	Assets/ManagedResources/~Lua/Modules/DataCenterService/CustomEventManager.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/LeiJiChongZhiPage.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/PoZhenZhuXianPage.lua.meta
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/SheJiDaDian.lua
#	Assets/ManagedResources/~Lua/Modules/Expert/ExChange.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralRankRewardPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayLootPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptManager.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginManager.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/BattleData1.lua
#	Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Message/LoadingPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua
#	Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua
#	Assets/ManagedResources/~Lua/Modules/Mission/QinglongSerectTreasureManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/AutoRecoverManager.lua
#	Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitConfirm.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Recruit/ElementDrawCardPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Pokemon.lua
#	Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua
#	Assets/ManagedResources/~Lua/Modules/TreasureStore/TreasureStorePopup.lua
#	Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoEventPanel.lua
#	Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoLuckyBossPopup.lua
#	Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoManager.lua
#	Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoyaoHeroGetPopup.lua.meta
#	Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
2020-11-04 16:18:35 +08:00
zhangqiang 750a87c168 【魂印】 线上首次打开神将魂印界面有时会弹出战力变化 修改 2020-11-04 15:04:18 +08:00
jiaoyangna 6930561350 [皮肤]神将界面修改提交 2020-11-04 14:24:35 +08:00
jiaoyangna 644d984c0a 登陆报错修改 2020-11-04 14:24:08 +08:00
jiaoyangna b18b4cfd58 【皮肤】协议提交 2020-11-04 13:52:10 +08:00
wangzhenxing 59bcf41d6a 去掉战斗伤害log输出 2020-11-04 14:37:13 +09:00
jiaoyangna 79a5bcb74c 皮肤资源提交 2020-11-04 12:02:57 +08:00
liujiaqi d4ebf0767a Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-11-04 11:40:21 +08:00
liujiaqi 66a7ad90f9 孙悟空东华帝君皮肤资源 2020-11-04 11:39:09 +08:00
zhangqiang 098ff3b2d6 【日常任务】 宝箱位置调整 2020-11-04 11:33:22 +08:00
jiaoyangna 4cb31d8f38 [皮肤]提交 2020-11-04 10:59:04 +08:00
zhangqiang 765c5b874a 【献祭坛】预设微调 2020-11-04 10:58:19 +08:00
jiaoyangna 509357e333 Merge branch 'master_xma_local' into 0功能/皮肤
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
2020-11-04 10:54:54 +08:00
ZhangBiao 809c6daa01 【易经宝库】数据调试 2020-11-04 10:53:02 +08:00
ZhangBiao 7b943d6731 【特权商城】最后一分钟报错修改 2020-11-03 20:07:25 +08:00
jiaoyangna 1fcdf5b2a6 【皮肤】添加皮肤属性加成 2020-11-03 19:37:05 +08:00
zhangqiang 302e52aea5 【英雄合成】 添加提示 2020-11-03 19:19:37 +08:00
zhangqiang 3ae4ed1d41 【英雄合成】 添加提示 2020-11-03 19:19:13 +08:00
ZhangBiao ab757a2543 【特权商城】最后一分钟报错修改 2020-11-03 19:10:32 +08:00
ZhangBiao d1c0d3e41f 【易经宝库】资源路径提交 2020-11-03 19:02:31 +08:00
ZhangBiao 5d40b102dc 【易经宝库】添加type 拼数据 2020-11-03 19:01:47 +08:00
gaoxin 5a861ade95 【商店】前端从表里判断商品的显示状态添加 2020-11-03 18:01:31 +08:00
gaoxin 5070d78a79 【商店】前端从表里判断商品的显示状态添加 2020-11-03 18:00:53 +08:00
ZhangBiao b31f5881ce 【特权商城】报错修改 2020-11-03 17:55:03 +08:00
ZhangBiao e7b132952c 【特权商城】报错修改 2020-11-03 17:53:14 +08:00
jiaoyangna e92e63444b 皮肤提交 2020-11-03 17:27:32 +08:00
gaoxin e1625e6bed 【战斗】修复回合末释放的灵兽技能释放时界面显示已经到下一回合的问题 2020-11-03 17:17:46 +08:00
ZhangBiao c3537b3486 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-03 17:05:15 +08:00
ZhangBiao 81e26c3128 【特权商城】增加 灵兽特权礼包 文字描述 2020-11-03 17:04:45 +08:00
wangzhenxing 3733d742bd [灵兽] 灵兽奖池预览奖励顺序修改 2020-11-03 17:35:52 +09:00
ZhangBiao d2da2c362d 【特权商城】增加 灵兽特权礼包 文字描述 2020-11-03 17:06:10 +08:00
gaoxin 5f1dde015e Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-11-03 16:20:58 +08:00
gaoxin 6653ff59ff 【战斗】修复回合末释放的灵兽技能释放时界面显示已经到下一回合的问题 2020-11-03 16:20:41 +08:00
zhangqiang 1fee1f84eb 【灵兽系统】 召唤界面按钮文字位置 2020-11-03 16:11:06 +08:00
zhangqiang 47ea758d67 【灵兽系统】 羁绊预设微调 2020-11-03 16:11:00 +08:00
zhangqiang 0918acadd4 【灵兽系统】 羁绊预设微调 2020-11-03 16:10:45 +08:00
zhangqiang 0a8498b95e 【灵兽系统】 召唤界面按钮文字位置 2020-11-03 16:08:10 +08:00
gaoxin 49576b20ad 【战斗】修复战斗内名称不显示和我方元素显示错误的问题 2020-11-03 15:34:22 +08:00
gaoxin 23717d6fc9 【特权】修复获取特权次数会小于0的问题,解决急速探索会出现剩余次数为负数的问题 2020-11-03 15:34:12 +08:00
gaoxin 2dff35c3ff 【战斗】修复战斗内名称不显示和我方元素显示错误的问题 2020-11-03 15:26:29 +08:00
jiaoyangna d040e4dded 神将界面结构修改 2020-11-03 15:17:48 +08:00
zhangqiang 812e6b8f0b 【灵兽系统】召唤界面 按钮位置有问题 2020-11-03 14:52:51 +08:00
zhangqiang 5d6db87650 【灵兽系统】召唤界面 按钮位置有问题 2020-11-03 14:51:58 +08:00
gaoxin 47029b0f0f Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-11-03 14:20:22 +08:00
gaoxin d4f57caa96 【特权】修复获取特权次数会小于0的问题,解决急速探索会出现剩余次数为负数的问题 2020-11-03 14:20:10 +08:00
zhangqiang 79aeb8720d 【灵兽系统】 按钮位置调整 2020-11-03 14:18:38 +08:00
gaoxin 8fe6bbb455 【资源】新增灵兽特权icon图标 2020-11-03 14:08:20 +08:00
wangzhenxing 18401c0663 合并PokemonSummonOneResultPanel.prefab 2020-11-03 14:19:09 +09:00
zhangqiang f8b4befd3c 【灵兽系统】 按钮位置调整 2020-11-03 14:17:33 +08:00
gaoxin 9380675560 【资源】新增灵兽特权icon图标 2020-11-03 14:16:36 +08:00
wangzhenxing 5f518babce [灵兽]灵兽奖励预览排序 抽卡再来一次字体位置修改 2020-11-03 14:18:02 +09:00
ZhangBiao f79499faea 【易经宝库】开始获取活动数据 2020-11-03 09:58:37 +08:00
gaoxin d00d3e803c 【商店】删除商店的动画显示 2020-11-03 01:00:58 +08:00
gaoxin ba42282cc3 【战斗】修改会自己动的指定目标特效的显示时长 2020-11-03 01:00:53 +08:00
gaoxin b634b81590 【商店】删除商店的动画显示 2020-11-03 01:00:27 +08:00
gaoxin de861b5d9b 【战斗】修改会自己动的指定目标特效的显示时长 2020-11-02 23:53:12 +08:00
gaoxin 108e5b2568 【战斗】前摇特效添加指定位置释放的类型 2020-11-02 23:24:43 +08:00
gaoxin 10b2020170 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-11-02 23:20:07 +08:00
gaoxin a3d849f421 【战斗】前摇特效添加指定位置释放的类型 2020-11-02 23:19:52 +08:00
zhangqiang 296d63ffbe 【灵兽系统】放生选择数量修改 2020-11-02 23:12:36 +08:00
zhangqiang 342a1bd373 【灵兽系统】 放生选择数量修改 2020-11-02 23:09:58 +08:00
gaoxin 34b4b5db51 【商店】修复灵兽山跳转灵兽商店会显示其他商店的数据的问题 2020-11-02 22:55:24 +08:00
gaoxin 596e985786 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-11-02 22:51:45 +08:00
gaoxin ad4d9bdce1 【商店】修复灵兽山跳转灵兽商店会显示其他商店的数据的问题 2020-11-02 22:51:36 +08:00
gaoxin a5df0d4f7b 【商店】修复灵兽山跳转灵兽商店会显示其他商店的数据的问题 2020-11-02 22:43:11 +08:00
gaoxin d10134216c 【战斗】修复人物技能会在零售技能释放完成之前加入对列,导致技能释放失败的问题--2 2020-11-02 22:13:34 +08:00
gaoxin 9dc9ca2b2a 【战斗】修复战斗界面资源回收时报错 2020-11-02 22:13:30 +08:00
gaoxin 4709ffa144 【战斗】修复人物技能会在零售技能释放完成之前加入对列,导致技能释放失败的问题--2 2020-11-02 22:13:00 +08:00
gaoxin 7f64948c2d 【战斗】修复战斗界面资源回收时报错 2020-11-02 22:09:37 +08:00
liujiaqi 355d843b30 灵兽相关道具资源图标正式 2020-11-02 22:05:10 +08:00
gaoxin cb10b3ff1d 【战斗】修复人物技能会在零售技能释放完成之前加入对列,导致技能释放失败的问题。 2020-11-02 21:49:33 +08:00
gaoxin 39c3cacea9 【战斗】修复人物技能会在零售技能释放完成之前加入对列,导致技能释放失败的问题。 2020-11-02 21:49:06 +08:00
gaoxin 9779a99414 【战斗】修复灵兽释放技能顺序错误 2020-11-02 21:24:00 +08:00
gaoxin 8b9276f6a2 【战斗】修复上一场残留数据会出现在下一场的问题 2020-11-02 21:23:55 +08:00
gaoxin 0504291129 【战斗】修复灵兽释放技能顺序错误 2020-11-02 21:23:16 +08:00
gaoxin 6b906fd304 【战斗】修复上一场残留数据会出现在下一场的问题 2020-11-02 21:22:38 +08:00
liujiaqi b476e5634e 灵兽相关道具资源图标正式 2020-11-02 21:10:54 +08:00
zhangqiang 8e9b7b49e7 【特权礼包】 购买后到期 报错 尝试修复 2020-11-02 20:51:25 +08:00
wangzhenxing 2f14ebdb81 【神将分解】恭送神将预设修改提交 2020-11-02 20:29:37 +09:00
JieLing 2620d55085 【资源】 修改资源路径 2020-11-02 20:00:07 +08:00
gaoxin c6c55be9ff Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-11-02 19:16:08 +08:00
gaoxin fa9f029266 【好友切磋】修复战斗结果显示错误的问题 2020-11-02 19:16:03 +08:00
gaoxin 6de92f3692 【战斗】修复凤凰技能第二回合无法触发的问题,修复战斗开始时界面显示回合数错误的问题 2020-11-02 19:15:17 +08:00
wangzhenxing 36b9ffce91 【bug】分解界面等级星级显示修改 2020-11-02 20:13:57 +09:00
wangzhenxing 868eb64ae1 [bug] 分解神将等级显示999 2020-11-02 20:09:24 +09:00
JieLing 04ba352791 【资源】 修改资源路径 2020-11-02 19:54:12 +08:00
gaoxin 54f1660bc2 【好友切磋】修复战斗结果显示错误的问题 2020-11-02 19:17:19 +08:00
gaoxin 4cb8bee4ae 【战斗】修复凤凰技能第二回合无法触发的问题,修复战斗开始时界面显示回合数错误的问题 2020-11-02 19:17:14 +08:00
zhangqiang 08708c841c 【灵兽系统】 调主城的位置 2020-11-02 18:16:51 +08:00
zhangqiang cbe24364ec 【灵兽系统】 调主城的位置 2020-11-02 18:16:28 +08:00
gaoxin 3a542e5c63 【战斗】技能特效添加会自己动的指定目标特效 2020-11-02 18:09:04 +08:00
gaoxin d94d5bc15c 【特效】应龙技能受击特效改三个为一个 2020-11-02 18:08:59 +08:00
gaoxin 8b4aa8ec10 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-11-02 18:08:30 +08:00
gaoxin 2b5d3c316e 【战斗】技能特效添加会自己动的指定目标特效 2020-11-02 18:08:24 +08:00
gaoxin 58252a9380 【特效】应龙技能受击特效改三个为一个 2020-11-02 18:07:56 +08:00
ZhangBiao 8640018b87 【易经宝库】开坑 搭界面 和做动画 2020-11-02 18:05:24 +08:00
zhangqiang e19412791d Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-02 17:46:15 +08:00
liujiaqi 7a70acff6c 灵兽相关道具图标资源占坑 2020-11-02 17:46:08 +08:00
zhangqiang 869f54799e 【灵兽系统】 加新手 加升级动画 2020-11-02 17:28:52 +08:00
wangzhenxing 05d3dc7732 [灵兽抽卡 灵兽放生]灵兽抽卡再来一次显示修改,灵兽放生显示返还货币修改 2020-11-02 17:45:36 +09:00
zhangqiang 04b8449ffe 【灵兽系统】 加新手 加升级动画 2020-11-02 17:29:49 +08:00
wangzhenxing 92d5b659a1 [放生灵兽]灵兽放生显示返还货币修改 2020-11-02 17:36:08 +09:00
gaoxin fca37b8451 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-11-02 16:31:36 +08:00
gaoxin 7d9e8fd031 【战斗】修复凤凰概率技能无法生效的问题 2020-11-02 16:31:30 +08:00
wangzhenxing 5eaa5a725d [灵兽抽卡]灵兽抽卡显示修改 2020-11-02 17:19:06 +09:00
gaoxin 25f88a2a98 【LOG】删除无用log,添加凤凰技能概率log 2020-11-02 16:53:26 +08:00
gaoxin ad4ebc14a0 【战斗】修复凤凰概率技能无法生效的问题 2020-11-02 16:31:57 +08:00
zhangqiang de9a7d4d82 【灵兽系统】 修改bug 2020-11-02 16:17:58 +08:00
gaoxin 6a14154c89 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-11-02 16:05:28 +08:00
gaoxin 6d5e17f1a6 【战斗】前端添加自动上传结果不一致的战斗数据的功能。 2020-11-02 16:05:24 +08:00
zhangqiang 3f9bdf316d 【灵兽系统】 加引导 和 特权加15日礼包 判断 2020-11-02 15:56:31 +08:00
wangzhenxing 6c388f5d94 【效果】添加119效果 2020-11-02 16:21:06 +09:00
zhangqiang 65b5cff36d 【灵兽系统】 修改bug 2020-11-02 16:17:33 +08:00
gaoxin acaece5483 【战斗】前端添加自动上传结果不一致的战斗数据的功能。 2020-11-02 16:07:43 +08:00
zhangqiang df8f8d6dd0 【灵兽系统】 加引导 和 特权加15日礼包 判断 2020-11-02 15:56:06 +08:00
wangzhenxing 201fa0530a [效果 被动]添加119效果 109,136,160 被动修改(我方攻击加血不会触发) 2020-11-02 15:49:18 +09:00
liujiaqi e0df526cd4 灵兽相关道具图标资源占坑 2020-11-02 14:56:27 +08:00
zhangqiang d0a8e96d5e 【灵兽系统】 添加驱灵币跳转按钮 and 特权礼包排序 2020-11-02 14:36:44 +08:00
gaoxin 5b2801755e 【战斗】修复技能效果修改导致被动技能报错的问题 2020-11-02 14:12:03 +08:00
wangzhenxing ce0e5a8229 【灵兽放生】灵兽放生界面数量超过一屏,选中底部灵兽选中状态错误修改 2020-11-02 15:02:47 +09:00
zhangqiang 3bbaab27be 【灵兽系统】 添加驱灵币跳转按钮 and 特权礼包排序 2020-11-02 14:36:21 +08:00
gaoxin c90e209fd6 【战斗】修复技能效果修改导致被动技能报错的问题 2020-11-02 14:12:28 +08:00
gaoxin aaadcba680 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-11-02 13:49:26 +08:00
gaoxin a04b12c93d 【战斗】修复部分被动技能报错 2020-11-02 13:49:21 +08:00
wangzhenxing d5afae7352 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-11-02 14:14:05 +09:00
wangzhenxing 27bbe94ad9 [灵兽]灵兽放生修改,灵兽抽卡结果界面再来一次添加妖晶抽卡次数 2020-11-02 14:13:39 +09:00
wangzhenxing 52fbe638f6 [灵兽]灵兽聚灵结果界面再来一次添加妖晶抽卡限制次数 2020-11-02 13:59:55 +09:00
gaoxin 02a57e692c 【战斗】修复部分被动技能报错 2020-11-02 13:49:53 +08:00
zhangqiang ff68e3d0bc 【达人排行榜】 达人排行榜底部显示问题 2020-11-02 12:55:00 +08:00
zhangqiang 148b068c79 【达人排行榜】 达人排行榜底部显示问题 2020-11-02 12:54:36 +08:00
gaoxin 9b65cbba0f 【战斗】灵兽技能前摇特效播放位置调整,灵兽技能条件添加类型3,修复灵兽立绘不会回收的问题 2020-11-02 11:55:28 +08:00
gaoxin cddc94f41e Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-11-02 11:54:54 +08:00
gaoxin a4254e28cb 【战斗】灵兽技能前摇特效播放位置调整,灵兽技能条件添加类型3,修复灵兽立绘不会回收的问题 2020-11-02 11:54:48 +08:00
zhangqiang 20795b326a 【灵兽系统】bug 2020-11-02 11:53:26 +08:00
zhangqiang 4cb30990e1 【灵兽系统】 bug 需同步 2020-11-02 11:52:00 +08:00
zhangqiang d5e4b46e45 【灵兽系统】bug 同步到dev 2020-11-02 11:00:21 +08:00
zhangqiang c206f6487e 【灵兽系统】 漏合 2020-11-02 10:59:17 +08:00
zhangqiang 8f71eb7672 【灵兽系统】bug 同步到dev 2020-11-02 10:58:48 +08:00
zhangqiang 1cb323a700 【灵兽系统】 预设修改 2020-11-02 10:16:36 +08:00
gaoxin 230788670d 【战斗】主动效果117,118添加 2020-11-02 10:00:32 +08:00
gaoxin 4201f2d7cd 【战斗】主动效果117,118添加 2020-11-02 10:00:05 +08:00
gaoxin a42f259c29 【灵兽】遗漏特效资源补齐 2020-11-01 17:01:30 +08:00
gaoxin 3cdc100777 【社稷大典/灵兽】特效资源重新整理 2020-11-01 17:00:39 +08:00
gaoxin 23253f96a2 【社稷大典】名字重复的资源处理 2020-11-01 16:23:08 +08:00
gaoxin 21ec70a29e 【灵兽】抽卡特效位置移动 2020-11-01 16:20:04 +08:00
gaoxin 9ed00e0ba5 【战斗】灵兽战斗逻辑同步 2020-11-01 16:17:26 +08:00
gaoxin e0665012c2 【社稷大典】名字重复的资源处理 2020-11-01 16:09:49 +08:00
gaoxin 5f80b60e44 【灵兽】抽卡特效位置移动 2020-11-01 15:46:48 +08:00
gaoxin a2bfc34833 【音效】打开界面播放音效时不再播放点击音效 2020-11-01 14:45:09 +08:00
zhangqiang 3479bd153c 【灵兽系统】 合并 功能ok 但是战斗合完进不去 2020-10-31 17:01:46 +08:00
zhangqiang 005f36c524 【灵兽系统】 修改bug 2020-10-31 14:49:58 +08:00
liujiaqi 7175dbaf64 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-30 17:56:03 +08:00
liujiaqi d7205653ad 10.30更新,灵兽技能文字资源 2020-10-30 17:55:06 +08:00
zhangqiang 4f25b8cc98 【灵兽系统】 修改bug 2020-10-30 17:48:49 +08:00
wangzhenxing b50f468e33 [灵兽]战中施法特效提交 2020-10-30 17:44:20 +09:00
gaoxin d942fa6f67 【战斗】针对灵兽添加一些效果的屏蔽2 2020-10-30 17:32:40 +08:00
zhangqiang 349831895e Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-11-02 06:30:53 +08:00
zhangqiang 66a603f429 [灵兽系统]召唤提交 2020-11-02 06:30:41 +08:00
zhangqiang 571a62a3c2 灵兽召唤提交 2020-11-02 05:03:34 +08:00
gaoxin 4a76f49f7f 【战斗】针对灵兽添加一些效果的屏蔽 2020-10-30 16:15:40 +08:00
gaoxin 26fa127b14 【战斗】修复敌方数据有灵兽时报错 2020-10-30 15:49:27 +08:00
zhangqiang 1d768be6b3 【灵兽系统】 拖拽层级错误修改 2020-10-30 13:48:14 +08:00
gaoxin d7a33ed404 【逍遥游】首通需要显示奖励数量 2020-10-30 13:28:57 +08:00
gaoxin f519c35bbd 【逍遥游】修改地图的解锁方式为按顺序解锁,奖励显示不再显示数量并添加标签显示。 2020-10-30 13:28:19 +08:00
liujiaqi c16a291063 逍遥特权图标资源 2020-10-30 13:28:10 +08:00
jiaoyangna 39dbd3f640 逍遥游幸运转盘提交 2020-10-30 13:27:45 +08:00
yuanshuai 1eba61731e 【逍遥游】首通奖励显示脚本提交 2020-10-30 11:03:50 +08:00
yuanshuai ec3defb2c4 【逍遥游】首通奖励协议提交 2020-10-30 11:03:39 +08:00
wangzhenxing c2f46b2077 [灵兽]灵兽技能修改 2020-10-30 11:53:13 +09:00
gaoxin c58ae0e2f8 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-30 11:00:33 +08:00
gaoxin 0ea86402c5 【逍遥游】首通需要显示奖励数量 2020-10-30 11:00:27 +08:00
zhangqiang 36d1d84cce 【大闹天宫】 试炼节点 战斗结束掉英雄报错卡死 2020-10-30 10:28:20 +08:00
zhangqiang 018c571a93 【大闹天宫】 试炼节点 战斗结束掉英雄报错卡死 2020-10-30 10:27:57 +08:00
gaoxin 6df6aa4a74 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-30 10:26:40 +08:00
gaoxin 09fc5118a0 【战斗】修复战斗界面销毁时未回收延迟资源,导致报错的问题 2020-10-30 10:26:35 +08:00
jiaoyangna 1e2688e84c 【运筹帷幄】乾坤宝盒活动详情中的概率公示,少一个魂印 2020-10-30 10:09:11 +08:00
jiaoyangna 4b88ce6eb3 【运筹帷幄】限时召唤界面,up将白片 2020-10-30 10:09:04 +08:00
zhangqiang c4a9cb99cf 【主题活动】commit 2020-10-30 10:08:54 +08:00
zhangqiang 6c1cf4de1a 【运筹帷幄】1 2020-10-30 10:08:41 +08:00
wangzhenxing 424cfead9a 灵兽特效层级修改 2020-10-29 20:37:43 +09:00
jiaoyangna d91d181d89 【运筹帷幄】乾坤宝盒活动详情中的概率公示,少一个魂印 2020-10-29 19:32:14 +08:00
jiaoyangna fbb4d457f2 【运筹帷幄】限时召唤界面,up将白片 2020-10-29 19:26:03 +08:00
jiaoyangna f93f614fca Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-29 19:23:19 +08:00
jiaoyangna ac9b0e35df 修改灵兽特效 2020-10-29 19:22:56 +08:00
gaoxin be6e2ba6f4 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-29 17:48:52 +08:00
gaoxin cc052b4aa7 【逍遥游】修改地图的解锁方式为按顺序解锁,奖励显示不再显示数量并添加标签显示。 2020-10-29 17:48:46 +08:00
zhangqiang 232e9b718c 【灵兽系统】 修改技能显示 2020-10-29 17:40:53 +08:00
wangzhenxing 68885da727 技能释放修改 2020-10-29 18:11:13 +09:00
wangzhenxing b330049037 【灵兽】灵兽逻辑修改 2020-10-29 17:12:21 +09:00
zhangqiang c22b0d34d5 【灵兽系统】 红点刷新 2020-10-29 16:58:00 +08:00
liujiaqi a4804a8693 逍遥特权图标资源 2020-10-29 16:31:59 +08:00
zhangqiang 5d2bfdc46b 【灵兽系统】 动画调整 2020-10-29 15:37:19 +08:00
jiaoyangna 0191b61a17 灵兽烛龙修改提交 2020-10-29 14:44:33 +08:00
jiaoyangna 452a3ac096 逍遥游幸运转盘提交 2020-10-29 14:12:51 +08:00
wangzhenxing 02d4a3ab13 【灵兽】特效表现修改 2020-10-29 15:12:03 +09:00
wangzhenxing 09cd47db46 【灵兽】bug修改 buffctr 报错修改 2020-10-29 11:18:11 +09:00
liujiaqi f51fff07fb 灵兽技能图标资源 2020-10-29 11:03:34 +08:00
zhangqiang 17465d4d99 【灵兽系统】 bug 2020-10-29 11:01:03 +08:00
zhangqiang fc0eea1bb7 【灵兽系统】 bug 修改 2020-10-29 10:43:45 +08:00
zhangqiang 4d4cd55010 【灵兽系统】 bug 2020-10-28 19:49:14 +08:00
zhangqiang fee2af0b86 【主题活动】commit 2020-10-28 18:36:54 +08:00
zhangqiang b62e553e9e 【灵兽系统】 bug 2020-10-28 18:32:59 +08:00
gongjiawei 69e9fe21dc 音频更新 2020-10-28 18:24:42 +08:00
wangzhenxing f5abd32d63 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-28 18:09:11 +09:00
zhangqiang 0f5583e0f9 【灵兽系统】bug 修改 2020-10-28 17:57:30 +08:00
wangzhenxing 0b9efcdd69 灵兽bug修改提交 2020-10-28 18:08:56 +09:00
wangzhenxing 4bcd3abe86 抽卡修改提交 2020-10-28 18:07:06 +09:00
zhangqiang afed2cad3b 【灵兽系统】 bug 2020-10-28 16:31:08 +08:00
wangzhenxing b108d3bc85 灵兽bug修改 2020-10-28 16:30:12 +09:00
zhangqiang 3fcc213718 【灵兽系统】 问题修改 2020-10-28 15:27:43 +08:00
zhangqiang 0ba57c8c82 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-28 14:10:34 +08:00
zhangqiang 73fc8282ee 运筹帷幄提交 2020-10-28 14:10:20 +08:00
zhangqiang e60d24f9a3 【灵兽系统】 修改bug 2020-10-28 11:48:36 +08:00
yuanshuai 83014b4f7d 【逍遥游】首通奖励显示脚本提交 2020-10-28 11:47:05 +08:00
yuanshuai 08a1d3a98d 【逍遥游】首通奖励协议提交 2020-10-28 11:31:00 +08:00
wangzhenxing 574a1df34a 灵兽战斗修改提交 2020-10-28 11:58:47 +09:00
zhangqiang 7e7316c52c 【灵兽系统】 星际修改 2020-10-28 10:50:16 +08:00
zhangqiang ef51dea897 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-28 10:35:58 +08:00
zhangqiang 8070a4fa47 【灵兽系统】 星级居中修改 2020-10-28 10:35:50 +08:00
wangzhenxing 132c49a807 [灵兽] 灵兽策划反馈bug修改 2020-10-28 10:17:20 +09:00
JieLing 8b22166237 【商店】 商店显示商品报错 步骤 月卡 激活 返回来 再点激活跳转商店 2020-10-28 07:48:30 +08:00
JieLing 48bf02ce81 【商店】 商店显示商品报错 步骤 月卡 激活 返回来 再点激活跳转商店 2020-10-27 19:29:35 +08:00
ZhangBiao 31edeb3ab5 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-10-27 16:32:53 +08:00
ZhangBiao 33e1ba20e8 【社稷大典】商店适配 2020-10-27 16:32:43 +08:00
wangzhenxing 8bba3a3be4 [灵兽放生]灵兽放生修改 2020-10-27 17:27:16 +09:00
ZhangBiao 18e829f603 【社稷大典】商店适配 2020-10-27 17:05:24 +08:00
JieLing 87817d4c36 【排行榜】 排行榜显示 2020-10-27 17:03:18 +08:00
zhangqiang a20217223a 【灵兽系统】 添加碎片合成红点 2020-10-27 17:02:37 +08:00
JieLing 0752b7694e 【排行榜】 排行榜显示 2020-10-27 16:23:35 +08:00
ZhangBiao 35f6a6c430 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
# Conflicts:
#	Assets/ManagedResources/Atlas/TagAtlas/r_shangdian_xuanyuan.png.meta
2020-10-27 16:16:10 +08:00
ZhangBiao acd3f336e9 【设计大典】特效添加 2020-10-27 16:15:34 +08:00
zhangqiang 0d9ed28c23 【灵兽系统】 资源替换 拖拽修改 2020-10-27 15:59:53 +08:00
gaoxin ec7e498b87 【战斗】修复持续伤害会出现小数的问题 2020-10-27 15:16:04 +08:00
gaoxin 02863c2bb4 【战斗】修复持续伤害会出现小数的问题 2020-10-27 15:15:43 +08:00
zhangqiang e1d14466db 协议提交 2020-10-27 14:10:24 +08:00
gaoxin 9add8d8dbf 【商店】修复ShopView销毁时会导致其他shopview物品回收的问题(修复商店偶现物品消失的问题) 2020-10-27 13:53:32 +08:00
JieLing 4b522dd9ea 【积天豪礼】$1 -> $0.99 2020-10-27 13:51:11 +08:00
gaoxin b128dc1b8b Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-27 12:02:32 +08:00
gaoxin 6292afc225 【商店】修复ShopView销毁时会导致其他shopview物品回收的问题(修复商店偶现物品消失的问题) 2020-10-27 12:02:28 +08:00
JieLing 90fb537c00 【资源】部分资源位置修改,防止热更资源过大 2020-10-27 11:06:49 +08:00
JieLing e1a8028ec6 【资源】部分资源位置修改,防止热更资源过大 2020-10-27 11:03:08 +08:00
zhangqiang f2151b12fb 【灵兽系统】 主城挪位置 合成最大限制 2020-10-27 10:26:31 +08:00
wangzhenxing eb109ff09b 灵兽信息显示界面修改 2020-10-27 11:23:14 +09:00
gaoxin 13f37fa31a Merge branch '0功能/灵兽战斗' into master_develop 2020-10-27 10:07:29 +08:00
gaoxin c4ca00dfd3 【战斗】灵兽加入测试战斗 2020-10-27 10:07:18 +08:00
gaoxin 9808cad9b9 【逍遥游】骰子音效替换 2020-10-26 20:20:51 +08:00
gaoxin 4139589270 【逍遥游】骰子音效替换 2020-10-26 20:20:32 +08:00
gaoxin 88516ad0e2 【战斗】加血普攻会触发降怒被动的问题,修改被动技能195全部免疫改为部分免疫 2020-10-26 19:43:04 +08:00
JieLing 7870934f0c Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-10-26 18:58:03 +08:00
yuanshuai 0ea67ffa33 【逍遥游】骰子动画优化,隐藏动画下面的黑影 2020-10-26 18:57:45 +08:00