Commit Graph

944 Commits (bdb9eeba2dab0f3627bdefdb50ca6dcd27f836f9)

Author SHA1 Message Date
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
jiaoyangna 5d3d65871a [主题活动-社稷大典]商店立绘重叠提交 2020-10-26 18:44:57 +08:00
ZhangBiao 6eea05fa06 【竞技场】领奖界面报错修改 2020-10-26 17:30:26 +08:00
jiaoyangna d8f5a48811 【累计充值】提示修改 2020-10-26 16:51:47 +08:00
ZhangBiao b2c841e572 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-10-26 16:11:11 +08:00
ZhangBiao 709dc1a5bd 【社稷大典】时间弹跳修复,物品边框颜色修改 2020-10-26 16:10:58 +08:00
yuanshuai 0fee60ea37 【逍遥游】骰子动画修改 2020-10-26 15:19:33 +08:00
jiaoyangna ce5db82250 乾坤商店立绘重叠,限时召唤up神将文字和icon重叠 修改 2020-10-26 15:05:59 +08:00
zhangqiang b7103ae709 百上回时间调整 2020-12-03 15:03:52 +08:00
ZhangBiao 4b0332f12c 【竞技场】赢了我加分对方减分,输了无变化
(cherry picked from commit 8f7cf8ca39dd8395a5b2b46eadb8d4f575289ce5)
2020-12-02 10:35:44 +08:00
jiaoyangna bfc6d0810b Merge branch 'master_xma_local' into master_develop
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Mission/MissionDailyPanel.prefab
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua
2020-09-20 17:08:59 +08:00
ZhangBiao 101c23c794 Merge branch '0功能/竞技场胜负奖励' into master_develop 2020-11-26 14:29:54 +08:00
gaoxin f7676f2c93 Merge branch 'master_xma_local' into master_develop
# Conflicts:
#	Assets/ManagedResources/EffectResSkill/Effect_c_dhdj_00042_s1/Materials/Effect_c_swk_00015_s1_attack_PG_014.mat.meta
#	Assets/ManagedResources/EffectResSkill/Effect_c_dhdj_00042_s1/Prefab/Effect_c_dhdj_00042_s1_attack_PG_01.prefab
#	Assets/ManagedResources/EffectResSkill/Effect_c_dhdj_00042_s1/Prefab/Effect_c_dhdj_00042_s1_attack_PG_02.prefab
#	Assets/ManagedResources/EffectResSkill/Effect_c_dhdj_00042_s1/Prefab/Effect_c_dhdj_00042_s1_attack_PG_03.prefab
#	Assets/ManagedResources/EffectResSkill/Effect_c_dhdj_00042_s1/Texture/H_shandian_82.tga.meta
#	Assets/ManagedResources/EffectResSkill/Effect_c_swk_00015_s1/Materials/Effect_c_swk_00015_s1_attack_PG_014.mat.meta
#	Assets/ManagedResources/EffectResSkill/Effect_c_swk_00015_s1/Materials/Effect_c_swk_00015_s1_attack_PG_014_mat.mat.meta
#	Assets/ManagedResources/EffectResSkill/Effect_c_swk_00015_s1/Texture/H_shandian_82.tga.meta
#	Assets/ManagedResources/EffectResSkill/Effect_c_swk_00015_s1/Texture/H_shandian_82_tga.tga.meta
2020-11-17 18:38:24 +08:00
ZhangBiao 2dd30f9ca3 【森罗幻境】敌将详情 敌将位置调整 2020-11-17 14:55:21 +08:00
gaoxin 8b001af5b6 Merge branch 'master_xma_local' into master_develop
# Conflicts:
#	Assets/ManagedResources/Atlas/RoleInfoAtlas/r_hero_juexinchengong.png.meta
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua
2020-11-13 19:48:27 +08:00
ZhangBiao c2933ddb96 Merge branch '0活动开发聚集地/灵兽抽卡(可更换兽)' into master_develop
# Conflicts:
#	Assets/ManagedResources/BG/lingshou_lingshoubeijing_03.jpg.meta
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua
2020-11-13 14:20:49 +08:00
ZhangBiao 8185be7c27 【灵兽抽卡】增加可选灵兽 2020-11-13 12:12:06 +08:00
zhangqiang 33a40c700d 【献祭坛】 适配修改 2020-11-12 16:57:50 +08:00
zhangqiang a5f744261b 【觉醒】bug 修改 公会成员灵兽显示错误 2020-11-12 14:38:01 +08:00
zhangqiang 1615d0c2d2 【觉醒】问题修改 2020-11-12 13:55:15 +08:00
zhangqiang f746575b10 Merge branch '0功能/神将觉醒' into master_develop 2020-11-11 11:38:43 +08:00
gaoxin 5a6b83ebe6 Merge branch 'master_xma_local' into master_develop
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/Language.lua
2020-11-10 10:41:02 +08:00
zhangqiang 10db1d34b3 【神将升级】 升星未卡住 and 神将合成报错 2020-11-10 10:17:42 +08:00
ZhangBiao 454a70668d 【易经宝库】格子点击位置不准确修复 曾加tips 2020-11-09 15:39:25 +08:00
ZhangBiao 82dc9fac73 【易经宝库】第三层抽取完成后bug修复
(cherry picked from commit 9ca403ebff)
2020-11-09 11:12:28 +08:00
wangzhenxing bcabd3b36d gm 测试战斗添加设置皮肤 2020-11-09 10:12:45 +09:00
jiaoyangna 351785e3fc Merge branch 'master_xma_local' into master_develop
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
2020-11-06 21:11:18 +08:00
gaoxin 53b6f4483f Merge branch 'master_xma_local' into master_develop
# Conflicts:
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_ls_yl_vo_01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_ls_zl_vo_01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/skill/Audio_ls_bz.mp3.meta
#	Assets/ManagedResources/Audio/Skill/skill/Audio_ls_bz01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/skill/Audio_ls_fh.mp3.meta
#	Assets/ManagedResources/Audio/Skill/skill/Audio_ls_fh01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/skill/Audio_ls_fh03.mp3.meta
#	Assets/ManagedResources/Audio/Skill/skill/Audio_ls_hd01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/skill/Audio_ls_ql01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/skill/Audio_ls_yl.mp3.meta
#	Assets/ManagedResources/Audio/Skill/skill/Audio_ls_yl01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/skill/Audio_ls_zl.mp3.meta
#	Assets/ManagedResources/Audio/Skill/skill/Audio_ls_zl02.mp3.meta
#	Assets/ManagedResources/Audio/Skill/skill/Audio_ls_zl03.mp3.meta
#	Assets/ManagedResources/Icon/Hero/c_dhdj_00042_s1_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_dhdj_00042_s1_t3.png.meta
#	Assets/ManagedResources/Icon/Hero/c_swk_00015_s1_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_swk_00015_s1_t3.png.meta
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
2020-11-06 19:56:52 +08:00
ZhangBiao 73c94dee90 Merge branch '0活动开发聚集地/易经宝库' into master_develop
# Conflicts:
#	Assets/ManagedResources/EffectResSkill/Effect_c_dhdj_00042_s1/Materials.meta
#	Assets/ManagedResources/EffectResUI/YiJingBaoKu/Materials.meta
#	Assets/ManagedResources/Effects/Model/Materials.meta
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/View/UpView.lua
2020-11-06 17:34:27 +08:00
yuanshuai cb2bc989fa 【逍遥游】预设修改提交 2020-11-06 15:26:23 +08:00
gaoxin f3690d5c03 Merge branch 'master_xma_local' into master_develop
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Main/GMPanel.prefab
2020-11-06 11:47:13 +08:00
jiaoyangna be7be732d3 Merge branch 'master_develop' into 0功能/皮肤
# Conflicts:
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
2020-11-06 10:54:04 +08:00
zhangqiang 6488dad50a 【献祭坛】 资源适配替换 2020-11-05 20:08:46 +08:00
zhangqiang 4f0d2626b5 【大闹天宫】 新增需求 增加圣物 新标 提示 2020-11-05 17:04:38 +08:00
zhangqiang 86f224a8ec 【逍遥游】恭喜获得奖励过多会超框 修改成两行 2020-11-04 18:29:42 +08:00
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 098ff3b2d6 【日常任务】 宝箱位置调整 2020-11-04 11:33:22 +08:00
zhangqiang 765c5b874a 【献祭坛】预设微调 2020-11-04 10:58:19 +08:00
ZhangBiao b31f5881ce 【特权商城】报错修改 2020-11-03 17:55:03 +08:00
ZhangBiao d2da2c362d 【特权商城】增加 灵兽特权礼包 文字描述 2020-11-03 17:06:10 +08:00
zhangqiang 47ea758d67 【灵兽系统】 羁绊预设微调 2020-11-03 16:11:00 +08:00
zhangqiang 812e6b8f0b 【灵兽系统】召唤界面 按钮位置有问题 2020-11-03 14:52:51 +08:00
zhangqiang 79aeb8720d 【灵兽系统】 按钮位置调整 2020-11-03 14:18:38 +08:00
gaoxin ad4d9bdce1 【商店】修复灵兽山跳转灵兽商店会显示其他商店的数据的问题 2020-11-02 22:51:36 +08:00
wangzhenxing 2f14ebdb81 【神将分解】恭送神将预设修改提交 2020-11-02 20:29:37 +09:00
JieLing 2620d55085 【资源】 修改资源路径 2020-11-02 20:00:07 +08:00
zhangqiang 08708c841c 【灵兽系统】 调主城的位置 2020-11-02 18:16:51 +08:00
wangzhenxing 05d3dc7732 [灵兽抽卡 灵兽放生]灵兽抽卡再来一次显示修改,灵兽放生显示返还货币修改 2020-11-02 17:45:36 +09:00
zhangqiang de9a7d4d82 【灵兽系统】 修改bug 2020-11-02 16:17:58 +08:00
wangzhenxing 27bbe94ad9 [灵兽]灵兽放生修改,灵兽抽卡结果界面再来一次添加妖晶抽卡次数 2020-11-02 14:13:39 +09:00
gaoxin a4254e28cb 【战斗】灵兽技能前摇特效播放位置调整,灵兽技能条件添加类型3,修复灵兽立绘不会回收的问题 2020-11-02 11:54:48 +08:00
gaoxin e0665012c2 【社稷大典】名字重复的资源处理 2020-11-01 16:09:49 +08:00
zhangqiang 005f36c524 【灵兽系统】 修改bug 2020-10-31 14:49:58 +08:00
zhangqiang 4f25b8cc98 【灵兽系统】 修改bug 2020-10-30 17:48:49 +08:00
wangzhenxing b50f468e33 [灵兽]战中施法特效提交 2020-10-30 17:44:20 +09:00
zhangqiang 66a603f429 [灵兽系统]召唤提交 2020-11-02 06:30:41 +08:00
zhangqiang 1d768be6b3 【灵兽系统】 拖拽层级错误修改 2020-10-30 13:48:14 +08:00
wangzhenxing c2f46b2077 [灵兽]灵兽技能修改 2020-10-30 11:53:13 +09:00
wangzhenxing 424cfead9a 灵兽特效层级修改 2020-10-29 20:37:43 +09:00
jiaoyangna d91d181d89 【运筹帷幄】乾坤宝盒活动详情中的概率公示,少一个魂印 2020-10-29 19:32:14 +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
zhangqiang 5d2bfdc46b 【灵兽系统】 动画调整 2020-10-29 15:37:19 +08:00
jiaoyangna 452a3ac096 逍遥游幸运转盘提交 2020-10-29 14:12:51 +08:00
zhangqiang fc0eea1bb7 【灵兽系统】 bug 修改 2020-10-29 10:43:45 +08:00
zhangqiang b62e553e9e 【灵兽系统】 bug 2020-10-28 18:32:59 +08:00
zhangqiang 0f5583e0f9 【灵兽系统】bug 修改 2020-10-28 17:57:30 +08: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 e60d24f9a3 【灵兽系统】 修改bug 2020-10-28 11:48:36 +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
ZhangBiao 18e829f603 【社稷大典】商店适配 2020-10-27 17:05:24 +08:00
zhangqiang 0d9ed28c23 【灵兽系统】 资源替换 拖拽修改 2020-10-27 15:59:53 +08:00
zhangqiang f2151b12fb 【灵兽系统】 主城挪位置 合成最大限制 2020-10-27 10:26:31 +08: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
yuanshuai f97263ff09 【逍遥游】骰子动画优化,隐藏动画下面的黑影 2020-10-26 18:56:35 +08:00
jiaoyangna 9c7839540a [灵兽系统]羁绊排序,羁绊红点修改 2020-10-26 17:40:54 +08:00
gaoxin 00f262d2f4 【灵兽】战斗内灵兽头像显示添加 2020-10-26 16:45:33 +08:00
jiaoyangna 37259287a4 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-26 16:43:37 +08:00
jiaoyangna 94858e80ff 【主题活动-累计充值】 文字提示修改 2020-10-26 16:43:22 +08:00
jiaoyangna 1ebd6a5727 灵兽召唤提交 2020-10-26 16:00:34 +08:00
wangzhenxing 443bdab87f Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-26 16:27:38 +09:00
ZhangBiao d4b75e0d73 【社稷大典】时间弹跳修复,物品边框颜色修改
(cherry picked from commit 709dc1a5bd)
2020-10-26 16:24:16 +08:00
wangzhenxing 91ed513602 人物信息修改提交 2020-10-26 16:26:21 +09:00
jiaoyangna bdfb518274 乾坤商店立绘重叠,限时召唤up神将文字和icon重叠 修改 2020-10-26 15:11:44 +08:00
yuanshuai afd0b542fe 骰子动画修改 2020-10-26 15:04:44 +08:00
gaoxin 9ac7e7b9a3 Merge branch 'master_develop' into 0功能/灵兽战斗
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Main/BattleData1.lua
2020-10-26 14:33:22 +08:00
gaoxin 7b64ca48d3 【灵兽】战斗界面结构修改 2020-10-26 11:41:51 +08:00
zhangqiang aff128d50a 灵兽提交 2020-10-24 19:46:10 +08:00
wangzhenxing a0270d471b 灵兽提交 2020-10-24 18:41:20 +09:00
ZhangBiao d36645cc7f 【社稷大典】资源修改 2020-10-24 17:36:51 +08:00
zhangqiang b569a35aea 预设合并提交 2020-10-24 16:55:06 +08:00
wangzhenxing e381b9e771 灵兽放生修改提交 2020-10-24 16:51:09 +09:00
ZhangBiao d2bc65ec48 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-24 16:47:57 +08:00
ZhangBiao 7b4f959687 Merge branch '0活动开发聚集地/社稷大典' into master_develop
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Logic/GameEvent.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
2020-10-24 16:47:45 +08:00
zhangqiang c791399431 灵兽提交 2020-10-24 16:44:05 +08:00
ZhangBiao c768775e06 【社稷大典】加完红点完事了 2020-10-24 16:18:57 +08:00
zhangqiang 3d72b9c0ea 灵兽提交 添加羁绊红点预设 2020-10-24 16:11:58 +08:00
wangzhenxing e30de8da3f 灵兽提交 2020-10-24 15:32:39 +09:00
jiaoyangna 2238dc5db4 灵兽抽卡 修改 2020-10-29 15:08:22 +08:00
zhangqiang 0f4cd6d43e Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统 2020-10-24 14:15:45 +08:00
zhangqiang 7a4cd7ba8f 零售品升级升星红点 2020-10-24 14:15:35 +08:00
ZhangBiao ce11afc1e8 添加公会检查 和排行细节修改,初始的进度条积分有问题 2020-10-24 13:18:04 +08:00
ZhangBiao d57fc60aa1 社稷大典,差个加工会限制和领奖界面 2020-10-23 19:34:03 +08:00
jiaoyangna 7bfec03778 Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统 2020-10-23 19:14:31 +08:00
jiaoyangna f882c9c70c 抽卡提交 2020-10-23 19:14:24 +08:00
jiaoyangna 2f83fdfd95 灵兽抽卡回滚提交 2020-11-05 05:54:10 +08:00
zhangqiang 291cddbb3f 灵兽提交 2020-10-23 19:10:00 +08:00
zhangqiang 2cf881c4d5 灵兽提交 2020-10-23 15:12:21 +08:00
jiaoyangna eee353cc4e generalpopup commit 2020-11-05 03:06:53 +08:00
jiaoyangna c1b227c26b Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统 2020-11-05 03:03:16 +08:00
jiaoyangna da88485b4c lingshou zhaohuan tijiao 2020-11-05 03:03:08 +08:00
jiaoyangna e9f42ce609 Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonManager.lua
2020-11-04 22:27:36 +08:00
jiaoyangna d49c1b97cb 灵兽羁绊提交 2020-11-04 22:25:59 +08:00
zhangqiang 6767828cdc Merge branch 'master_develop' into 0功能/灵兽系统
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/Spine/ls_06_baize.meta
#	Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize.atlas.txt.meta
#	Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize.png.meta
#	Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize.skel.bytes.meta
#	Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize_Atlas.asset
#	Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize_Atlas.asset.meta
#	Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize_Material.mat
#	Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize_Material.mat.meta
#	Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize_SkeletonData.asset
#	Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize_SkeletonData.asset.meta
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Language.lua
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Logic/GameEvent.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
#	Assets/ManagedResources/~Lua/View/ItemView.lua
#	Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
2020-10-23 14:38:50 +08:00
wangzhenxing 91ee82c5e1 涅槃提交 2020-10-23 14:05:50 +09:00
wangzhenxing 1466227510 Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统 2020-10-23 09:55:02 +09:00
wangzhenxing 22a2789d08 灵兽涅槃提交 2020-10-23 09:54:49 +09:00
zhangqiang 7452d795e8 灵兽提交 2020-10-22 20:50:11 +08:00
zhangqiang eb153fdaa6 灵兽提交 2020-10-22 16:13:44 +08:00
zhangqiang 0270d54e10 灵兽提交 2020-10-22 12:41:44 +08:00
zhangqiang 83088ea429 提交 2020-10-22 10:03:46 +08:00
wangzhenxing 11ccf2ab6f 灵兽分解预设提交 2020-10-21 17:25:12 +09:00
zhangqiang 74858bdbe7 灵兽提交 2020-10-21 15:40:23 +08:00
zhangqiang f8d6c63368 灵兽提交 上阵提交 2020-10-21 11:58:16 +08:00
zhangqiang 3a6c14f607 灵兽提交 2020-10-20 20:18:02 +08:00
yuanshuai c3a67ef9aa Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys 2020-10-20 16:07:02 +08:00
yuanshuai 85507e2f6a 逍遙游自动游历开启 相关脚本资源提交 2020-10-20 16:06:52 +08:00
wangzhenxing ab4fa7925d Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统 2020-10-20 16:17:21 +09:00
zhangqiang c6f34794f3 灵兽提交 2020-10-20 16:08:51 +08:00
wangzhenxing 4e047140a8 灵兽提交 2020-10-20 16:17:08 +09:00
JieLing e3cac704d0 【逍遥游】优化奖励界面显示 2020-10-20 15:16:01 +08:00
yuanshuai 8f4464e693 骰子动画添加提交 2020-10-19 22:54:59 +08:00
ZhangBiao 072ab2ba46 逍遥游 commit 2020-10-19 22:18:31 +08:00
ZhangBiao ddfca80c45 逍遥 commit 2020-10-19 21:59:48 +08:00
ZhangBiao ec0f15f489 Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys 2020-10-19 21:40:24 +08:00
ZhangBiao bfc4e834e4 修改boss 奖励 2020-10-19 21:40:17 +08:00
yuanshuai 7b40a855b9 自动游历功能屏蔽 2020-10-19 21:31:33 +08:00
yuanshuai 4f0f06b359 逍遥游红点提交 2020-10-19 21:30:31 +08:00
zhangqiang e47a1d5a45 灵兽提交 2020-10-19 20:30:28 +08:00
yuanshuai fab7ff6557 Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys 2020-10-19 20:29:57 +08:00
yuanshuai 4316c30bf2 逍遥游红点和帮助弹窗提交 2020-10-19 20:29:49 +08:00