Commit Graph

10996 Commits (2d73b2d13a5ead748ad48c16c3d6b78c8391d354)
 

Author SHA1 Message Date
gaoxin 878e8b095a 【森罗幻境】修复老虎机小游戏后音效播放错误 2021-11-26 10:29:12 +08:00
gaoxin 3a574880ea Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-26 10:19:35 +08:00
gaoxin ad3ca2e0d2 【战斗】新增轩辕宝镜,僧罗幻境战斗类型,四灵试炼回放改为回放类型 2021-11-26 10:19:29 +08:00
ZhangBiao f83bffaf75 【固定活动】提交 2021-11-26 10:16:46 +08:00
ZhangBiao 7f525511c8 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-26 09:54:21 +08:00
ZhangBiao 45df1fb982 【寻仙招募】增加心愿阵营条 2021-11-26 09:54:12 +08:00
wangzhenxing 5449b2357d [战斗]=====效果132修改 2021-11-26 09:36:41 +08:00
jiaoyangna 8a3ca0cb97 天地洪炉提交 2021-11-25 19:06:20 +08:00
jiaoyangna 34949242a9 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
2021-11-25 18:57:48 +08:00
jiaoyangna fd22b5a87f 天地洪炉提交 2021-11-25 18:55:20 +08:00
ZhangBiao db5627ab24 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-25 18:51:46 +08:00
ZhangBiao fd97f584cb 【固定活动】调整 2021-11-25 18:51:36 +08:00
wangzhenxing 7949e8c21c 【战斗】========灵兽卡面翻转提交 2021-11-25 18:47:53 +08:00
wangzhenxing 6927b52365 [战斗]=======主角变身卡添加gm 2021-11-25 18:36:00 +08:00
ZhangBiao a8f666e901 【删除活动类型43】 2021-11-25 17:27:02 +08:00
ZhangBiao cb331c612e 【删除活动类那个43】 2021-11-25 16:51:35 +08:00
ZhangBiao d40b07138c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-25 16:16:48 +08:00
ZhangBiao bd4ce88486 【乾坤宝盒】报错修改 2021-11-25 16:16:39 +08:00
jiaoyangna a248330241 Merge branch 'china/dev' into 0功能/Incarnation
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.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/Message/ArenaInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsmanSoulMainPanel.lua
2021-11-25 16:10:14 +08:00
gaoxin 458b7b2ca5 【灵兽】升级时,没有战斗力变化提示 2021-11-25 16:03:41 +08:00
ZhangBiao 2d76df2105 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-25 15:59:42 +08:00
ZhangBiao 8da0a81588 【寻仙抽】提交 2021-11-25 15:59:31 +08:00
gaoxin 879cf506f5 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-25 15:43:15 +08:00
gaoxin 4923314bbb 【战斗】屏幕震动加入伤害延时时间 2021-11-25 15:43:10 +08:00
wangzhenxing aff13f8904 【战斗】======技能132-140提交 2021-11-25 15:07:40 +08:00
wangzhenxing b15eaf8b19 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-25 15:05:10 +08:00
wangzhenxing ae8021cd6a [战斗表现]========敌我方立绘镜像显示 2021-11-25 15:04:55 +08:00
gaoxin b316f54e50 【战斗】护盾特效层级问题优化 2021-11-25 14:46:46 +08:00
gaoxin 336321ebf3 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-25 14:44:15 +08:00
gaoxin a36714d286 【战斗】跳过提示文字:第二回合结束后可以跳过 2021-11-25 14:44:10 +08:00
jiaoyangna c5e80eb141 资源重复提交 2021-11-25 13:16:54 +08:00
ZhangBiao 0f0f08b260 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-25 11:52:45 +08:00
ZhangBiao 1c9d113a86 【活动、修为】界面调整 2021-11-25 11:52:35 +08:00
gaoxin 1a2a5e0c71 【普攻特效】人佛技能优化 2021-11-25 11:44:54 +08:00
gaoxin e1d36c413f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-25 11:20:06 +08:00
gaoxin 53648fbbe3 【每日豪礼】预设文字替换 2021-11-25 11:20:00 +08:00
ZhangBiao 3ffefeea3c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-25 11:03:17 +08:00
ZhangBiao 855f658a93 【灵兽宝阁】错误修改 2021-11-25 11:03:08 +08:00
gaoxin 347cc3f9ba 【每日豪礼】资源68->98 2021-11-25 10:47:02 +08:00
ZhangBiao 0d3f9c36ad 【灵脉秘境】背景图 2021-11-24 18:43:59 +08:00
ZhangBiao e4b0fd1824 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-24 18:14:37 +08:00
ZhangBiao ac768ff163 【常驻活动】提交 2021-11-24 18:14:25 +08:00
gaoxin 4607bd2fed Merge branch '0功能/账号id校验' into china/dev 2021-11-24 16:03:34 +08:00
gaoxin bb15f0056e 【战斗】弹道特效不在根据贝塞尔曲线运动 2021-11-24 14:42:11 +08:00
gaoxin 0ea258d1e8 【资源】各阵营普攻特效优化 2021-11-24 14:42:05 +08:00
gaoxin 36f017fbaa 【新普攻特效】显示优化 2021-11-24 14:41:59 +08:00
wangzhenxing 338312dbd7 【战斗】=======4阵营普通攻击新特效上传 2021-11-24 14:41:44 +08:00
gaoxin d1ce54c9a9 【测试战斗】报错修复 2021-11-24 14:22:27 +08:00
gaoxin f01889db21 【战斗】改为第三回合时战斗就可以跳过 2021-11-24 14:21:44 +08:00
gaoxin 86dff44ce7 【主界面按钮】兼容删除了的活动 2021-11-24 11:43:46 +08:00