gaoxin
|
d0cb62fab6
|
【背包】物品最大数量限制提示添加
|
2020-11-27 13:31:24 +08:00 |
zhangqiang
|
80c949c54d
|
【灵兽】 灵兽数据分页
|
2020-11-27 10:57:50 +08:00 |
gaoxin
|
ad9c72717a
|
【系统消息】修改系统消息点击法宝相关消息显示为一级的法宝信息
|
2020-11-27 10:49:20 +08:00 |
ZhangBiao
|
2df4f34c76
|
【编队优化】切磋增加一键
(cherry picked from commit e7a178aa0d99c0e9257c029ecabac2dac0a9b9d4)
|
2020-11-26 16:09:22 +08:00 |
ZhangBiao
|
13e2fbb98d
|
Merge branch '0功能/竞技场胜负奖励' into master_xma_local
|
2020-11-26 11:11:57 +08:00 |
zhangqiang
|
3f2029a681
|
旗开得胜 提交
|
2020-11-25 21:02:16 +08:00 |
ZhangBiao
|
be9b79897e
|
【竞技场】增加产出
|
2020-11-25 18:23:33 +08:00 |
wangzhenxing
|
4b6578e957
|
[战斗] 91 112 115 196 256 被动添加特性屏蔽修改
|
2020-11-24 11:31:02 +09:00 |
wangzhenxing
|
2cc096cd18
|
【战斗】147,206被动修改回原来的效果
|
2020-11-24 11:24:29 +09:00 |
wangzhenxing
|
e3e609c87e
|
[战斗] 245-256被动修改,修改英雄身上如果有两个相同类型被动只能触发一个的问题
|
2020-11-24 11:23:31 +09:00 |
gaoxin
|
34ae0ed497
|
【战斗】无用log删除,技能数量限制初始化数据位置错误
|
2020-11-23 21:36:34 +08:00 |
gaoxin
|
5e4f1a5165
|
v1.0.7
1、修复单个回合技能上限数值会在后端累加,当一场战斗结束此数值刚好达到上限时,下一场战斗毕定卡死的问题
|
2020-11-23 10:08:36 +08:00 |
ZhangBiao
|
d938acc273
|
【竞技场】增加输赢奖励掉落
|
2020-11-23 09:58:22 +08:00 |
gaoxin
|
85a608d21a
|
Revert "Revert "【战斗】v1.0.5""
This reverts commit 941cb86845.
|
2020-11-20 15:15:45 +08:00 |
gaoxin
|
941cb86845
|
Revert "【战斗】v1.0.5"
This reverts commit 0548b16015.
|
2020-11-20 15:07:27 +08:00 |
gaoxin
|
2331c8d013
|
【战斗】添加超时检测
|
2020-11-20 15:07:08 +08:00 |
gaoxin
|
0548b16015
|
【战斗】v1.0.5
1、修复人物行动前被持续伤害击杀,触发被击杀时追加技能,释放技能后战斗卡死的问题
2、添加每回合技能释放数量上限
|
2020-11-20 14:27:23 +08:00 |
zhangqiang
|
899903104f
|
【特权礼包】加等级显示前端
【公会副本】 加前端五点刷新不能扫荡
|
2020-11-19 19:30:46 +08:00 |
ZhangBiao
|
532e766de5
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-11-19 17:37:28 +08:00 |
ZhangBiao
|
d789b9e98e
|
【编队优化】轩辕宝镜一键特殊处理
|
2020-11-19 17:37:13 +08:00 |
ZhangBiao
|
c5c4efef63
|
Merge branch '0功能/增加一键上阵' into master_xma_local
|
2020-12-03 05:30:39 +08:00 |
jiaoyangna
|
8198b24720
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-11-19 17:22:33 +08:00 |
jiaoyangna
|
1299b62feb
|
灵兽宝阁位置名称修改
|
2020-11-19 17:22:10 +08:00 |
gaoxin
|
37631ebc67
|
【战斗】技能特效播放层级修改
|
2020-11-19 15:44:23 +08:00 |
jiaoyangna
|
8ceb1b4a51
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-11-19 15:28:27 +08:00 |
ZhangBiao
|
68cf2e356a
|
【竞技场】在线刷新没红点修复
|
2020-12-03 05:10:15 +08:00 |
ZhangBiao
|
3b4826c235
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-12-03 04:56:01 +08:00 |
ZhangBiao
|
2fbe5aa120
|
【大闹天宫】重置前五分钟踢出玩家
|
2020-12-03 04:55:51 +08:00 |
jiaoyangna
|
20564aee0f
|
【日常副本】解锁所有副本后,没有自动滚动到最后一个副本
|
2020-11-19 15:28:21 +08:00 |
jiaoyangna
|
0914dd6dc8
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-11-19 15:09:24 +08:00 |
jiaoyangna
|
2c72089def
|
【逍遥游】掷骰子播放时需要加限制,不能点击关闭,或者直接显示结果
|
2020-11-19 15:09:00 +08:00 |
gaoxin
|
59937a1132
|
【战斗】修改自动下落特效的时间为表配置
|
2020-11-19 14:53:45 +08:00 |
jiaoyangna
|
d8f31bab35
|
主题活动修改提交
|
2020-11-19 14:26:57 +08:00 |
jiaoyangna
|
e09872eb7f
|
限时招募修改提交
|
2020-11-19 10:35:21 +08:00 |
jiaoyangna
|
3e7c24c029
|
【主题活动】降龙伏虎
|
2020-11-18 18:15:50 +08:00 |
ZhangBiao
|
08657b4ffd
|
【编队优化】车迟 十绝 增加一键
|
2020-11-18 10:48:35 +08:00 |
ZhangBiao
|
646e3e8061
|
【编队优化】轩辕宝镜增加一键
|
2020-11-17 20:01:13 +08:00 |
ZhangBiao
|
a68a068746
|
【编队优化】巅峰赛增加一键
|
2020-11-17 19:59:18 +08:00 |
ZhangBiao
|
462484db66
|
【编队优化】竞技场防守编队增加一键
|
2020-11-17 19:57:17 +08:00 |
ZhangBiao
|
c8aa6b5971
|
【编队优化】公会副本增加一键
|
2020-11-17 19:54:02 +08:00 |
ZhangBiao
|
188dc707a9
|
【编队优化】大闹天宫增加一键
|
2020-11-17 19:42:08 +08:00 |
ZhangBiao
|
75c04b2c43
|
【编队优化】心魔试炼增加一键上阵
|
2020-11-17 17:41:06 +08:00 |
ZhangBiao
|
233ff1b361
|
【编队优化】无尽副本增加一键
|
2020-11-17 17:12:52 +08:00 |
ZhangBiao
|
de32379f8e
|
【竞技场】竞技场增加输赢奖励
|
2020-11-07 18:52:04 +08:00 |
jiaoyangna
|
ed6842d354
|
[变幻莫测] 资源提交
|
2020-09-20 00:15:43 +08:00 |
jiaoyangna
|
665e8f8d42
|
灵兽宝阁
|
2020-09-18 11:51:20 +08:00 |
zhangqiang
|
21683ce406
|
【神将升级 优化】 觉醒提示文字修改
|
2020-12-05 10:10:41 +08:00 |
gaoxin
|
7417f279bb
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-12-03 17:10:29 +08:00 |
gaoxin
|
18e6ce1181
|
【战斗】被动技能outdata添加胜利场数数据,修改被动225根据胜利场数计算,
|
2020-12-03 17:10:24 +08:00 |
ZhangBiao
|
491d770619
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-12-03 15:18:39 +08:00 |
ZhangBiao
|
27b178a215
|
【青龙秘宝】购买等级为0修改
|
2020-12-03 15:18:30 +08:00 |
zhangqiang
|
593aa53688
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-12-03 15:01:02 +08:00 |
zhangqiang
|
26d1bba3dc
|
变幻莫测 提交
|
2020-12-03 15:00:49 +08:00 |
gaoxin
|
9eaf7f8d6b
|
【战斗】修复回收机制错误,导致立绘重叠的问题,删除无用log
|
2020-12-03 11:44:57 +08:00 |
zhangqiang
|
e8a1e94830
|
【背包 bug】 装备页签显示的 当前数量 不应是种类 是总数量 修复
|
2020-12-02 20:39:28 +08:00 |
zhangqiang
|
c0f208b7d1
|
【巅峰赛 bug】 三局两胜 第三场不刷新bug
|
2021-01-21 21:33:36 +08:00 |
zhangqiang
|
852694c967
|
【竞技场】 防守记录积分显示修改
|
2021-01-19 23:00:13 +08:00 |
ZhangBiao
|
4b0332f12c
|
【竞技场】赢了我加分对方减分,输了无变化
(cherry picked from commit 8f7cf8ca39dd8395a5b2b46eadb8d4f575289ce5)
|
2020-12-02 10:35:44 +08:00 |
zhangqiang
|
c77327b1f0
|
【巅峰赛 bug】 竞猜修改2 + 巅峰赛结束后 竞猜界面没有刷新问题修改
|
2020-12-31 22:59:34 +08:00 |
ZhangBiao
|
d2689eba03
|
【青龙秘宝】修复延时
(cherry picked from commit 758c59dcae)
|
2020-12-01 15:59:15 +08:00 |
zhangqiang
|
972e83ec2f
|
【巅峰赛】 竞猜结果前端显示错误
|
2020-12-14 00:20:10 +08:00 |
gaoxin
|
f5823409cf
|
【角色】修复角色被动技能数量计算错误,兼容多合一被动
|
2020-11-30 21:17:24 +08:00 |
gaoxin
|
2f857869de
|
【战斗】修复lenthoftable方法在后端战斗中无法调用导致报错
|
2020-11-30 19:43:37 +08:00 |
gaoxin
|
98900329fc
|
【战斗】尝试修复退出战斗界面,资源回收错误,偶现报错的问题
|
2020-11-30 14:18:02 +08:00 |
gaoxin
|
d3c6c76fb1
|
【GM工具】添加添加圣物的GM
|
2020-11-30 14:17:12 +08:00 |
gaoxin
|
d1ba9b766e
|
【黑名单】修复跳转黑名单报错
|
2020-11-30 10:27:07 +08:00 |
wangzhenxing
|
560b58480d
|
[战斗] 99被动修改 屏蔽金翅大鹏不灭
|
2020-11-28 17:32:30 +09:00 |
zhangqiang
|
b0e4b6606e
|
【编队战力】 修改战力显示 2 未合 local
|
2020-11-28 17:20:44 +08:00 |
zhangqiang
|
a6339681ab
|
【编队战力】 编队界面的那个英雄战力计算修改
|
2020-11-28 17:13:01 +08:00 |
wangzhenxing
|
08f8a0ba9e
|
【战斗】 角色查找逻辑添加 排除拥有不灭的单位 和 没有不灭的无序列表 103效果改成治疗随机多个单位 276被动 改为给随机英雄加
|
2020-11-28 16:18:50 +09:00 |
zhangqiang
|
60a168fe48
|
【车迟斗法】 修改抢夺 挑战时会报错修复
|
2020-11-27 16:34:34 +08:00 |
zhangqiang
|
7ff9932661
|
【竞技场】 修复积分规则修改别的pvp 战斗结束后报错 bug
|
2020-11-27 15:17:36 +08:00 |
gaoxin
|
998a085caa
|
Merge remote-tracking branch 'origin/0功能/系统消息结构处理' into master_develop
|
2020-11-27 15:08:46 +08:00 |
gaoxin
|
0378485c97
|
Merge remote-tracking branch 'origin/0功能/背包最大值限制提示添加' into master_develop
|
2020-11-27 14:01:17 +08:00 |
gaoxin
|
f98156b5cc
|
Merge remote-tracking branch 'origin/0功能/背包最大值限制提示添加' into master_develop
|
2020-11-27 13:41:44 +08:00 |
zhangqiang
|
ff49cae4bb
|
【车迟斗法】 我编队为空 或者 对方编队我空 逻辑处理
|
2020-11-27 11:45:31 +08:00 |
zhangqiang
|
79fb88aa93
|
Merge branch 'master_xma_local' into master_develop
|
2020-11-27 11:03:33 +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
|
1dcb1a8eb2
|
【编队优化】切磋增加一键
(cherry picked from commit e7a178aa0d99c0e9257c029ecabac2dac0a9b9d4)
|
2020-11-26 16:08:48 +08:00 |
wangzhenxing
|
6f3d3e0f38
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-11-26 15:48:29 +09:00 |
wangzhenxing
|
febcd00a5f
|
【战斗】效果:103修改添加1个参数 被动 147 206修改 被动添加271-284
|
2020-11-26 15:48:15 +09:00 |
ZhangBiao
|
101c23c794
|
Merge branch '0功能/竞技场胜负奖励' into master_develop
|
2020-11-26 14:29:54 +08:00 |
gaoxin
|
d8be2456ea
|
【战斗】修复技能单回合限制会导致战斗卡死的问题
|
2020-11-24 19:18:59 +08:00 |
wangzhenxing
|
26519a2158
|
[战斗] 91 112 115 196 256 被动添加特性屏蔽修改
|
2020-11-23 15:08:22 +09:00 |
gaoxin
|
d0c0cd3f2c
|
Merge branch 'master_xma_local' into master_develop
|
2020-11-20 15:39:30 +08:00 |
wangzhenxing
|
53e473c325
|
【战斗】147,206被动修改回原来的效果
|
2020-11-20 10:00:16 +09:00 |
wangzhenxing
|
6ce8000c0b
|
[战斗] 245-256被动修改,修改英雄身上如果有两个相同类型被动只能触发一个的问题
|
2020-11-19 20:24:30 +09:00 |
gaoxin
|
1a88c57864
|
Merge remote-tracking branch 'origin/master_xma_local' into master_develop
|
2020-11-19 15:44:53 +08:00 |
gaoxin
|
b516397443
|
Merge branch 'master_xma_local' into master_develop
|
2020-11-19 14:54:12 +08:00 |
gaoxin
|
6be65652c5
|
Merge branch 'master_xma_local' into master_develop
|
2020-11-17 20:40:29 +08:00 |
gaoxin
|
ea5afc1ac3
|
【战斗】无用log删除
|
2020-11-17 20:40:23 +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 |
gaoxin
|
479c836292
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-11-17 15:14:31 +08:00 |
ZhangBiao
|
2dd30f9ca3
|
【森罗幻境】敌将详情 敌将位置调整
|
2020-11-17 14:55:21 +08:00 |
ZhangBiao
|
88d1be5daf
|
Revert "【森罗幻境】敌将详情 敌将位置调整"
This reverts commit f1402772f9.
|
2020-11-17 14:53:27 +08:00 |
ZhangBiao
|
f1402772f9
|
【森罗幻境】敌将详情 敌将位置调整
|
2020-11-17 14:51:25 +08:00 |
ZhangBiao
|
db9facba90
|
【天宫秘宝】领取宝箱积分后秘宝红点不刷新修复
(cherry picked from commit 04f8571692)
|
2020-11-17 11:54:58 +08:00 |
ZhangBiao
|
90f0ea6b67
|
【灵兽宝阁】单抽十连奖励获得界面上方货币显示不正确修复
(cherry picked from commit 69d818118c)
|
2020-11-17 10:59:48 +08:00 |
ZhangBiao
|
e6d0c6b0f2
|
【公告】打开公告前获取公告信息
|
2020-11-17 10:58:54 +08:00 |
gaoxin
|
9c158f1f99
|
Merge branch 'master_xma_local' into master_develop
# Conflicts:
|
2020-11-16 20:16:17 +08:00 |
ZhangBiao
|
bef1181f19
|
【灵兽宝阁】今日召唤上限次数不对修改
(cherry picked from commit 38e625aba1eee93177e41293eb35668cb3b6c3a2)
|
2020-11-16 17:50:46 +08:00 |
gaoxin
|
5ab9688089
|
Merge branch 'master_xma_local' into master_develop
|
2020-11-16 16:46:33 +08:00 |
gaoxin
|
64dc9d0181
|
Merge branch 'master_xma_local' into master_develop
|
2020-11-16 11:51:44 +08:00 |
gaoxin
|
6639b42bed
|
Merge branch 'master_xma_local' into master_develop
|
2020-11-16 10:13:01 +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 |
gaoxin
|
f17d8daa9f
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-11-13 17:25:47 +08:00 |
gaoxin
|
a62598207c
|
【测试战斗】修复添加属性被动时报错
|
2020-11-13 17:25:40 +08:00 |
ZhangBiao
|
10b3c375e7
|
【灵兽宝阁】增加假战斗
(cherry picked from commit 933f2d4768)
|
2020-11-13 16:38:41 +08:00 |
ZhangBiao
|
1e5e64db1e
|
【灵兽宝阁】倒计时显示刷新问题修复
(cherry picked from commit d739896793)
|
2020-11-13 16:36:13 +08:00 |
gaoxin
|
9e49e3e5ce
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-11-13 16:06:42 +08:00 |
gaoxin
|
779f61cc15
|
【封禁】添加封禁提示
|
2020-11-13 16:06:35 +08:00 |
wangzhenxing
|
7129226ff4
|
257,261,267被动修改
|
2020-11-13 16:05:56 +09: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 |
wangzhenxing
|
bb4dfa322c
|
【技能】被动265修改
|
2020-11-13 12:22:33 +09:00 |
wangzhenxing
|
2ed9f538b3
|
[技能] 被动效果修改
|
2020-11-13 10:40:39 +09:00 |
wangzhenxing
|
a1315561e1
|
被动修改提交
|
2020-11-12 20:22:52 +09:00 |
gaoxin
|
8fe495cf88
|
【战斗】修复获取空的灵兽数据报错的问题
|
2020-11-12 19:42:31 +08:00 |
zhangqiang
|
5da1841a03
|
【灵兽】灵兽上阵主界面名字颜色变化
|
2020-11-12 16:56:40 +08:00 |
wangzhenxing
|
c4af6714bc
|
额外配置技能添加
|
2020-11-12 15:16:30 +09:00 |
gaoxin
|
ec8a14004a
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-11-12 15:11:00 +08:00 |
gaoxin
|
db20230131
|
【战斗】假战斗加入对MonsterGroup配置的灵兽数据的处理
|
2020-11-12 15:10:53 +08:00 |
zhangqiang
|
a5f744261b
|
【觉醒】bug 修改 公会成员灵兽显示错误
|
2020-11-12 14:38:01 +08:00 |
zhangqiang
|
1615d0c2d2
|
【觉醒】问题修改
|
2020-11-12 13:55:15 +08:00 |
wangzhenxing
|
6a5a18eadd
|
被动描述修改提交
|
2020-11-12 11:31:25 +09:00 |
zhangqiang
|
e0c8ecfba8
|
Merge branch 'master_xma_local' into master_develop
# Conflicts:
# Assets/ManagedResources/EffectResSkill/Effect_c_swk_00015_s1/Prefab/Effect_c_swk_00015_s1_attack_PG_01.prefab
# Assets/ManagedResources/EffectResSkill/Effect_c_swk_00015_s1/Prefab/Effect_c_swk_00015_s1_attack_PG_02.prefab
# Assets/ManagedResources/EffectResSkill/Effect_c_swk_00015_s1/Prefab/Effect_c_swk_00015_s1_attack_PG_03.prefab
|
2020-11-11 20:33:41 +08:00 |
zhangqiang
|
82a2d14bb6
|
【觉醒】bug
|
2020-11-11 20:19:54 +08:00 |
zhangqiang
|
dcde0cf4ce
|
【灵兽提交】bug修改
|
2020-11-11 19:50:49 +08:00 |
wangzhenxing
|
d54fb77bda
|
【战斗】新增觉醒被动效果
|
2020-11-11 16:38:37 +09:00 |
zhangqiang
|
f746575b10
|
Merge branch '0功能/神将觉醒' into master_develop
|
2020-11-11 11:38:43 +08:00 |
ZhangBiao
|
793bc58af8
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-11-10 16:47:00 +08:00 |
ZhangBiao
|
5a8d009f39
|
【易经宝库】漏题
(cherry picked from commit ebe03eff48)
(cherry picked from commit a2db78b1541b8ab9fc83bf53c7af2661c91216bb)
|
2020-11-10 16:46:54 +08:00 |
ZhangBiao
|
5a075c4fb5
|
【易经宝库】抽取灵兽报错修复
|
2020-11-10 16:27:31 +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 |
zhangqiang
|
d3283d8094
|
【神将升级】 太快优化
|
2020-11-09 16:29:22 +08:00 |
ZhangBiao
|
ed806f2707
|
【易经宝库】全部领完后 切换最终奖励点击奖池预览报错修复
(cherry picked from commit cfeabacca5df3645e1cf4f6e68558f15a3bfb025)
|
2020-11-09 16:11:13 +08:00 |
wangzhenxing
|
a09870522a
|
[皮肤]伤害统计界面添加皮肤显示
|
2020-11-09 15:52:43 +09:00 |
ZhangBiao
|
454a70668d
|
【易经宝库】格子点击位置不准确修复 曾加tips
|
2020-11-09 15:39:25 +08:00 |
zhangqiang
|
e72cac2afb
|
【逍遥游】 通关后返回问题修复
|
2020-11-09 15:25:02 +08:00 |
ZhangBiao
|
181fe789a4
|
【易经宝库】最终奖励选择bug修复
(cherry picked from commit c4745e8c7c)
|
2020-11-09 13:48:08 +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
|
4622263234
|
【战斗】修复战斗中受击特效及音效错误的问题,修复假战斗星级显示错误
|
2020-11-06 20:45:21 +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 |
wangzhenxing
|
04deaa28d6
|
[皮肤] 胜利最佳输出界面显示皮肤
|
2020-11-06 17:52:54 +09: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 |
zhangqiang
|
2ed3fc9fc5
|
【达人奖励排行】 显示问题修复
|
2020-11-06 17:19:14 +08:00 |
gaoxin
|
3baf785576
|
【角色信息】修复角色信息界面滑动立绘报错的问题
|
2020-11-06 16:54:38 +08:00 |
zhangqiang
|
2e470d6ef6
|
【易经宝库】 特效层级调整
(cherry picked from commit ac64980843)
|
2020-11-06 16:52:57 +08:00 |
zhangqiang
|
39e8e1f894
|
【巅峰赛】 头像特效设置层级有问题 线上
|
2020-11-06 15:31:29 +08:00 |
gaoxin
|
30ac8733da
|
【战斗】假战斗随机种子读表
|
2020-11-06 14:15:03 +08:00 |
wangzhenxing
|
ec5c6c512e
|
技能提交去除log
|
2020-11-06 14:01:38 +09:00 |
wangzhenxing
|
9621f9b220
|
皮肤修改提交
|
2020-11-06 14:00:04 +09:00 |
wangzhenxing
|
89f33a7fa0
|
battlemanager修改提交
|
2020-11-06 12:05:34 +08:00 |
wangzhenxing
|
3bdbea5e22
|
解决冲突提交
|
2020-11-06 12:01:17 +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
|
105843f939
|
【巅峰赛】 排错 临时修改 ~~~~~~~~~~~~~
|
2020-11-05 17:23:29 +08:00 |
zhangqiang
|
4f0d2626b5
|
【大闹天宫】 新增需求 增加圣物 新标 提示
|
2020-11-05 17:04:38 +08:00 |
zhangqiang
|
3a7ff72e45
|
【特权商城】 前端加等级限制 有表!!!
|
2020-11-05 16:44:58 +08:00 |
zhangqiang
|
a85abaa2a0
|
【大闹天宫】 节点boss 站位错误 修复
|
2020-11-05 15:56:24 +08:00 |
zhangqiang
|
0abdd79253
|
【新手引导】 更换新手引导live2d
|
2020-11-05 11:05:04 +08:00 |
gaoxin
|
8b74daae36
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-11-04 16:18: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
|
750a87c168
|
【魂印】 线上首次打开神将魂印界面有时会弹出战力变化 修改
|
2020-11-04 15:04:18 +08:00 |
wangzhenxing
|
59bcf41d6a
|
去掉战斗伤害log输出
|
2020-11-04 14:37:13 +09:00 |
ZhangBiao
|
7b943d6731
|
【特权商城】最后一分钟报错修改
|
2020-11-03 20:07:25 +08:00 |
zhangqiang
|
302e52aea5
|
【英雄合成】 添加提示
|
2020-11-03 19:19:37 +08:00 |
gaoxin
|
5070d78a79
|
【商店】前端从表里判断商品的显示状态添加
|
2020-11-03 18:00:53 +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 |
gaoxin
|
2dff35c3ff
|
【战斗】修复战斗内名称不显示和我方元素显示错误的问题
|
2020-11-03 15:26:29 +08:00 |
zhangqiang
|
812e6b8f0b
|
【灵兽系统】召唤界面 按钮位置有问题
|
2020-11-03 14:52:51 +08:00 |
gaoxin
|
d4f57caa96
|
【特权】修复获取特权次数会小于0的问题,解决急速探索会出现剩余次数为负数的问题
|
2020-11-03 14:20:10 +08:00 |
gaoxin
|
de861b5d9b
|
【战斗】修改会自己动的指定目标特效的显示时长
|
2020-11-02 23:53:12 +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 |
gaoxin
|
4709ffa144
|
【战斗】修复人物技能会在零售技能释放完成之前加入对列,导致技能释放失败的问题--2
|
2020-11-02 22:13:00 +08:00 |
gaoxin
|
7f64948c2d
|
【战斗】修复战斗界面资源回收时报错
|
2020-11-02 22:09:37 +08:00 |
gaoxin
|
39c3cacea9
|
【战斗】修复人物技能会在零售技能释放完成之前加入对列,导致技能释放失败的问题。
|
2020-11-02 21:49:06 +08:00 |
gaoxin
|
0504291129
|
【战斗】修复灵兽释放技能顺序错误
|
2020-11-02 21:23:16 +08:00 |
gaoxin
|
6b906fd304
|
【战斗】修复上一场残留数据会出现在下一场的问题
|
2020-11-02 21:22:38 +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 |
zhangqiang
|
08708c841c
|
【灵兽系统】 调主城的位置
|
2020-11-02 18:16:51 +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 |
wangzhenxing
|
05d3dc7732
|
[灵兽抽卡 灵兽放生]灵兽抽卡再来一次显示修改,灵兽放生显示返还货币修改
|
2020-11-02 17:45:36 +09:00 |
zhangqiang
|
04b8449ffe
|
【灵兽系统】 加新手 加升级动画
|
2020-11-02 17:29:49 +08: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 |
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
|
201fa0530a
|
[效果 被动]添加119效果 109,136,160 被动修改(我方攻击加血不会触发)
|
2020-11-02 15:49:18 +09:00 |
zhangqiang
|
d0a8e96d5e
|
【灵兽系统】 添加驱灵币跳转按钮 and 特权礼包排序
|
2020-11-02 14:36:44 +08:00 |
gaoxin
|
5b2801755e
|
【战斗】修复技能效果修改导致被动技能报错的问题
|
2020-11-02 14:12:03 +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 |
zhangqiang
|
ff68e3d0bc
|
【达人排行榜】 达人排行榜底部显示问题
|
2020-11-02 12:55:00 +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
|
d5e4b46e45
|
【灵兽系统】bug 同步到dev
|
2020-11-02 11:00:21 +08:00 |
gaoxin
|
4201f2d7cd
|
【战斗】主动效果117,118添加
|
2020-11-02 10:00:05 +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 |
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 |
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 |
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 |
wangzhenxing
|
424cfead9a
|
灵兽特效层级修改
|
2020-10-29 20:37:43 +09: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 |
zhangqiang
|
5d2bfdc46b
|
【灵兽系统】 动画调整
|
2020-10-29 15:37:19 +08:00 |
wangzhenxing
|
02d4a3ab13
|
【灵兽】特效表现修改
|
2020-10-29 15:12:03 +09:00 |
jiaoyangna
|
452a3ac096
|
逍遥游幸运转盘提交
|
2020-10-29 14:12:51 +08:00 |
wangzhenxing
|
09cd47db46
|
【灵兽】bug修改 buffctr 报错修改
|
2020-10-29 11:18:11 +09: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 |
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 |
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 |
wangzhenxing
|
8bba3a3be4
|
[灵兽放生]灵兽放生修改
|
2020-10-27 17:27:16 +09:00 |
zhangqiang
|
a20217223a
|
【灵兽系统】 添加碎片合成红点
|
2020-10-27 17:02:37 +08:00 |
zhangqiang
|
0d9ed28c23
|
【灵兽系统】 资源替换 拖拽修改
|
2020-10-27 15:59:53 +08:00 |
gaoxin
|
02863c2bb4
|
【战斗】修复持续伤害会出现小数的问题
|
2020-10-27 15:15:43 +08:00 |
wangzhenxing
|
eb109ff09b
|
灵兽信息显示界面修改
|
2020-10-27 11:23:14 +09: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 |
wangzhenxing
|
f3d5640893
|
人物信息显示详情修改
|
2020-10-26 19:04:56 +09:00 |
zhangqiang
|
3107e9a00f
|
【灵兽系统】 技能显示修改
|
2020-10-26 18:26:23 +08:00 |
JieLing
|
ef4f4232cb
|
【灵兽系统】 修改显示 排行榜显示修改
|
2020-10-26 18:04:45 +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 |
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 |
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
|
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 |
wangzhenxing
|
c5b97f3cda
|
灵兽去除log
|
2020-10-26 16:42:48 +09: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 |
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 |
wangzhenxing
|
91ed513602
|
人物信息修改提交
|
2020-10-26 16:26:21 +09:00 |
gaoxin
|
343237ae6d
|
【灵兽】战斗数据协议添加,修复战斗数据组建错误
|
2020-10-26 14:56:03 +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
|
8a455e2c9e
|
【灵兽】后端数据解析添加
|
2020-10-26 14:03:59 +08:00 |
zhangqiang
|
5a72414908
|
灵兽修改提交
|
2020-10-26 11:34:01 +08:00 |
zhangqiang
|
af2364c075
|
线上战力 属性取整问题
|
2020-10-26 11:33:23 +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 |
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 |
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 |
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
|
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
|
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 |
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 |