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 |
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 |