Commit Graph

99 Commits (714545c75de9c76da2116908731e807b0b2f514f)

Author SHA1 Message Date
zhangqiang 714545c75d 魂印效果图替换 修改公会副本 2020-08-25 10:40:13 +08:00
ZhangBiao 52195c17ea 天宫秘宝标题修改 2020-08-24 18:24:42 +08:00
ZhangBiao ec6cf58003 天尊降世入口资源替换 2020-08-24 17:04:45 +08:00
ZhangBiao 4b59561b3d Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/BG/UI/MainScene/xuanwo_002.png.meta
2020-08-24 16:08:01 +08:00
ZhangBiao 6013365ad1 剑影仙踪特效更新 2020-08-24 16:07:08 +08:00
gaoxin af532fce6e 海外相关修改合并 2020-08-22 16:19:50 +08:00
zhangqiang e1b223e83f Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	data_execl/base_data/ItemConfig.xlsx
#	data_execl/base_data/MonsterConfig.xlsx
#	data_execl/base_data/PrivilegeTypeConfig.xlsx
#	data_execl/base_data/RewardGroup.xlsx
#	data_execl/base_data/RewardItemConfig.xlsx
#	data_execl/base_data/SpecialConfig.xlsx
#	data_execl/base_data/StoreConfig.xlsx
#	data_execl/base_data/UIConfig.xlsx
2020-08-22 13:59:35 +08:00
ZhangBiao 52dda5ff47 青龙入口 破阵长度 2020-08-21 19:03:41 +08:00
ZhangBiao b8a8a3980c 限时商市 珍奇宝阁 2020-08-21 11:23:46 +08:00
jiaoyangna fa1f5a7c35 五星成长礼提交 2020-08-19 22:03:47 +08:00
jiaoyangna 4e1236de8c qinglongserecttreasure commit 2020-08-19 10:05:01 +08:00
zhangqiang c67951f5fb 公会副本资源提交 2020-08-17 16:19:25 +08:00
zhangqiang cdf78a9dcf 剑影仙踪资源提交 2020-08-17 15:59:33 +08:00
ZhangBiao 2063690199 2020-08-14 23:34:23 +08:00
JieLing 7453825d63 Merge branch 'master_develop' into 0功能/资源加密方式二
# Conflicts:
#	Assets/ManagedResources/Icons/c_dhdj_00042_t1.png.meta
#	Assets/ManagedResources/Icons/c_dhdj_00042_t3.png.meta
#	Assets/ManagedResources/Icons/c_ttjz_00048_t1.png.meta
#	Assets/ManagedResources/Icons/c_ttjz_00048_t3.png.meta
#	Assets/ManagedResources/Spine/c_dhdj_00042/c_dhdj_00042.png.meta
2020-08-14 17:41:21 +08:00
JieLing 5e9448dd24 资源提交, 2020-08-14 17:35:18 +08:00
JieLing ad3ee94a75 资源压缩方式修改,苹果资源压缩方式添加, 2020-08-14 17:29:06 +08:00
jiaoyangna 3834e1960e 图片导入 2020-08-14 14:17:38 +08:00
JieLing be59c59230 部分大图资源整理 2020-08-14 10:02:24 +08:00
ZhangBiao 416d6eb16c 每日签到 2020-08-13 22:30:09 +08:00
JieLing acf9a73068 重复引用资源修改 2020-08-13 19:40:50 +08:00
ZhangBiao dd3c814c2a 四元阵中 添加 置换入口 2020-08-13 14:43:10 +08:00
ZhangBiao c1c013a007 神将置换 基本功能完成 2020-08-11 20:55:05 +08:00
zhangqiang 93e1d880c8 英雄合成界面拼接 2020-08-06 18:34:04 +08:00
ZhangBiao 44497f73bd 神将置换页面制作1 2020-08-06 10:43:11 +08:00
zhangqiang 4533695a3d 法宝归元界面提交 2020-08-07 12:22:10 +08:00
ZhangBiao ee19d26bd3 神将置换界面创建 2020-08-05 15:36:22 +08:00
jiaoyangna 8b3bcecb59 activity commit 2020-08-03 10:18:04 +08:00
ZhangBiao ab8889ae8c 破阵诛仙活动界面 2020-07-31 16:18:14 +08:00
jiaoyangna c328d4683c 特效添加提交 2020-07-30 10:08:58 +08:00
jiaoyangna 8a2a443168 星星提交 2020-07-28 19:18:45 +08:00
jiaoyangna bf77931b88 边框修改提交 2020-07-28 18:38:19 +08:00
zhangqiang acba506782 寻宝添加6星显示 2020-07-31 18:40:22 +08:00
ZhangBiao cec1f145b6 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 09:48:26 +08:00
ZhangBiao 48ac527f1a 限时召唤 乾坤宝盒 页面整合 2020-07-28 09:48:02 +08:00
jiaoyangna 54b3aad5e9 【副本优化】副本入口处增加文字提示 2020-07-27 19:48:05 +08:00
jiaoyangna e71f82795a 编队界面修改提交 2020-07-27 14:13:31 +08:00
gaoxin 65756cbe59 Merge branch 'master_local_test' into master_develop
# Conflicts:
#	Assets/Effect.meta
#	Assets/ManagedResources/Prefabs/Effect/Skill/Effect_c_bhxz_00013_t1_attack_02.prefab.meta
#	Assets/ManagedResources/Prefabs/Effect/Skill/Effect_c_bhxz_00013_t1_attack_03.prefab.meta
#	Assets/ManagedResources/Prefabs/Effect/Skill/Effect_c_ddtz_00049_001_01.prefab.meta
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchGuessTipViewPopup.lua.meta
#	Assets/ManagedResources/~Lua/Modules/MapChoose.meta
2020-07-25 16:24:48 +08:00
JieLing 6807c6c1a6 meta文件提交 2020-07-25 15:15:16 +08:00
jiaoyangna 0c2239bd11 编队修改提交 2020-07-25 13:21:30 +08:00
jiaoyangna caadda04e1 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/ArenaTopMatchPanel.prefab
2020-07-24 20:04:44 +08:00
jiaoyangna 064b819f4a 修改星星提交 2020-07-24 20:03:06 +08:00
ZhangBiao 1f5440c2e6 bug修复 2020-07-24 12:11:00 +08:00
zhangqiang 3588a17c00 Merge branch 'master_develop' into master_arena
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
#	data_execl/base_data/UIConfig.xlsx
2020-07-23 21:24:00 +08:00
zhangqiang 6a855cf7a2 巅峰赛问题修改 2020-07-23 20:39:21 +08:00
ZhangBiao c268538c0e 共鸣资源替换 2020-07-23 19:46:54 +08:00
jiaoyangna 2fd0311c3c Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/Audio/Skill/skill/Audio_c_xy_0012_skeff_tapsk_healeff.mp3.meta
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
2020-07-23 16:02:06 +08:00
jiaoyangna b424927bbb tupian tijiao 2020-07-23 16:01:26 +08:00
ZhangBiao 7fb5ac778f Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-23 15:44:51 +08:00
ZhangBiao 9b290c1ed5 图片资源替换 2020-07-23 15:44:40 +08:00