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
|
a5c36cf58a
|
【灵兽宝阁】未开启更换灵兽版本
|
2020-11-12 17:11:18 +08:00 |
wangzhenxing
|
3733d742bd
|
[灵兽] 灵兽奖池预览奖励顺序修改
|
2020-11-03 17:35:52 +09:00 |
wangzhenxing
|
5f518babce
|
[灵兽]灵兽奖励预览排序 抽卡再来一次字体位置修改
|
2020-11-03 14:18:02 +09:00 |
zhangqiang
|
3479bd153c
|
【灵兽系统】 合并 功能ok 但是战斗合完进不去
|
2020-10-31 17:01:46 +08:00 |
wangzhenxing
|
b108d3bc85
|
灵兽bug修改
|
2020-10-28 16:30:12 +09:00 |
jiaoyangna
|
87b9c2dd0d
|
灵兽羁绊,御兽斋红点提交
|
2020-10-29 16:17:09 +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 |
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
|
5c6634d8d8
|
灵兽抽卡提交
|
2020-10-19 11:30:47 +09:00 |
wangzhenxing
|
45be005e63
|
灵兽抽卡放生功能提交
|
2020-10-15 20:27:41 +09:00 |
ZhangBiao
|
6aebe6f49e
|
周月卡 点将台动效添加
|
2020-09-16 23:30:21 +08:00 |
zhangqiang
|
5e92ce5f73
|
部分音效加入
|
2020-09-10 15:54:06 +08:00 |
jiaoyangna
|
89f937e9ac
|
破阵诛仙提交
|
2020-09-10 18:08:21 +08:00 |
jiaoyangna
|
fa33af7eea
|
限时提交
|
2020-09-10 16:18:54 +08:00 |
jiaoyangna
|
fb9b646553
|
限时召唤提交
|
2020-09-08 16:57:19 +08:00 |
gaoxin
|
58158755e3
|
修复抽卡界面特效穿透的问题
|
2020-09-24 15:33:39 +08:00 |
zhangqiang
|
4d19e7ce98
|
中文表导出提交
|
2020-08-25 15:46:38 +08:00 |
zhangqiang
|
95dcbfb0c7
|
四元阵去掉没有的音效
|
2020-09-28 17:54:04 +08:00 |
liujiaqi
|
783c61eed8
|
修复新玩家登陆卡在登陆100%
|
2020-09-27 20:40:20 +08:00 |
jiaoyangna
|
056815a8b6
|
patch commit
|
2020-08-22 19:40:14 +08:00 |
ZhangBiao
|
dd3c814c2a
|
四元阵中 添加 置换入口
|
2020-08-13 14:43:10 +08:00 |
jiaoyangna
|
e0359bb37a
|
encoding upate
|
2020-08-06 17:52:32 +08:00 |
zhangqiang
|
588d2152b2
|
抽卡主城红点修改
|
2020-08-15 23:46:17 +08:00 |
ZhangBiao
|
6c316bf7de
|
|
2020-07-28 17:25:50 +08:00 |
ZhangBiao
|
1868a14b08
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-28 15:24:21 +08:00 |
ZhangBiao
|
52c34aa2a3
|
花费妖晶抽卡提示优化
|
2020-07-28 15:24:11 +08:00 |
jiaoyangna
|
99f9e7169e
|
添加特效
|
2020-07-28 15:06:47 +08:00 |
jiaoyangna
|
40345b0ab7
|
十连抽提交
|
2020-07-27 18:00:45 +08:00 |
jiaoyangna
|
064b819f4a
|
修改星星提交
|
2020-07-24 20:03:06 +08:00 |
zhangqiang
|
c6b5321424
|
bug
|
2020-07-17 20:52:44 +08:00 |
jiaoyangna
|
b56682cafd
|
5点刷新添加一个特权id
|
2020-07-17 18:04:37 +08:00 |
jiaoyangna
|
5a3e8f8b1b
|
乾坤宝盒红点显示
|
2020-07-16 09:02:59 +08:00 |
jiaoyangna
|
1d9d318cb5
|
【限时召唤】只有第一次免费召唤有红点,刷新免费次数后,主城入口,限时召唤页签上不显示红点
|
2020-07-14 16:14:03 +08:00 |
jiaoyangna
|
40fa614a52
|
限时召唤】点十连,单抽的免费不显示了
|
2020-07-13 12:01:39 +08:00 |
jiaoyangna
|
c3e1aaff6e
|
【限时召唤】奖池预览,去掉一二星神将
【心魔试炼】奖励预览,数量多的时候,需要调整
|
2020-07-09 13:35:59 +08:00 |
2han9B1a0
|
39d035b21a
|
no message
|
2020-07-08 21:09:45 +08:00 |
2han9B1a0
|
bdc2c095a7
|
点将台奖池修改
|
2020-07-07 14:16:28 +08:00 |
zhangqiang
|
9053926e02
|
bug 点将台卡池预览,再查看四元阵卡池,显示的是点将台卡池
|
2020-07-04 17:04:26 +08:00 |
JieLing
|
d08552ca2f
|
外网0.16.13 内网0.15.24
|
2020-06-30 18:59:44 +08:00 |
JieLing
|
7382b2db77
|
版本开发提交
|
2020-06-28 17:52:29 +08:00 |
JieLing
|
8c61581548
|
外网 0.16.10 内网 0.15.23
|
2020-06-28 17:48:49 +08:00 |
JieLing
|
d87ab3767e
|
内网 0.15.20
|
2020-06-23 18:36:24 +08:00 |
JieLing
|
e3b6de5404
|
内网0.15.17 外网 0.16.8
|
2020-06-19 21:44:27 +08:00 |
JieLing
|
75a3f83194
|
内网0.15.16 外网 0.16.7
|
2020-06-19 20:19:35 +08:00 |
JieLing
|
cf5f3e9952
|
内网测试 0.15.12
|
2020-06-13 11:47:13 +08:00 |
JieLing
|
ab3dbad074
|
测试服热更0.15.6提交
|
2020-06-05 16:16:22 +08:00 |
JieLing
|
59db757cf9
|
六月三号开发提交
|
2020-06-03 19:09:01 +08:00 |
JieLing
|
063868ce73
|
外网包 0.16.1
|
2020-05-25 19:16:23 +08:00 |