Commit Graph

3102 Commits (8b4aa8ec10ceae5502328421b4115f611270447d)
 

Author SHA1 Message Date
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 b9cf78c850 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/EffectResSkill/Effect_ls_01_qingluan/Prefab/Effect_ls_01_qingluan_attack_01.prefab
#	Assets/ManagedResources/EffectResSkill/Effect_ls_01_qingluan/Prefab/Effect_ls_01_qingluan_attack_02.prefab
#	Assets/ManagedResources/EffectResSkill/Effect_ls_04_zhulong/Prefab/Effect_ls_04_zhulong_attack_01.prefab
#	Assets/ManagedResources/EffectResSkill/Effect_ls_04_zhulong/Prefab/Effect_ls_04_zhulong_attack_02.prefab
#	Assets/ManagedResources/EffectResSkill/Effect_ls_04_zhulong/Prefab/Effect_ls_04_zhulong_attack_03.prefab
#	Assets/ManagedResources/EffectResSkill/Effect_ls_05_fenghuang/Prefab/Effect_ls_05_fenghuang_attack_01.prefab
#	Assets/ManagedResources/EffectResSkill/Effect_ls_05_fenghuang/Prefab/Effect_ls_05_fenghuang_attack_02.prefab
#	Assets/ManagedResources/EffectResSkill/Effect_ls_05_fenghuang/Prefab/Effect_ls_05_fenghuang_attack_03.prefab
#	Assets/ManagedResources/EffectResSkill/Effect_ls_05_huodou/Prefab/Effect_ls_05_huodou_attack_01.prefab
#	Assets/ManagedResources/EffectResSkill/Effect_ls_05_huodou/Prefab/Effect_ls_05_huodou_attack_02.prefab
#	Assets/ManagedResources/EffectResSkill/Effect_ls_06_baize/Prefab/ls_06_baize_attack_01.prefab
#	Assets/ManagedResources/EffectResSkill/Effect_ls_06_baize/Prefab/ls_06_baize_attack_02.prefab
#	Assets/ManagedResources/EffectResSkill/Effect_ls_06_baize/Prefab/ls_06_baize_attack_03.prefab
2020-10-23 20:47:58 +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