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 |
jiaoyangna
|
29789b6c0d
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-10-26 18:45:12 +08:00 |
jiaoyangna
|
5d3d65871a
|
[主题活动-社稷大典]商店立绘重叠提交
|
2020-10-26 18:44:57 +08:00 |
ZhangBiao
|
3d19d05b04
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-10-26 18:07:40 +08:00 |
ZhangBiao
|
d7ad797ce5
|
【车迟斗法】点击抢夺下方名字修改
|
2020-10-26 18:07:28 +08:00 |
wangzhenxing
|
f3d5640893
|
人物信息显示详情修改
|
2020-10-26 19:04:56 +09:00 |
yuanshuai
|
f97263ff09
|
【逍遥游】骰子动画优化,隐藏动画下面的黑影
|
2020-10-26 18:56:35 +08:00 |
zhangqiang
|
3107e9a00f
|
【灵兽系统】 技能显示修改
|
2020-10-26 18:26:23 +08:00 |
JieLing
|
ef4f4232cb
|
【灵兽系统】 修改显示 排行榜显示修改
|
2020-10-26 18:04:45 +08:00 |
JieLing
|
837d7d8886
|
【社稷大典】 公会排行显示问题
|
2020-10-26 17:59:58 +08:00 |
jiaoyangna
|
ce05f94695
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-26 17:41:06 +08:00 |
jiaoyangna
|
9c7839540a
|
[灵兽系统]羁绊排序,羁绊红点修改
|
2020-10-26 17:40:54 +08:00 |
ZhangBiao
|
6eea05fa06
|
【竞技场】领奖界面报错修改
|
2020-10-26 17:30:26 +08:00 |
zhangqiang
|
388cb8a418
|
【灵兽系统】 修改合成逻辑
|
2020-10-26 17:23:08 +08:00 |
ZhangBiao
|
9a15a6e5b9
|
【社稷大典】捐献后 左上角 按钮状态切换修复
(cherry picked from commit c2612e2ca8)
|
2020-10-26 17:17:28 +08:00 |
ZhangBiao
|
79774302f5
|
【社稷大典】左上公会排行空白修改
(cherry picked from commit 5a20d41b77)
|
2020-10-26 17:17:20 +08:00 |
ZhangBiao
|
e03d5449e5
|
【社稷大典】打开社稷大典界面 时被提出公会 检测
(cherry picked from commit 0340b7d468)
|
2020-10-26 17:17:12 +08:00 |
jiaoyangna
|
f47ca02503
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-26 17:14:49 +08:00 |
jiaoyangna
|
db98590cf3
|
【灵兽系统】召唤修改
|
2020-10-26 17:14:24 +08:00 |
zhangqiang
|
35f64de903
|
【灵兽系统】 修改预设加载
|
2020-10-26 17:11:04 +08:00 |
ZhangBiao
|
6149e88620
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-10-26 17:04:28 +08:00 |
ZhangBiao
|
c2612e2ca8
|
【社稷大典】捐献后 左上角 按钮状态切换修复
|
2020-10-26 17:04:07 +08:00 |
JieLing
|
0b8abaeabf
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-10-26 16:51:53 +08:00 |
jiaoyangna
|
d8f5a48811
|
【累计充值】提示修改
|
2020-10-26 16:51:47 +08:00 |
ZhangBiao
|
a9e8cad755
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-10-26 16:50:03 +08:00 |
ZhangBiao
|
5a20d41b77
|
【社稷大典】左上公会排行空白修改
|
2020-10-26 16:49:47 +08:00 |
JieLing
|
a33ac4576f
|
添加一个特效打包路径
|
2020-10-26 16:45:43 +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 |
ZhangBiao
|
0340b7d468
|
【社稷大典】打开社稷大典界面 时被提出公会 检测
|
2020-10-26 16:37:56 +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 |
liujiaqi
|
e80c0f8e0d
|
【社稷大典】商店标题资源替换
|
2020-10-26 16:06:55 +08:00 |
jiaoyangna
|
573fc1d5f8
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-26 16:01:34 +08:00 |
jiaoyangna
|
1ebd6a5727
|
灵兽召唤提交
|
2020-10-26 16:00:34 +08:00 |
zhangqiang
|
2a6954293a
|
【灵兽系统】 灵兽羁绊战力计算修改
|
2020-10-26 15:47:14 +08:00 |
JieLing
|
21f0e6abfb
|
【逍遥游】动画资源引用错误
|
2020-10-26 15:46:24 +08:00 |
wangzhenxing
|
c5b97f3cda
|
灵兽去除log
|
2020-10-26 16:42:48 +09:00 |
JieLing
|
0b2a309b60
|
【逍遥游】删除旧骰子资源
|
2020-10-26 15:39:49 +08:00 |
gaoxin
|
76dadc8077
|
【逍遥游】合并后资源缺失
|
2020-10-26 15:30:24 +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
|
1444c0712c
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-26 16:25:44 +08:00 |
ZhangBiao
|
d4b75e0d73
|
【社稷大典】时间弹跳修复,物品边框颜色修改
(cherry picked from commit 709dc1a5bd)
|
2020-10-26 16:24:16 +08:00 |
ZhangBiao
|
ddd417b3f3
|
【社稷大典】捐献品价值修改
(cherry picked from commit d30209f844)
|
2020-10-26 16:24:06 +08:00 |
ZhangBiao
|
55f9ccdb86
|
【社稷大典】捐献品3 点击加号跳转
(cherry picked from commit 469235ff74)
|
2020-10-26 16:23:58 +08:00 |
ZhangBiao
|
8f0553c1f6
|
【社稷大典】长按贡献数量不够无法捐赠bug修复
(cherry picked from commit e6610518ce)
|
2020-10-26 16:23:50 +08:00 |
ZhangBiao
|
5bf6dfb39f
|
【社稷大典】提交8 漏题补
|
2020-10-26 16:23:40 +08:00 |
yuanshuai
|
46b48f53d9
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-26 16:21:54 +08:00 |
yuanshuai
|
8015f4cfc7
|
【逍遥游】犀牛贺州地图资源提交
|
2020-10-26 16:21:42 +08:00 |
wangzhenxing
|
91ed513602
|
人物信息修改提交
|
2020-10-26 16:26:21 +09:00 |
yuanshuai
|
0fee60ea37
|
【逍遥游】骰子动画修改
|
2020-10-26 15:19:33 +08:00 |
gaoxin
|
71dc347456
|
【逍遥游】删除旧骰子动画,修复新动画缺失的问题
|
2020-10-26 15:18:32 +08:00 |
gaoxin
|
c2db80b5bf
|
【逍遥游】骰子资源提交
|
2020-10-26 15:15:56 +08:00 |
jiaoyangna
|
942849cdcf
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-10-26 15:06:24 +08:00 |
jiaoyangna
|
ce5db82250
|
乾坤商店立绘重叠,限时召唤up神将文字和icon重叠 修改
|
2020-10-26 15:05:59 +08:00 |
gaoxin
|
343237ae6d
|
【灵兽】战斗数据协议添加,修复战斗数据组建错误
|
2020-10-26 14:56:03 +08:00 |
zhangqiang
|
0a5816a4ec
|
线上问题工会技能战力修改
|
2020-10-26 14:47:14 +08:00 |
zhangqiang
|
b6f48c4910
|
线上战力 属性取整问题
|
2020-10-26 14:46:43 +08:00 |
wangzhenxing
|
71f365b3e4
|
人物信息显示修改
|
2020-10-26 15:35:03 +09:00 |
jiaoyangna
|
bdfb518274
|
乾坤商店立绘重叠,限时召唤up神将文字和icon重叠 修改
|
2020-10-26 15:11:44 +08:00 |
jiaoyangna
|
88afa2d704
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-26 15:07:13 +08:00 |
yuanshuai
|
e37e260678
|
Merge branch 'master_devlop_ys' into master_develop
|
2020-10-26 15:05:43 +08:00 |
yuanshuai
|
afd0b542fe
|
骰子动画修改
|
2020-10-26 15:04:44 +08:00 |
gaoxin
|
1dc2b96916
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-26 14:57:05 +08:00 |
gaoxin
|
e96bfbdbf5
|
【灵兽】获取全部灵兽信息接口修改返回数组,修复打开灵兽信息界面报错
|
2020-10-26 14:57:01 +08:00 |
zhangqiang
|
982e29b2ba
|
线上问题工会技能战力修改
|
2020-10-26 14:45:29 +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
|
4265c533c8
|
【战斗】GM战斗测试数据提交
|
2020-10-26 14:32:48 +08:00 |
zhangqiang
|
21f8a21aec
|
灵兽提交
|
2020-10-26 14:25:35 +08:00 |
gaoxin
|
2eef0bbac5
|
【逍遥游】删除旧骰子动画,修复新动画缺失的问题
|
2020-10-26 14:09:55 +08:00 |
liujiaqi
|
3e9cedaf34
|
设计商店图标
|
2020-11-01 12:15:45 +08:00 |
gaoxin
|
8a455e2c9e
|
【灵兽】后端数据解析添加
|
2020-10-26 14:03:59 +08:00 |
gaoxin
|
7b64ca48d3
|
【灵兽】战斗界面结构修改
|
2020-10-26 11:41:51 +08:00 |
zhangqiang
|
5a72414908
|
灵兽修改提交
|
2020-10-26 11:34:01 +08:00 |
zhangqiang
|
af2364c075
|
线上战力 属性取整问题
|
2020-10-26 11:33:23 +08:00 |
gaoxin
|
fc7b5d2c48
|
【逍遥游】骰子资源提交
|
2020-10-26 10:43:44 +08:00 |
gaoxin
|
3aa5ac3207
|
【社稷大典】特效资源添加
|
2020-10-26 10:26:36 +08:00 |
jiaoyangna
|
11d0d95bde
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-29 10:13:11 +08:00 |
jiaoyangna
|
0a610313a6
|
主题活动图片资源修改提交,累计重置红点检测修改提交
|
2020-10-29 10:12:47 +08:00 |
gaoxin
|
fe7d22e4ae
|
【灵兽】灵兽战斗表现添加
|
2020-10-26 10:13:31 +08:00 |
zhangqiang
|
3fa9583f56
|
灵兽修改提交
|
2020-10-26 10:10:29 +08:00 |
zhangqiang
|
aff128d50a
|
灵兽提交
|
2020-10-24 19:46:10 +08:00 |
gaoxin
|
043304eb18
|
Merge branch 'master_develop' into 0功能/灵兽战斗
|
2020-10-24 18:51:57 +08:00 |
wangzhenxing
|
ac0c59e9a1
|
灵兽显示修改
|
2020-10-24 18:54:14 +09:00 |
wangzhenxing
|
a0270d471b
|
灵兽提交
|
2020-10-24 18:41:20 +09:00 |
zhangqiang
|
1d67775000
|
灵兽提交
|
2020-10-24 18:14:00 +08:00 |
ZhangBiao
|
d36645cc7f
|
【社稷大典】资源修改
|
2020-10-24 17:36:51 +08:00 |
gaoxin
|
bb66461441
|
Merge branch 'master_develop' into 0功能/灵兽战斗
|
2020-10-24 17:17:52 +08:00 |
gaoxin
|
bb23a7541d
|
【灵兽】战斗逻辑添加
|
2020-10-24 17:17:07 +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 |
jiaoyangna
|
2ad9c6cdeb
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-29 16:17:15 +08:00 |
jiaoyangna
|
87b9c2dd0d
|
灵兽羁绊,御兽斋红点提交
|
2020-10-29 16:17:09 +08:00 |
jiaoyangna
|
d3b53a0eba
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-29 15:56:41 +08:00 |
jiaoyangna
|
93758f24f8
|
Merge branch '0功能/灵兽系统' into master_develop
|
2020-10-29 15:55:50 +08:00 |
jiaoyangna
|
92946fe32d
|
baocuo xiugai
|
2020-10-29 15:54:25 +08:00 |
jiaoyangna
|
94c6c2242e
|
Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统
|
2020-10-29 15:38:39 +08:00 |
jiaoyangna
|
f1c18bcb7b
|
报错修改
|
2020-10-29 15:38:34 +08:00 |
jiaoyangna
|
33b8067bf6
|
漏提
|
2020-10-29 15:10:42 +08:00 |
jiaoyangna
|
2238dc5db4
|
灵兽抽卡 修改
|
2020-10-29 15:08:22 +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 |
zhangqiang
|
194187e5e5
|
灵兽提交
|
2020-10-24 15:55:41 +08:00 |
zhangqiang
|
3407f7d57e
|
Merge branch '0功能/灵兽系统' into master_develop
# Conflicts:
# Assets/ManagedResources/Icons/ls_01_qingluan_t1.png.meta
# Assets/ManagedResources/Icons/ls_02_huodou_t1.png.meta
# Assets/ManagedResources/Icons/ls_03_yinglong_t1.png.meta
# Assets/ManagedResources/Icons/ls_04_zhulong_t1.png.meta
# Assets/ManagedResources/Icons/ls_05_fenghuang_t1.png.meta
# Assets/ManagedResources/Icons/ls_06_baize_t1.png.meta
# Assets/ManagedResources/Icons/ls_07_jukun_t1.png.meta
|
2020-10-24 15:41:12 +08:00 |
jiaoyangna
|
c2f2c8234b
|
神将修改
|
2020-10-29 13:17:56 +08:00 |
wangzhenxing
|
a853094356
|
Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统
|
2020-10-24 15:33:00 +09:00 |
zhangqiang
|
19f13e3cf6
|
灵兽连续升级修改
|
2020-10-24 15:25:24 +08:00 |
wangzhenxing
|
e30de8da3f
|
灵兽提交
|
2020-10-24 15:32:39 +09: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 |
gaoxin
|
ad2b935e26
|
Merge branch 'master_develop' into 0功能/灵兽战斗
# Conflicts:
# Assets/ManagedResources/EffectResSkill/Effect_ls_01_qingluan/Prefab/Effect_ls_01_qingluan_attack_01.prefab.meta
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleManager.lua.meta
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/RoleManager.lua.meta
|
2020-10-23 20:58:07 +08:00 |
gaoxin
|
17261cdcda
|
【灵兽】灵兽技能特效资源添加
|
2020-10-23 20:47:17 +08:00 |
gaoxin
|
cadc2d77b2
|
【战斗0.0.8】灵兽战斗结构搭建
|
2020-10-23 20:44:43 +08:00 |
jiaoyangna
|
a595c770a1
|
累计充值修改
|
2020-11-04 00:57:23 +08:00 |
jiaoyangna
|
12967078f0
|
限时召唤修改提交
|
2020-11-04 00:15:26 +08:00 |
jiaoyangna
|
73dce1a7c3
|
Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统
|
2020-10-23 20:02:33 +08:00 |
jiaoyangna
|
2e962b3cef
|
抽卡界面修改提交
|
2020-10-23 20:02:20 +08:00 |
jiaoyangna
|
a21d28fb83
|
再来十次修改提交
|
2020-10-23 19:38:27 +08:00 |
ZhangBiao
|
d57fc60aa1
|
社稷大典,差个加工会限制和领奖界面
|
2020-10-23 19:34:03 +08:00 |
jiaoyangna
|
e6aad73af4
|
louti
|
2020-10-23 19:31:39 +08:00 |
jiaoyangna
|
1ef09a42f5
|
再来一次界面修改提交
|
2020-10-23 19:30:32 +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 |
jiaoyangna
|
911c4b9f54
|
xieyi commit
|
2020-11-05 04:11:09 +08:00 |
zhangqiang
|
291cddbb3f
|
灵兽提交
|
2020-10-23 19:10:00 +08:00 |
wangzhenxing
|
7072f53fab
|
合并冲突提交
|
2020-10-23 19:53:45 +09:00 |
wangzhenxing
|
bfaed0d937
|
灵兽放生提交
|
2020-10-23 19:45:14 +09:00 |
zhangqiang
|
e7c981763a
|
language 修改
|
2020-10-23 15:58:38 +08:00 |
zhangqiang
|
2cf881c4d5
|
灵兽提交
|
2020-10-23 15:12:21 +08:00 |
jiaoyangna
|
92cdfa96aa
|
tupian meta commit
|
2020-11-05 03:07:34 +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
|
a39bc32ef6
|
灵兽羁绊提交
|
2020-11-04 23:00:32 +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 |
liujiaqi
|
95072a98c5
|
灵兽商店社稷大典商店标题资源灵兽小头像
|
2020-10-22 19:00:10 +08:00 |
jiaoyangna
|
dbccde8b77
|
累计充值修改提交
|
2020-11-04 05:30:12 +08:00 |
jiaoyangna
|
b6e5225bcf
|
累计充值修改提交
|
2020-11-04 05:23:46 +08:00 |
jiaoyangna
|
aac7afa586
|
主题活动修改
|
2020-11-04 04:34:51 +08:00 |
jiaoyangna
|
205340e73a
|
累计充值修改
|
2020-11-04 04:05:20 +08:00 |
jiaoyangna
|
fca650d5b3
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-11-04 03:51:10 +08:00 |
jiaoyangna
|
14b7b6f4cf
|
累计充值修改
|
2020-11-04 03:51:04 +08:00 |
zhangqiang
|
6d200caf1d
|
灵兽提交 战力改变
|
2020-10-22 18:32:11 +08:00 |
wangzhenxing
|
c5b73fed7f
|
抽卡灵兽修改
|
2020-10-22 16:25:40 +09:00 |
wangzhenxing
|
b49c3f220d
|
Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统
|
2020-10-22 16:15:57 +09:00 |
zhangqiang
|
eb153fdaa6
|
灵兽提交
|
2020-10-22 16:13:44 +08:00 |
wangzhenxing
|
e193bc2c21
|
灵兽抽卡剩余时间修改
|
2020-10-22 16:15:09 +09:00 |
wangzhenxing
|
1dbfab0029
|
灵兽抽卡显示修改
|
2020-10-22 16:07:38 +09:00 |
wangzhenxing
|
e516aa6c14
|
被动效果修改
|
2020-10-22 14:53:49 +09:00 |
zhangqiang
|
0270d54e10
|
灵兽提交
|
2020-10-22 12:41:44 +08:00 |
jiaoyangna
|
b93bef6237
|
剔除id为0 的礼包
|
2020-10-22 11:26:00 +08:00 |
jiaoyangna
|
7931e3ed1c
|
Merge branch 'master_develop' into master_devlop_ys
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Player/AutoRecoverManager.lua
|
2020-10-22 11:12:17 +08:00 |
zhangqiang
|
83088ea429
|
提交
|
2020-10-22 10:03:46 +08:00 |
jiaoyangna
|
420cef2355
|
无效的红点检测
|
2020-10-21 18:24:17 +08:00 |
wangzhenxing
|
11ccf2ab6f
|
灵兽分解预设提交
|
2020-10-21 17:25:12 +09:00 |
jiaoyangna
|
d555d983ea
|
累计充值修改提交, 灵兽提交
|
2020-10-21 16:05:33 +08:00 |
wangzhenxing
|
02c55bcdb3
|
Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统
|
2020-10-21 16:41:22 +09:00 |
wangzhenxing
|
80ebcccbbc
|
灵兽放生提交
|
2020-10-21 16:41:11 +09:00 |
zhangqiang
|
74858bdbe7
|
灵兽提交
|
2020-10-21 15:40:23 +08:00 |
jiaoyangna
|
b26ba765bc
|
勇往直前 提交
|
2020-10-21 14:16:02 +08:00 |
zhangqiang
|
f8d6c63368
|
灵兽提交 上阵提交
|
2020-10-21 11:58:16 +08:00 |
gaoxin
|
b72d6b46bb
|
Revert "【战斗0.0.7】修复熬丙十星天赋不对追加得技能生效得问题"
This reverts commit b8eabfe641.
|
2020-10-20 21:17:26 +08:00 |
gaoxin
|
b8eabfe641
|
【战斗0.0.7】修复熬丙十星天赋不对追加得技能生效得问题
|
2020-10-20 20:36:44 +08:00 |
gaoxin
|
8081350fbe
|
【战斗0.0.6】修复判断数据是否存在接口错误
|
2020-10-20 20:26:44 +08:00 |
zhangqiang
|
3a6c14f607
|
灵兽提交
|
2020-10-20 20:18:02 +08:00 |
gaoxin
|
711b240235
|
骰子音效遴选提交
|
2020-10-20 18:10:07 +08:00 |
yuanshuai
|
8cb68ceaa4
|
逍遥游地图界面优化:1.自动游历返回时提示二级确认弹窗 2.记录自动游历状态
|
2020-10-20 18:05:33 +08:00 |
jiaoyangna
|
ecd0cc8f22
|
逍遥游云游宝玉修改提交
|
2020-10-20 17:40:47 +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
|
a3b8be0abe
|
技能期间只触发一次被动触发条件修改
|
2020-10-20 16:20:14 +09: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
|
3666441445
|
【逍遥游】修复行动力不会恢复满的问题
|
2020-10-20 15:16:07 +08:00 |
JieLing
|
e3cac704d0
|
【逍遥游】优化奖励界面显示
|
2020-10-20 15:16:01 +08:00 |
ZhangBiao
|
23f4b9c65d
|
【推送礼包】推送最新礼包的拍脸
(cherry picked from commit 958234c826)
|
2020-10-20 14:59:25 +08:00 |
gaoxin
|
8aa4abdbeb
|
【逍遥游】云游值自动恢复修改
|
2020-10-20 00:23:42 +08:00 |
gaoxin
|
7ea442ff5d
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Player/AutoRecoverManager.lua
|
2020-10-19 23:52:22 +08:00 |
gaoxin
|
27eaa02a88
|
修复部分奖励不刷新的问题
|
2020-10-19 23:51:15 +08:00 |
yuanshuai
|
92af021625
|
倒计时云游值回复问题修改
|
2020-10-19 23:49:21 +08:00 |
yuanshuai
|
7e0f32ec1f
|
逍遥游bug修改
|
2020-10-19 23:24:07 +08:00 |
gaoxin
|
4eb846d8c3
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
|
2020-10-19 22:56:22 +08:00 |
gaoxin
|
ba87f5c181
|
【逍遥游】功能入口随功能开启添加
|
2020-10-19 22:56:05 +08:00 |
yuanshuai
|
8f4464e693
|
骰子动画添加提交
|
2020-10-19 22:54:59 +08:00 |
ZhangBiao
|
9bde86217d
|
Revert "逍遥游 兑换界面修改"
This reverts commit 8bed258441.
|
2020-10-19 22:23:28 +08:00 |
ZhangBiao
|
acfccff38a
|
Revert "兑换界面修改"
This reverts commit 0467627fe8.
|
2020-10-19 22:23:18 +08:00 |
ZhangBiao
|
57f1a4ee60
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
|
2020-10-19 22:18:38 +08:00 |
ZhangBiao
|
072ab2ba46
|
逍遥游 commit
|
2020-10-19 22:18:31 +08:00 |
yuanshuai
|
64113b5103
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
|
2020-10-19 22:12:18 +08:00 |
yuanshuai
|
6a0938655a
|
骰子资源提交
|
2020-10-19 22:12:07 +08:00 |
ZhangBiao
|
ddfca80c45
|
逍遥 commit
|
2020-10-19 21:59:48 +08:00 |
jiaoyangna
|
2d4ce422da
|
monterr gift patface
|
2020-10-19 21:59:07 +08:00 |
jiaoyangna
|
1d8ac73a44
|
拍脸commit
|
2020-10-19 21:57:56 +08:00 |
jiaoyangna
|
1677642f3b
|
tuisonglibao patface
|
2020-10-19 21:57:39 +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
|
d97142bb6d
|
逍遥游脚本修改
|
2020-10-19 21:35:12 +08:00 |
yuanshuai
|
7b40a855b9
|
自动游历功能屏蔽
|
2020-10-19 21:31:33 +08:00 |
yuanshuai
|
4f0f06b359
|
逍遥游红点提交
|
2020-10-19 21:30:31 +08:00 |
ZhangBiao
|
27f8331e62
|
轩辕 修改 提交
|
2020-10-19 21:21:54 +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 |
wangzhenxing
|
63adfc1097
|
修改188被动 义结金兰不触发其他被动
|
2020-10-19 21:28:47 +09:00 |
wangzhenxing
|
4a21eae8f4
|
188被动普攻排序修改
|
2020-10-19 21:22:13 +09:00 |
jiaoyangna
|
165d29fb73
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
|
2020-10-19 20:21:41 +08:00 |
jiaoyangna
|
0467627fe8
|
兑换界面修改
|
2020-10-19 20:21:36 +08:00 |
jiaoyangna
|
8bed258441
|
逍遥游 兑换界面修改
|
2020-10-19 20:21:01 +08:00 |
gaoxin
|
8f1601a573
|
重复资源删除
|
2020-10-19 20:19:45 +08:00 |
jiaoyangna
|
4a32348f90
|
yushe xiugai
|
2020-10-19 20:10:19 +08:00 |
wangzhenxing
|
cddd7a8824
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-19 21:08:17 +09:00 |
gaoxin
|
f006531707
|
【战斗0.0.4】修复战斗开始时偶现卡牌人物裁切显示错误的问题
|
2020-10-19 21:05:05 +08:00 |
wangzhenxing
|
f7865231ef
|
被动188 改为血量百分比排序
|
2020-10-19 21:07:53 +09:00 |
jiaoyangna
|
f72b3d8fe0
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
|
2020-10-19 18:33:40 +08:00 |
jiaoyangna
|
875ed67864
|
购买 commit
|
2020-10-19 18:33:29 +08:00 |
zhangqiang
|
086292c67e
|
提交
|
2020-10-19 18:28:29 +08:00 |
yuanshuai
|
95ed2ba352
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
|
2020-10-19 18:19:22 +08:00 |
yuanshuai
|
fdf1fe5724
|
逍遥游脚本修改
|
2020-10-19 18:19:05 +08:00 |
jiaoyangna
|
66a3754adb
|
boss commit
|
2020-10-19 18:03:58 +08:00 |
gaoxin
|
affdfb81aa
|
【逍遥游】地图界面3、4、5位置调整
|
2020-10-19 17:15:16 +08:00 |
zhangqiang
|
034230ffc9
|
提交
|
2020-10-19 16:57:30 +08:00 |
gaoxin
|
0e19f21805
|
【自动恢复物品】物品恢复机制改为前端计算
|
2020-10-19 16:48:42 +08:00 |
gaoxin
|
27d9738696
|
【战斗0.0.4】修复战斗开始时偶现卡牌人物裁切显示错误的问题
|
2020-10-19 16:48:23 +08:00 |
gaoxin
|
539be2d810
|
【自动恢复物品】物品恢复机制改为前端计算
|
2020-10-19 16:46:24 +08:00 |
jiaoyangna
|
56898d9c26
|
逍遥commit
|
2020-10-19 16:41:04 +08:00 |
yuanshuai
|
911bacc56c
|
逍遙游預設脚本提交
|
2020-10-19 16:00:48 +08:00 |
yuanshuai
|
b1c9e0a986
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
|
2020-10-19 15:13:07 +08:00 |
yuanshuai
|
1297d0682b
|
資源提交
|
2020-10-19 15:12:47 +08:00 |
jiaoyangna
|
8baa135cba
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
|
2020-10-19 15:06:33 +08:00 |
jiaoyangna
|
b93b5eaedb
|
xiaoyao commit
|
2020-10-19 15:06:27 +08:00 |
gaoxin
|
be2230ba6d
|
【战斗 0.0.3】尝试修复偶现战斗卡死得问题
|
2020-10-19 14:38:57 +08:00 |
yuanshuai
|
773fb4085e
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
|
2020-10-19 14:38:56 +08:00 |
yuanshuai
|
d844a36917
|
逍遥游脚本提交
|
2020-10-19 14:38:44 +08:00 |
jiaoyangna
|
00cef72905
|
prefab 修改提交
|
2020-10-19 14:25:13 +08:00 |
gaoxin
|
5e12a55f33
|
【战斗0.0.2】修复新增的被动技能非技能出发时报错的问题
|
2020-10-19 14:19:48 +08:00 |
jiaoyangna
|
a2f23a825f
|
灵兽 提交
|
2020-10-19 14:14:52 +08:00 |
jiaoyangna
|
30c03acf1e
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
|
2020-10-19 14:11:11 +08:00 |
jiaoyangna
|
c45d8ac743
|
灵兽 提交
|
2020-10-19 14:10:46 +08:00 |
gaoxin
|
00a39a450b
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
|
2020-10-19 14:08:36 +08:00 |
gaoxin
|
7a540133bd
|
【逍遥游】优化返回逍遥游界面时重置滚动位置的问题
|
2020-10-19 14:08:28 +08:00 |
jiaoyangna
|
01f5227c72
|
xiaoyao commit
|
2020-10-19 13:50:23 +08:00 |
yuanshuai
|
9143bd4236
|
yushetijiao
|
2020-10-19 12:16:20 +08:00 |
yuanshuai
|
aff5e01480
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua
|
2020-10-19 11:57:59 +08:00 |
yuanshuai
|
964abba2a0
|
逍遥游脚本预设提交
|
2020-10-19 11:53:47 +08:00 |
jiaoyangna
|
707e824aed
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
|
2020-10-19 11:42:22 +08:00 |
gaoxin
|
3b62c91c69
|
优化逍遥游地图进度显示,添加暂不开放的地图处理
|
2020-10-19 11:40:05 +08:00 |
jiaoyangna
|
be359476d4
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
|
2020-10-19 11:39:30 +08:00 |
jiaoyangna
|
86ca33c7a4
|
xiaoyao commit
|
2020-10-19 11:39:11 +08:00 |
gaoxin
|
f3e675903a
|
优化逍遥游地图界面显示,
|
2020-10-19 11:15:32 +08:00 |
wangzhenxing
|
84faff7246
|
Assets/ManagedResources/~Lua/Data/UIData.lua 合并冲突
|
2020-10-19 11:44:43 +09:00 |
zhangqiang
|
92b2c3d6fb
|
提交
|
2020-10-19 10:56:55 +08:00 |
gaoxin
|
fc3a8f78f2
|
逍遥游地图界面提交
|
2020-10-19 10:36:40 +08:00 |
wangzhenxing
|
5c6634d8d8
|
灵兽抽卡提交
|
2020-10-19 11:30:47 +09:00 |
jiaoyangna
|
4077683aaf
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
|
2020-10-19 10:24:48 +08:00 |
jiaoyangna
|
f62f3de37c
|
xiaoyao tijiao
|
2020-10-19 10:24:42 +08:00 |
yuanshuai
|
8735fcf83e
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
|
2020-10-17 20:05:28 +08:00 |
yuanshuai
|
8a9b32f050
|
逍遥游显示优化
|
2020-10-17 20:05:16 +08:00 |
jiaoyangna
|
633761b2a4
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
|
2020-10-17 20:00:15 +08:00 |
jiaoyangna
|
d4bcdd2975
|
xiaoyao boss xiugai
|
2020-10-17 19:59:11 +08:00 |
gaoxin
|
538660584e
|
【战斗0.0.1】删除log接口参数
|
2020-10-17 18:42:09 +08:00 |
gaoxin
|
fecc48acc2
|
修复关卡推送礼包报错的问题
|
2020-10-17 18:36:29 +08:00 |
yuanshuai
|
82d6754cd0
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
|
2020-10-17 18:10:10 +08:00 |
yuanshuai
|
69ed1376aa
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua
|
2020-10-17 18:09:45 +08:00 |
jiaoyangna
|
efa085707d
|
逍遥commit
|
2020-10-17 18:09:06 +08:00 |
yuanshuai
|
966822040f
|
逍遥游优化
|
2020-10-17 18:06:29 +08:00 |
jiaoyangna
|
5341483985
|
刷新界面
|
2020-10-17 17:09:48 +08:00 |
jiaoyangna
|
00da9f73a7
|
添加次数
|
2020-10-17 17:06:27 +08:00 |
gaoxin
|
8b24a89d56
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-17 16:34:34 +08:00 |
ZhangBiao
|
d029e1866e
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-23 17:35:59 +08:00 |
ZhangBiao
|
90a5c3f28d
|
限时召唤 更换主Up神将
|
2020-10-23 17:35:47 +08:00 |
gaoxin
|
149a1f09ac
|
修复治疗暴击时治疗量为0的问题
|
2020-10-17 16:34:24 +08:00 |
jiaoyangna
|
a90bb04673
|
添加云游值消耗
|
2020-10-17 16:07:05 +08:00 |
yuanshuai
|
a7abe7aee5
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua
|
2020-10-17 14:32:31 +08:00 |
yuanshuai
|
ecd4695a7b
|
逍遥游地图界面预设脚本修改
|
2020-10-17 14:31:23 +08:00 |
jiaoyangna
|
3ccf8c0dc2
|
xiaoyaoyou 修改
|
2020-10-17 14:27:19 +08:00 |
jiaoyangna
|
8635a61e78
|
转盘,boss 修改
|
2020-10-17 13:48:38 +08:00 |
jiaoyangna
|
93218d9e62
|
时间返回修改
|
2020-10-17 13:37:54 +08:00 |
wangzhenxing
|
711986c6a9
|
Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统
|
2020-10-17 14:11:47 +09:00 |
wangzhenxing
|
bd4f93309f
|
灵兽涅槃,召唤,商店提交
|
2020-10-17 14:11:34 +09:00 |
jiaoyangna
|
cb6e29076a
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
|
2020-10-16 19:19:41 +08:00 |
jiaoyangna
|
0703ea4f45
|
逍遥提交
|
2020-10-16 19:19:37 +08:00 |
yuanshuai
|
f25854797e
|
逍遥游 资源脚本预设提交
|
2020-10-16 18:39:49 +08:00 |
jiaoyangna
|
6db6317da2
|
添加剩余时间接口
|
2020-10-16 18:01:29 +08:00 |
jiaoyangna
|
2a5a23f3ed
|
显示优化提交
|
2020-10-16 17:37:54 +08:00 |
zhangqiang
|
7d2016c812
|
加跳转
|
2020-10-16 17:13:14 +08:00 |
zhangqiang
|
c6627d93e5
|
提交
|
2020-10-16 17:03:53 +08:00 |
zhangqiang
|
179242de4c
|
提交
|
2020-10-16 16:50:27 +08:00 |
yuanshuai
|
7498b4dc01
|
脚本預設提交
|
2020-10-16 15:39:48 +08:00 |